Commit e16a3071 authored by hjk's avatar hjk

Debugger: Re-enable some shutdown cleanup code

It is still needed with LLDB.

Task-number: QTCREATORBUG-18723
Change-Id: If78dcbf8e074add969c403c37193c9f4ce857625
Reviewed-by: Alexandru Croitor's avatarAlexandru Croitor <alexandru.croitor@qt.io>
parent c0364564
......@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment