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

do the auto-continue-at-_start hack earlier

Browse Source
This commit is contained in:
Oswald Buddenhagen
2009-10-23 22:17:15 +02:00
parent c0a46ace61
commit a2a444d683
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1052,6 +1052,21 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
} }
setState(InferiorStopped); setState(InferiorStopped);
#ifdef Q_OS_LINUX
// For some reason, attaching to a stopped process causes *two* stops
// when trying to continue (kernel 2.6.24-23-ubuntu).
// Interestingly enough, on MacOSX no signal is delivered at all.
if (reason == "signal-received"
&& data.findChild("signal-name").data() == "SIGSTOP") {
GdbMi frameData = data.findChild("frame");
if (frameData.findChild("func").data() == "_start"
&& frameData.findChild("from").data() == "/lib/ld-linux.so.2") {
continueInferiorInternal();
return;
}
}
#endif
#if 0 #if 0
// The related code (handleAqcuiredInferior()) is disabled as well. // The related code (handleAqcuiredInferior()) is disabled as well.
// When re-enabling, try something to avoid spurious source list updates // When re-enabling, try something to avoid spurious source list updates
@@ -1176,20 +1191,6 @@ void GdbEngine::handleStop1(const GdbMi &data)
QVariant var = QVariant::fromValue<GdbMi>(data); QVariant var = QVariant::fromValue<GdbMi>(data);
postCommand(_("p 2"), CB(handleStop2), var); // dummy postCommand(_("p 2"), CB(handleStop2), var); // dummy
} else { } else {
#ifdef Q_OS_LINUX
// For some reason, attaching to a stopped process causes *two* stops
// when trying to continue (kernel 2.6.24-23-ubuntu).
// Interestingly enough, on MacOSX no signal is delivered at all.
if (reason == "signal-received"
&& data.findChild("signal-name").data() == "SIGSTOP") {
GdbMi frameData = data.findChild("frame");
if (frameData.findChild("func").data() == "_start"
&& frameData.findChild("from").data() == "/lib/ld-linux.so.2") {
continueInferiorInternal();
return;
}
}
#endif
if (reason == "signal-received" if (reason == "signal-received"
&& theDebuggerBoolSetting(UseMessageBoxForSignals)) { && theDebuggerBoolSetting(UseMessageBoxForSignals)) {
QByteArray name = data.findChild("signal-name").data(); QByteArray name = data.findChild("signal-name").data();