debugger: better status messages on startup and interrupt

Change-Id: Id78f189bb55db618e5cbff233e4edebc2d6e886c
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-03-07 16:40:54 +01:00
committed by hjk
parent 5585426efc
commit 646ae570d7
2 changed files with 12 additions and 2 deletions

View File

@@ -867,6 +867,7 @@ void DebuggerEngine::notifyInferiorSetupFailed()
{ {
showMessage(_("NOTE: INFERIOR SETUP FAILED")); showMessage(_("NOTE: INFERIOR SETUP FAILED"));
QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << this << state()); QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << this << state());
showStatusMessage(tr("Setup failed."));
setState(InferiorSetupFailed); setState(InferiorSetupFailed);
if (isMasterEngine()) if (isMasterEngine())
d->queueShutdownEngine(); d->queueShutdownEngine();
@@ -902,6 +903,7 @@ void DebuggerEngine::notifyInferiorUnrunnable()
d->m_progress.setProgressValue(1000); d->m_progress.setProgressValue(1000);
d->m_progress.reportFinished(); d->m_progress.reportFinished();
QTC_ASSERT(state() == EngineRunRequested, qDebug() << this << state()); QTC_ASSERT(state() == EngineRunRequested, qDebug() << this << state());
showStatusMessage(tr("Loading finished."));
setState(InferiorUnrunnable); setState(InferiorUnrunnable);
} }
@@ -912,6 +914,7 @@ void DebuggerEngine::notifyEngineRunFailed()
d->m_progress.setProgressValue(900); d->m_progress.setProgressValue(900);
d->m_progress.reportCanceled(); d->m_progress.reportCanceled();
d->m_progress.reportFinished(); d->m_progress.reportFinished();
showStatusMessage(tr("Run failed."));
setState(EngineRunFailed); setState(EngineRunFailed);
if (isMasterEngine()) if (isMasterEngine())
d->queueShutdownEngine(); d->queueShutdownEngine();
@@ -963,6 +966,7 @@ void DebuggerEngine::notifyEngineRunAndInferiorRunOk()
d->m_progress.setProgressValue(1000); d->m_progress.setProgressValue(1000);
d->m_progress.reportFinished(); d->m_progress.reportFinished();
QTC_ASSERT(state() == EngineRunRequested, qDebug() << this << state()); QTC_ASSERT(state() == EngineRunRequested, qDebug() << this << state());
showStatusMessage(tr("Running."));
setState(InferiorRunOk); setState(InferiorRunOk);
} }
@@ -972,6 +976,7 @@ void DebuggerEngine::notifyEngineRunAndInferiorStopOk()
d->m_progress.setProgressValue(1000); d->m_progress.setProgressValue(1000);
d->m_progress.reportFinished(); d->m_progress.reportFinished();
QTC_ASSERT(state() == EngineRunRequested, qDebug() << this << state()); QTC_ASSERT(state() == EngineRunRequested, qDebug() << this << state());
showStatusMessage(tr("Stopped."));
setState(InferiorStopOk); setState(InferiorStopOk);
} }
@@ -979,12 +984,14 @@ void DebuggerEngine::notifyInferiorRunRequested()
{ {
showMessage(_("NOTE: INFERIOR RUN REQUESTED")); showMessage(_("NOTE: INFERIOR RUN REQUESTED"));
QTC_ASSERT(state() == InferiorStopOk, qDebug() << this << state()); QTC_ASSERT(state() == InferiorStopOk, qDebug() << this << state());
showStatusMessage(tr("Run requested..."));
setState(InferiorRunRequested); setState(InferiorRunRequested);
} }
void DebuggerEngine::notifyInferiorRunOk() void DebuggerEngine::notifyInferiorRunOk()
{ {
showMessage(_("NOTE: INFERIOR RUN OK")); showMessage(_("NOTE: INFERIOR RUN OK"));
showStatusMessage(tr("Running."));
// Transition from StopRequested can happen sin remotegdbadapter. // Transition from StopRequested can happen sin remotegdbadapter.
QTC_ASSERT(state() == InferiorRunRequested QTC_ASSERT(state() == InferiorRunRequested
|| state() == InferiorStopRequested, qDebug() << this << state()); || state() == InferiorStopRequested, qDebug() << this << state());
@@ -1021,6 +1028,7 @@ void DebuggerEngine::notifyInferiorStopOk()
return; return;
} }
QTC_ASSERT(state() == InferiorStopRequested, qDebug() << this << state()); QTC_ASSERT(state() == InferiorStopRequested, qDebug() << this << state());
showStatusMessage(tr("Stopped."));
setState(InferiorStopOk); setState(InferiorStopOk);
} }
@@ -1028,6 +1036,7 @@ void DebuggerEngine::notifyInferiorSpontaneousStop()
{ {
showMessage(_("NOTE: INFERIOR SPONTANEOUS STOP")); showMessage(_("NOTE: INFERIOR SPONTANEOUS STOP"));
QTC_ASSERT(state() == InferiorRunOk, qDebug() << this << state()); QTC_ASSERT(state() == InferiorRunOk, qDebug() << this << state());
showStatusMessage(tr("Stopped."));
setState(InferiorStopOk); setState(InferiorStopOk);
} }
@@ -1046,6 +1055,7 @@ void DebuggerEnginePrivate::doInterruptInferior()
QTC_ASSERT(state() == InferiorRunOk, qDebug() << m_engine << state()); QTC_ASSERT(state() == InferiorRunOk, qDebug() << m_engine << state());
m_engine->setState(InferiorStopRequested); m_engine->setState(InferiorStopRequested);
m_engine->showMessage(_("CALL: INTERRUPT INFERIOR")); m_engine->showMessage(_("CALL: INTERRUPT INFERIOR"));
m_engine->showStatusMessage(tr("Attempting to interrupt."));
m_engine->interruptInferior(); m_engine->interruptInferior();
} }

View File

@@ -2721,10 +2721,10 @@ static QString formatStartParameters(DebuggerStartParameters &sp)
void DebuggerPluginPrivate::runControlStarted(DebuggerEngine *engine) void DebuggerPluginPrivate::runControlStarted(DebuggerEngine *engine)
{ {
activateDebugMode(); activateDebugMode();
const QString message = tr("Starting debugger '%1' for ABI '%2'...") const QString message = tr("Starting debugger \"%1\" for ABI \"%2\"...")
.arg(engine->objectName()) .arg(engine->objectName())
.arg(engine->startParameters().toolChainAbi.toString()); .arg(engine->startParameters().toolChainAbi.toString());
showMessage(message, StatusBar); showStatusMessage(message);
showMessage(formatStartParameters(engine->startParameters()), LogDebug); showMessage(formatStartParameters(engine->startParameters()), LogDebug);
showMessage(m_debuggerSettings->dump(), LogDebug); showMessage(m_debuggerSettings->dump(), LogDebug);
m_snapshotHandler->appendSnapshot(engine); m_snapshotHandler->appendSnapshot(engine);