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

Debugger: Re-enable some shutdown cleanup code

Browse Source 
It is still needed with LLDB.

Task-number: QTCREATORBUG-18723
Change-Id: If78dcbf8e074add969c403c37193c9f4ce857625
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
hjk
2017-08-11 19:06:10 +02:00
parent c0364564a4
commit e16a30712e
1 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/plugins/debugger/debuggerengine.cpp
View File

@@ -1030,39 +1030,37 @@ RunControl *DebuggerEnginePrivate::runControl() const
void DebuggerEngine::notifyEngineIll() void DebuggerEngine::notifyEngineIll()
{ {
runControl()->initiateStop();
return;
//#ifdef WITH_BENCHMARK //#ifdef WITH_BENCHMARK
// CALLGRIND_STOP_INSTRUMENTATION; // CALLGRIND_STOP_INSTRUMENTATION;
// CALLGRIND_DUMP_STATS; // CALLGRIND_DUMP_STATS;
//#endif //#endif
// showMessage("NOTE: ENGINE ILL ******"); showMessage("NOTE: ENGINE ILL ******");
// runTool()->startDying(); runTool()->startDying();
// d->m_lastGoodState = d->m_state; d->m_lastGoodState = d->m_state;
// switch (state()) { switch (state()) {
// case InferiorRunRequested: case InferiorRunRequested:
// case InferiorRunOk: case InferiorRunOk:
// // The engine does not look overly ill right now, so attempt to // The engine does not look overly ill right now, so attempt to
// // properly interrupt at least once. If that fails, we are on the // properly interrupt at least once. If that fails, we are on the
// // shutdown path due to d->m_targetState anyways. // shutdown path due to d->m_targetState anyways.
// setState(InferiorStopRequested, true); setState(InferiorStopRequested, true);
// showMessage("ATTEMPT TO INTERRUPT INFERIOR"); showMessage("ATTEMPT TO INTERRUPT INFERIOR");
// interruptInferior(); interruptInferior();
// break; break;
// case InferiorStopRequested: case InferiorStopRequested:
// notifyInferiorStopFailed(); notifyInferiorStopFailed();
// break; break;
// case InferiorStopOk: case InferiorStopOk:
// showMessage("FORWARDING STATE TO InferiorShutdownFailed"); showMessage("FORWARDING STATE TO InferiorShutdownFailed");
// setState(InferiorShutdownFailed, true); setState(InferiorShutdownFailed, true);
// if (isMasterEngine()) if (isMasterEngine())
// d->queueShutdownEngine(); d->queueShutdownEngine();
// break; break;
// default: default:
// if (isMasterEngine()) if (isMasterEngine())
// d->queueShutdownEngine(); d->queueShutdownEngine();
// break; break;
// } }
} }
void DebuggerEngine::notifyEngineSpontaneousShutdown() void DebuggerEngine::notifyEngineSpontaneousShutdown()