From 887e21da56a58e54d37f8ed1df8e9e23a44a3a6c Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 13 Jul 2010 08:41:27 +0200
Subject: [PATCH] debugger: more state work
---
src/plugins/debugger/debuggerengine.cpp | 200 ++++++++++----------
src/plugins/debugger/debuggerengine.h | 4 +-
src/plugins/debugger/gdb/gdbengine.cpp | 38 ++--
src/plugins/debugger/gdb/termgdbadapter.cpp | 1 -
src/plugins/debugger/qml/qmlengine.cpp | 38 ++--
src/plugins/debugger/qml/qmlengine.h | 1 -
6 files changed, 138 insertions(+), 144 deletions(-)
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index c36e328fcf9..0e29427e1b6 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -120,7 +120,8 @@ namespace Debugger {
QDebug operator<<(QDebug d, DebuggerState state)
{
- return d << DebuggerEngine::stateName(state) << '(' << int(state) << ')';
+ //return d << DebuggerEngine::stateName(state) << '(' << int(state) << ')';
+ return d << DebuggerEngine::stateName(state);
}
QDebug operator<<(QDebug str, const DebuggerStartParameters &sp)
@@ -243,6 +244,30 @@ public slots:
void doInterruptInferior();
void doFinishDebugger();
+ void queueRunEngine() {
+ m_engine->setState(EngineRunRequested);
+ m_engine->showMessage(_("QUEUE: RUN ENGINE"));
+ QTimer::singleShot(0, this, SLOT(doRunEngine()));
+ }
+
+ void queueShutdownEngine() {
+ m_engine->setState(EngineShutdownRequested);
+ m_engine->showMessage(_("QUEUE: SHUTDOWN ENGINE"));
+ QTimer::singleShot(0, this, SLOT(doShutdownEngine()));
+ }
+
+ void queueShutdownInferior() {
+ m_engine->setState(InferiorShutdownRequested);
+ m_engine->showMessage(_("QUEUE: SHUTDOWN INFERIOR"));
+ QTimer::singleShot(0, this, SLOT(doShutdownInferior()));
+ }
+
+ void queueFinishDebugger() {
+ m_engine->setState(DebuggerFinished, true);
+ m_engine->showMessage(_("QUEUE: SHUTDOWN INFERIOR"));
+ QTimer::singleShot(0, this, SLOT(doFinishDebugger()));
+ }
+
public:
DebuggerState state() const { return m_state; }
@@ -630,7 +655,8 @@ void DebuggerEngine::setRegisterValue(int regnr, const QString &value)
void DebuggerEngine::showMessage(const QString &msg, int channel, int timeout) const
{
- //qDebug() << channel << msg;
+ if (msg.size() && msg.at(0).isUpper() && msg.at(1).isUpper())
+ qDebug() << qPrintable(msg) << "IN STATE" << state();
d->m_runControl->showMessage(msg, channel);
plugin()->showMessage(msg, channel, timeout);
}
@@ -1004,88 +1030,72 @@ static bool isAllowedTransition(DebuggerState from, DebuggerState to)
void DebuggerEngine::notifyEngineSetupFailed()
{
- SDEBUG(Q_FUNC_INFO);
+ showMessage(_("NOTE: ENGINE SETUP FAILED"));
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
setState(EngineSetupFailed);
d->m_runControl->startFailed();
- QTimer::singleShot(0, d, SLOT(doShutdownEngine()));
+ d->queueShutdownEngine();
}
void DebuggerEngine::notifyEngineSetupOk()
{
- SDEBUG(Q_FUNC_INFO);
+ showMessage(_("NOTE: ENGINE SETUP OK"));
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
setState(EngineSetupOk);
d->m_runControl->startSuccessful();
+ showMessage(_("QUEUE: SETUP INFERIOR"));
QTimer::singleShot(0, d, SLOT(doSetupInferior()));
}
void DebuggerEnginePrivate::doSetupInferior()
{
- SDEBUG(Q_FUNC_INFO);
QTC_ASSERT(state() == EngineSetupOk, qDebug() << state());
m_engine->setState(InferiorSetupRequested);
+ m_engine->showMessage(_("CALL: SETUP INFERIOR"));
m_engine->setupInferior();
}
-#if 0
-// Default implemention, can be overridden.
-void DebuggerEngine::setupInferior()
-{
- QTC_ASSERT(state() == EngineSetupOk, qDebug() << state());
- notifyInferiorSetupOk();
-}
-#endif
-
void DebuggerEngine::notifyInferiorSetupFailed()
{
- SDEBUG(Q_FUNC_INFO);
+ showMessage(_("NOTE: INFERIOR SETUP FAILED"));
QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
setState(InferiorSetupFailed);
- QTimer::singleShot(0, d, SLOT(doShutdownEngine()));
+ d->queueShutdownEngine();
}
void DebuggerEngine::notifyInferiorSetupOk()
{
- SDEBUG(Q_FUNC_INFO);
+ showMessage(_("NOTE: INFERIOR SETUP OK"));
QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
- setState(EngineRunRequested);
- QTimer::singleShot(0, d, SLOT(doRunEngine()));
+ d->queueRunEngine();
}
void DebuggerEnginePrivate::doRunEngine()
{
- SDEBUG(Q_FUNC_INFO);
+ m_engine->showMessage(_("CALL: RUN ENGINE"));
QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
m_engine->runEngine();
}
-#if 0
-// Default implemention, can be overridden.
-void DebuggerEngine::runEngine()
-{
- QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
-}
-#endif
-
void DebuggerEngine::notifyInferiorUnrunnable()
{
- SDEBUG(Q_FUNC_INFO);
+ showMessage(_("NOTE: INFERIOR UNRUNNABLE"));
QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
setState(InferiorUnrunnable);
}
void DebuggerEngine::notifyEngineRunFailed()
{
+ showMessage(_("NOTE: ENGINE RUN FAILED"));
SDEBUG(Q_FUNC_INFO);
QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
setState(EngineRunFailed);
- QTimer::singleShot(0, d, SLOT(doShutdownInferior()));
+ d->queueShutdownInferior();
}
void DebuggerEngine::notifyEngineRunAndInferiorRunOk()
{
- SDEBUG(Q_FUNC_INFO);
+ showMessage(_("NOTE: ENGINE RUN AND INFERIOR RUN OK"));
QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
setState(InferiorRunRequested);
notifyInferiorRunOk();
@@ -1093,7 +1103,7 @@ void DebuggerEngine::notifyEngineRunAndInferiorRunOk()
void DebuggerEngine::notifyEngineRunAndInferiorStopOk()
{
- SDEBUG(Q_FUNC_INFO);
+ showMessage(_("NOTE: ENGINE RUN AND INFERIOR STOP OK"));
QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
setState(InferiorStopRequested);
notifyInferiorStopOk();
@@ -1101,111 +1111,104 @@ void DebuggerEngine::notifyEngineRunAndInferiorStopOk()
void DebuggerEngine::notifyInferiorRunRequested()
{
- SDEBUG(Q_FUNC_INFO);
+ showMessage(_("NOTE: INFERIOR RUN REQUESTED"));
QTC_ASSERT(state() == InferiorStopOk, qDebug() << state());
setState(InferiorRunRequested);
}
void DebuggerEngine::notifyInferiorRunOk()
{
- SDEBUG(Q_FUNC_INFO);
+ showMessage(_("NOTE: INFERIOR RUN OK"));
QTC_ASSERT(state() == InferiorRunRequested, qDebug() << state());
setState(InferiorRunOk);
}
-/*
-void DebuggerEngine::notifyInferiorSpontaneousRun()
-{
- SDEBUG(Q_FUNC_INFO);
- QTC_ASSERT(state() == InferiorStopOk, qDebug() << state());
- setState(InferiorRunRequested);
- setState(InferiorRunOk);
-}
-*/
-
void DebuggerEngine::notifyInferiorRunFailed()
{
- XSDEBUG(Q_FUNC_INFO);
- qDebug() << "NOTIFY_INFERIOR_RUN_FAILED";
+ showMessage(_("NOTE: INFERIOR RUN FAILED"));
QTC_ASSERT(state() == InferiorRunRequested, qDebug() << state());
setState(InferiorRunFailed);
setState(InferiorStopOk);
- if (isDying()) {
- QTimer::singleShot(0, d, SLOT(doShutdownInferior()));
- }
+ if (isDying())
+ d->queueShutdownInferior();
}
void DebuggerEngine::notifyInferiorStopOk()
{
- SDEBUG(Q_FUNC_INFO);
+ showMessage(_("NOTE: INFERIOR STOP OK"));
+ // Ignore spurious notifications after we are set to die.
if (isDying()) {
- showMessage(_("STOPPED WHILE DYING. CONTINUING SHUTDOWN."));
- setState(InferiorStopOk);
- QTimer::singleShot(0, d, SLOT(doShutdownInferior()));
- } else {
- QTC_ASSERT(state() == InferiorStopRequested, qDebug() << state());
- setState(InferiorStopOk);
+ showMessage(_("NOTE: ... WHILE DYING. "));
+ // Forward state to "StopOk" if needed.
+ if (state() == InferiorStopRequested
+ || state() == InferiorRunRequested
+ || state() == InferiorRunOk) {
+ showMessage(_("NOTE: ... FORWARDING TO 'STOP OK'. "));
+ setState(InferiorStopOk);
+ }
+ if (state() == InferiorStopOk || state() == InferiorStopFailed) {
+ d->queueShutdownInferior();
+ }
+ showMessage(_("NOTE: ... IGNORING STOP MESSAGE"));
+ return;
}
+ QTC_ASSERT(state() == InferiorStopRequested, qDebug() << state());
+ setState(InferiorStopOk);
}
void DebuggerEngine::notifyInferiorSpontaneousStop()
{
- SDEBUG(Q_FUNC_INFO);
+ showMessage(_("NOTE: INFERIOR SPONTANEOUES STOP"));
QTC_ASSERT(state() == InferiorRunOk, qDebug() << state());
setState(InferiorStopOk);
}
void DebuggerEngine::notifyInferiorStopFailed()
{
- SDEBUG(Q_FUNC_INFO);
+ showMessage(_("NOTE: INFERIOR STOP FAILED"));
QTC_ASSERT(state() == InferiorStopRequested, qDebug() << state());
setState(InferiorStopFailed);
- QTimer::singleShot(0, d, SLOT(doShutdownEngine()));
+ d->queueShutdownEngine();
}
void DebuggerEnginePrivate::doInterruptInferior()
{
- SDEBUG(Q_FUNC_INFO);
QTC_ASSERT(state() == InferiorRunOk, qDebug() << state());
m_engine->setState(InferiorStopRequested);
+ m_engine->showMessage(_("CALL: INTERRUPT INFERIOR"));
m_engine->interruptInferior();
}
void DebuggerEnginePrivate::doShutdownInferior()
{
- SDEBUG(Q_FUNC_INFO);
- qDebug() << "DO_SHUTDOWN_INFERIOR";
m_engine->resetLocation();
m_targetState = DebuggerFinished;
- m_engine->setState(InferiorShutdownRequested);
+ m_engine->showMessage(_("CALL: SHUTDOWN INFERIOR"));
m_engine->shutdownInferior();
}
void DebuggerEngine::notifyInferiorShutdownOk()
{
- SDEBUG(Q_FUNC_INFO);
- QTC_ASSERT(state() == InferiorShutdownRequested, qDebug() << state());
showMessage(_("INFERIOR SUCCESSFULLY SHUT DOWN"));
+ QTC_ASSERT(state() == InferiorShutdownRequested, qDebug() << state());
d->m_lastGoodState = DebuggerNotReady; // A "neutral" value.
setState(InferiorShutdownOk);
- QTimer::singleShot(0, d, SLOT(doShutdownEngine()));
+ d->queueShutdownEngine();
}
void DebuggerEngine::notifyInferiorShutdownFailed()
{
- SDEBUG(Q_FUNC_INFO);
- QTC_ASSERT(state() == InferiorShutdownRequested, qDebug() << state());
showMessage(_("INFERIOR SHUTDOWN FAILED"));
+ QTC_ASSERT(state() == InferiorShutdownRequested, qDebug() << state());
setState(InferiorShutdownFailed);
- QTimer::singleShot(0, d, SLOT(doShutdownEngine()));
+ d->queueShutdownEngine();
}
void DebuggerEngine::notifyInferiorIll()
{
- SDEBUG(Q_FUNC_INFO);
+ showMessage(_("NOTE: INFERIOR ILL"));
// This can be issued in almost any state. The inferior could still be
// alive as some previous notifications might have been bogus.
- qDebug() << "SOMETHING IS WRONG WITH THE INFERIOR";
d->m_targetState = DebuggerFinished;
d->m_lastGoodState = d->m_state;
if (state() == InferiorRunRequested) {
@@ -1215,35 +1218,28 @@ void DebuggerEngine::notifyInferiorIll()
setState(InferiorRunFailed);
setState(InferiorStopOk);
}
- QTC_ASSERT(state() == InferiorStopOk, qDebug() << state());
- QTimer::singleShot(0, d, SLOT(doShutdownInferior()));
+ d->queueShutdownInferior();
}
void DebuggerEnginePrivate::doShutdownEngine()
{
- SDEBUG(Q_FUNC_INFO);
- QTC_ASSERT(state() == InferiorShutdownOk
- || state() == InferiorShutdownFailed
- || state() == InferiorSetupFailed,
- qDebug() << state());
+ QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
m_targetState = DebuggerFinished;
- m_engine->setState(EngineShutdownRequested);
+ m_engine->showMessage(_("CALL: SHUTDOWN ENGINE"));
m_engine->shutdownEngine();
}
void DebuggerEngine::notifyEngineShutdownOk()
{
- SDEBUG(Q_FUNC_INFO);
+ showMessage(_("NOTE: ENGINE SHUTDOWN OK"));
QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
- showMessage(_("ENGINE SUCCESSFULLY SHUT DOWN"));
setState(EngineShutdownOk);
QTimer::singleShot(0, d, SLOT(doFinishDebugger()));
}
void DebuggerEngine::notifyEngineShutdownFailed()
{
- SDEBUG(Q_FUNC_INFO);
- showMessage(_("ENGINE SHUTDOWN FAILED"));
+ showMessage(_("NOTE: ENGINE SHUTDOWN FAILED"));
QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
setState(EngineShutdownFailed);
QTimer::singleShot(0, d, SLOT(doFinishDebugger()));
@@ -1251,7 +1247,7 @@ void DebuggerEngine::notifyEngineShutdownFailed()
void DebuggerEnginePrivate::doFinishDebugger()
{
- SDEBUG(Q_FUNC_INFO);
+ m_engine->showMessage(_("NOTE: FINISH DEBUGGER"));
QTC_ASSERT(state() == EngineShutdownOk
|| state() == EngineShutdownFailed, qDebug() << state());
m_engine->resetLocation();
@@ -1261,33 +1257,32 @@ void DebuggerEnginePrivate::doFinishDebugger()
void DebuggerEngine::notifyEngineIll()
{
- SDEBUG(Q_FUNC_INFO);
- qDebug() << "SOMETHING IS WRONG WITH THE ENGINE";
+ showMessage(_("NOTE: ENGINE ILL ******"));
d->m_targetState = DebuggerFinished;
d->m_lastGoodState = d->m_state;
- if (state() == InferiorStopOk) {
- QTimer::singleShot(0, d, SLOT(doShutdownInferior()));
- } else {
- QTimer::singleShot(0, d, SLOT(doShutdownEngine()));
+ switch (state()) {
+ case InferiorRunRequested:
+ case InferiorRunOk:
+ case InferiorStopRequested:
+ case InferiorStopOk:
+ qDebug() << "FORWARDING STATE TO " << InferiorShutdownFailed;
+ setState(InferiorShutdownFailed, true);
+ break;
+ default:
+ break;
}
+ d->queueShutdownEngine();
}
void DebuggerEngine::notifyEngineSpontaneousShutdown()
{
- SDEBUG(Q_FUNC_INFO);
- if (state() == EngineShutdownRequested) {
- setState(EngineShutdownOk, true);
- QTimer::singleShot(0, d, SLOT(doFinishDebugger()));
- } else {
- qDebug() << "THE ENGINE SUDDENLY DIED";
- setState(EngineShutdownOk, true);
- QTimer::singleShot(0, d, SLOT(doFinishDebugger()));
- }
+ showMessage(_("NOTE: ENGINE SPONTANEOUS SHUTDOWN"));
+ d->queueFinishDebugger();
}
void DebuggerEngine::notifyInferiorExited()
{
- XSDEBUG("NOTIFY_INFERIOR_EXIT");
+ showMessage(_("NOTE: INFERIOR EXITED"));
resetLocation();
// This can be issued in almost any state. We assume, though,
@@ -1299,6 +1294,7 @@ void DebuggerEngine::notifyInferiorExited()
}
setState(InferiorShutdownRequested);
setState(InferiorShutdownOk);
+ showMessage(_("QUEUE: SHUTDOWN ENGINE"));
QTimer::singleShot(0, d, SLOT(doShutdownEngine()));
}
@@ -1393,7 +1389,7 @@ bool DebuggerEngine::isReverseDebugging() const
// called by DebuggerRunControl
void DebuggerEngine::quitDebugger()
{
- qDebug() << "QUIT_DEBUGGER";
+ showMessage("QUIT DEBUGGER REQUESTED");
shutdownInferior();
}
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index c90581cac3a..bdb6a45f3c5 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -265,6 +265,8 @@ protected:
void notifyEngineRunAndInferiorRunOk();
void notifyEngineRunAndInferiorStopOk();
void notifyInferiorUnrunnable(); // Called by CoreAdapter.
+
+ // Use notifyInferiorRunRequested() plus notifyInferiorRunOk() instead.
//void notifyInferiorSpontaneousRun();
void notifyInferiorRunRequested();
@@ -292,7 +294,7 @@ protected:
virtual void shutdownInferior() = 0;
virtual void shutdownEngine() = 0;
-//private: // FIXME. State transitions
+private:
void setState(DebuggerState state, bool forced = false);
private:
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 7395d2a4c66..cc46107b1b7 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1170,6 +1170,11 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
if (state() == InferiorSetupRequested)
return;
+ if (isDying()) {
+ notifyInferiorStopOk();
+ return;
+ }
+
const QByteArray reason = data.findChild("reason").data();
if (isExitedReason(reason)) {
@@ -1194,7 +1199,7 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
if (!m_commandsToRunOnTemporaryBreak.isEmpty()) {
QTC_ASSERT(state() == InferiorStopRequested, qDebug() << state())
- //setState(InferiorStopOk);
+ notifyInferiorStopOk();
flushQueuedCommands();
if (state() == InferiorStopOk) {
QTC_ASSERT(m_commandsDoneCallback == 0, /**/);
@@ -1359,6 +1364,12 @@ void GdbEngine::handleStop1(const GdbResponse &response)
void GdbEngine::handleStop1(const GdbMi &data)
{
+ if (isDying()) {
+ qDebug() << "HANDLING STOP WHILE DYING";
+ notifyInferiorStopOk();
+ return;
+ }
+
QByteArray reason = data.findChild("reason").data();
if (0 && m_gdbAdapter->isTrkAdapter()
@@ -1735,18 +1746,6 @@ void GdbEngine::handleDetach(const GdbResponse &response)
notifyInferiorExited();
}
-void GdbEngine::quitDebugger()
-{
- // FIXME: The problem here is that the "kill" send in the shutdown()
- // procedure might not receive a response anymore. So we need a way
- // to force it down. On the other hand, there could be an answer,
- // and regular the inferior shutdown procedure could take a while.
- // And the RunControl::stop() is called synchroneously.
- shutdownEngine();
- //initializeVariables();
- //setState(DebuggerNotReady);
-}
-
int GdbEngine::currentFrame() const
{
return stackHandler()->currentIndex();
@@ -3054,8 +3053,11 @@ void GdbEngine::activateSnapshot(int index)
if (state() == InferiorUnrunnable) {
// All is well. We are looking at another core file.
+#if 0
+ // FIXME AAA
setState(EngineShutdownRequested);
setState(DebuggerNotReady);
+#endif
activateSnapshot2();
} else if (state() != DebuggerNotReady) {
QMessageBox *mb = showMessageBox(QMessageBox::Critical,
@@ -3078,20 +3080,18 @@ void GdbEngine::activateSnapshot(int index)
void GdbEngine::handleActivateSnapshot(const GdbResponse &response)
{
Q_UNUSED(response);
- setState(InferiorShutdownRequested);
- setState(InferiorShutdownOk);
- setState(EngineShutdownRequested);
- setState(DebuggerNotReady);
- activateSnapshot2();
+ quitDebugger();
}
void GdbEngine::activateSnapshot2()
{
// Otherwise the stack data might be stale.
// See http://sourceware.org/bugzilla/show_bug.cgi?id=1124.
+#if 0
setState(EngineSetupRequested);
postCommand("set stack-cache off");
handleAdapterStarted();
+#endif
}
@@ -4301,14 +4301,12 @@ void GdbEngine::handleInferiorPrepared()
void GdbEngine::finishInferiorSetup()
{
QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
- showMessage(_("BREAKPOINTS SET, CONTINUING INFERIOR STARTUP"));
notifyInferiorSetupOk();
}
void GdbEngine::runEngine()
{
QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
- showMessage(_("RUN ENGINE"));
m_gdbAdapter->runEngine();
}
diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp
index ff573722c5a..66fae71c6d7 100644
--- a/src/plugins/debugger/gdb/termgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/termgdbadapter.cpp
@@ -178,7 +178,6 @@ void TermGdbAdapter::stubExited()
return;
}
showMessage(_("STUB EXITED"));
- qDebug() << "STUB EXITED IN STATE: " << state();
m_engine->notifyEngineIll();
}
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 04da9d3b5a8..a5d2c64add9 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -269,6 +269,7 @@ void QmlEngine::setupEngine()
}
#endif
notifyEngineSetupOk();
+
//m_frameRate = new CanvasFrameRate(0);
//m_frameRate->show();
}
@@ -313,24 +314,23 @@ void QmlEngine::setupConnection()
}
#endif
- notifyEngineSetupOk();
+ notifyEngineRunAndInferiorStopOk();
qDebug() << "CONNECTION SUCCESSFUL";
- setState(InferiorRunRequested);
- setState(InferiorRunOk);
// reloadEngines();
-
+// continueInferior();
}
void QmlEngine::continueInferior()
{
+ QTC_ASSERT(state() == InferiorStopOk, qDebug() << state());
SDEBUG("QmlEngine::continueInferior()");
QByteArray reply;
QDataStream rs(&reply, QIODevice::WriteOnly);
rs << QByteArray("CONTINUE");
sendMessage(reply);
- setState(InferiorRunRequested);
- setState(InferiorRunOk);
+ notifyInferiorRunRequested();
+ notifyInferiorRunOk();
}
void QmlEngine::interruptInferior()
@@ -349,8 +349,8 @@ void QmlEngine::executeStep()
QDataStream rs(&reply, QIODevice::WriteOnly);
rs << QByteArray("STEPINTO");
sendMessage(reply);
- setState(InferiorRunRequested);
- setState(InferiorRunOk);
+ notifyInferiorRunRequested();
+ notifyInferiorRunOk();
}
void QmlEngine::executeStepI()
@@ -360,8 +360,8 @@ void QmlEngine::executeStepI()
QDataStream rs(&reply, QIODevice::WriteOnly);
rs << QByteArray("STEPINTO");
sendMessage(reply);
- setState(InferiorRunRequested);
- setState(InferiorRunOk);
+ notifyInferiorRunRequested();
+ notifyInferiorRunOk();
}
void QmlEngine::executeStepOut()
@@ -371,8 +371,8 @@ void QmlEngine::executeStepOut()
QDataStream rs(&reply, QIODevice::WriteOnly);
rs << QByteArray("STEPOUT");
sendMessage(reply);
- setState(InferiorRunRequested);
- setState(InferiorRunOk);
+ notifyInferiorRunRequested();
+ notifyInferiorRunOk();
}
void QmlEngine::executeNext()
@@ -381,8 +381,8 @@ void QmlEngine::executeNext()
QDataStream rs(&reply, QIODevice::WriteOnly);
rs << QByteArray("STEPOVER");
sendMessage(reply);
- setState(InferiorRunRequested);
- setState(InferiorRunOk);
+ notifyInferiorRunRequested();
+ notifyInferiorRunOk();
SDEBUG("QmlEngine::nextExec()");
}
@@ -632,8 +632,7 @@ void QmlEngine::messageReceived(const QByteArray &message)
showMessage(_("RECEIVED RESPONSE: ") + quoteUnprintableLatin1(message));
if (command == "STOPPED") {
- setState(InferiorStopRequested);
- setState(InferiorStopOk);
+ notifyInferiorSpontaneousStop();
QList<QPair<QString, QPair<QString, qint32> > > backtrace;
QList<QPair<QString, QVariant> > watches;
@@ -725,8 +724,8 @@ void QmlEngine::handleProcError(QProcess::ProcessError error)
case QProcess::WriteError:
case QProcess::Timedout:
default:
- m_proc.kill();
- setState(EngineShutdownRequested, true);
+ //m_proc.kill();
+ notifyEngineIll();
plugin()->showMessageBox(QMessageBox::Critical, tr("Gdb I/O Error"),
errorMessage(error));
break;
@@ -736,7 +735,8 @@ void QmlEngine::handleProcError(QProcess::ProcessError error)
void QmlEngine::handleProcFinished(int code, QProcess::ExitStatus type)
{
showMessage(_("QML VIEWER PROCESS FINISHED, status %1, code %2").arg(type).arg(code));
- setState(DebuggerNotReady, true);
+ notifyEngineIll();
+ //setState(DebuggerNotReady, true);
}
void QmlEngine::readProcStandardError()
diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h
index 1b7c94a8899..29e876983ad 100644
--- a/src/plugins/debugger/qml/qmlengine.h
+++ b/src/plugins/debugger/qml/qmlengine.h
@@ -75,7 +75,6 @@ public:
~QmlEngine();
void messageReceived(const QByteArray &message);
- using DebuggerEngine::setState;
private:
// DebuggerEngine implementation
--
GitLab