feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

-gdb-exit has a special return code as well

Browse Source
This commit is contained in:
Oswald Buddenhagen
2009-10-13 17:13:19 +02:00
parent 98b477fc32
commit 70f696d056
7 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/gdb/attachgdbadapter.cpp
View File

@@ -130,7 +130,7 @@ void AttachGdbAdapter::shutdown()
case InferiorShutDown: case InferiorShutDown:
setState(AdapterShuttingDown); setState(AdapterShuttingDown);
m_engine->postCommand(_("-gdb-exit"), CB(handleExit)); m_engine->postCommand(_("-gdb-exit"), GdbEngine::ExitRequest, CB(handleExit));
return; return;
default: default:

2
src/plugins/debugger/gdb/coregdbadapter.cpp
View File

@@ -192,7 +192,7 @@ void CoreGdbAdapter::shutdown()
case InferiorUnrunnable: case InferiorUnrunnable:
case InferiorShutDown: case InferiorShutDown:
setState(AdapterShuttingDown); setState(AdapterShuttingDown);
m_engine->postCommand(_("-gdb-exit"), CB(handleExit)); m_engine->postCommand(_("-gdb-exit"), GdbEngine::ExitRequest, CB(handleExit));
return; return;
default: default:

10
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -803,10 +803,12 @@ void GdbEngine::handleResultRecord(const GdbResponse &response)
responseWithCookie.cookie = cmd.cookie; responseWithCookie.cookie = cmd.cookie;
if (response.resultClass != GdbResultError && if (response.resultClass != GdbResultError &&
response.resultClass != ((cmd.flags & RunRequest) ? GdbResultRunning : GdbResultDone)) { response.resultClass != ((cmd.flags & RunRequest) ? GdbResultRunning :
debugMessage(_("UNEXPECTED RESPONSE %1 TO COMMAND %2") (cmd.flags & ExitRequest) ? GdbResultExit :
.arg(_(GdbResponse::stringFromResultClass(response.resultClass))) GdbResultDone)) {
.arg(cmd.command)); QString rsp = _(GdbResponse::stringFromResultClass(response.resultClass));
qWarning() << "UNEXPECTED RESPONSE " << rsp << " TO COMMAND" << cmd.command << " AT " __FILE__ ":" STRINGIFY(__LINE__);
debugMessage(_("UNEXPECTED RESPONSE %1 TO COMMAND %2").arg(rsp).arg(cmd.command));
} else { } else {
if (cmd.callback) if (cmd.callback)
(this->*cmd.callback)(responseWithCookie); (this->*cmd.callback)(responseWithCookie);

3
src/plugins/debugger/gdb/gdbengine.h
View File

@@ -177,7 +177,8 @@ public: // otherwise the Qt flag macros are unhappy
RebuildModel = 4, // Trigger model rebuild when no such commands are pending any more RebuildModel = 4, // Trigger model rebuild when no such commands are pending any more
WatchUpdate = Discardable | RebuildModel, WatchUpdate = Discardable | RebuildModel,
EmbedToken = 8, // Expand %1 in the command to the command token EmbedToken = 8, // Expand %1 in the command to the command token
RunRequest = 16 // Callback expect GdbResultRunning instead of GdbResultDone RunRequest = 16, // Callback expect GdbResultRunning instead of GdbResultDone
ExitRequest = 32 // Callback expect GdbResultExit instead of GdbResultDone
}; };
Q_DECLARE_FLAGS(GdbCommandFlags, GdbCommandFlag) Q_DECLARE_FLAGS(GdbCommandFlags, GdbCommandFlag)

4
src/plugins/debugger/gdb/plaingdbadapter.cpp
View File

@@ -177,7 +177,7 @@ void PlainGdbAdapter::shutdown()
case InferiorShutDown: case InferiorShutDown:
setState(AdapterShuttingDown); setState(AdapterShuttingDown);
m_engine->postCommand(_("-gdb-exit"), CB(handleExit)); m_engine->postCommand(_("-gdb-exit"), GdbEngine::ExitRequest, CB(handleExit));
return; return;
/* /*
@@ -192,7 +192,7 @@ void PlainGdbAdapter::shutdown()
.arg(state())); .arg(state()));
m_gdbProc.kill(); m_gdbProc.kill();
} }
m_engine->postCommand(_("-gdb-exit"), CB(handleExit)); m_engine->postCommand(_("-gdb-exit"), GdbEngine::ExitRequest, CB(handleExit));
return; return;
*/ */
default: default:

2
src/plugins/debugger/gdb/remotegdbadapter.cpp
View File

@@ -248,7 +248,7 @@ void RemoteGdbAdapter::shutdown()
case InferiorStartFailed: case InferiorStartFailed:
case InferiorShutDown: case InferiorShutDown:
setState(AdapterShuttingDown); setState(AdapterShuttingDown);
m_engine->postCommand(_("-gdb-exit"), CB(handleExit)); m_engine->postCommand(_("-gdb-exit"), GdbEngine::ExitRequest, CB(handleExit));
return; return;
} }

2
src/plugins/debugger/gdb/trkgdbadapter.cpp
View File

@@ -2015,7 +2015,7 @@ void TrkGdbAdapter::shutdown()
case InferiorShutDown: case InferiorShutDown:
setState(AdapterShuttingDown); setState(AdapterShuttingDown);
cleanup(); cleanup();
m_engine->postCommand(_("-gdb-exit"), CB(handleExit)); m_engine->postCommand(_("-gdb-exit"), GdbEngine::ExitRequest, CB(handleExit));
return; return;
/* /*