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