debugger: make parts of python debugger work again with the new states

share/qtcreator/gdbmacros/pdumper.py

@@ -3,8 +3,13 @@ import pdb;
 import sys;
 import linecache
 
+def qdebug(options = None,
+            expanded = None,
+            typeformats = None,
+            individualformats = None,
+            watchers = None):
 
-class qdebug:
+    class QDebug:
         def __init__(self,
                 options = None,
                 expanded = None,
@@ -16,6 +21,7 @@ class qdebug:
             self.typeformats = typeformats
             self.individualformats = individualformats
             self.watchers = watchers
+            self.buffer = ""
             if self.options == "listmodules":
                 self.handleListModules()
             elif self.options == "listsymbols":
@@ -24,7 +30,8 @@ class qdebug:
                 self.handleListVars()
 
         def put(self, value):
-        sys.stdout.write(value)
+            #sys.stdout.write(value)
+            self.buffer += value
 
         def putField(self, name, value):
             self.put('%s="%s",' % (name, value))
@@ -216,8 +223,7 @@ class qdebug:
                     isActive = True
                 frame = frame.f_back
                 n = n + 1
-
+            #sys.stdout.flush()
-        sys.stdout.flush()
 
         def handleListModules(self):
             self.put("modules=[");
@@ -227,7 +233,7 @@ class qdebug:
                 self.putValue(sys.modules[name])
                 self.put("},")
             self.put("]")
-        sys.stdout.flush()
+            #sys.stdout.flush()
 
         def handleListSymbols(self, module):
             #self.put("symbols=%s" % dir(sys.modules[module]))
@@ -238,4 +244,9 @@ class qdebug:
                 #self.putValue(sys.modules[name])
                 self.put("},")
             self.put("]")
+            #sys.stdout.flush()
+
+    d = QDebug(options, expanded, typeformats, individualformats, watchers)
+    #print d.buffer
+    sys.stdout.write(d.buffer)
     sys.stdout.flush()

src/plugins/debugger/pdb/pdbengine.cpp

@@ -61,8 +61,8 @@
 #include <QtCore/QVariant>
 
 #include <QtGui/QApplication>
-#include <QtGui/QToolTip>
 #include <QtGui/QMessageBox>
+#include <QtGui/QToolTip>
 
 
 #define DEBUG_SCRIPT 1
@@ -94,12 +94,26 @@ PdbEngine::~PdbEngine()
 
 void PdbEngine::executeDebuggerCommand(const QString &command)
 {
-    XSDEBUG("PdbEngine::executeDebuggerCommand:" << command);
+    QTC_ASSERT(state() == InferiorStopOk, qDebug() << state());
+    //XSDEBUG("PdbEngine::executeDebuggerCommand:" << command);
     if (state() == DebuggerNotReady) {
         showMessage(_("PDB PROCESS NOT RUNNING, PLAIN CMD IGNORED: ") + command);
         return;
     }
-    m_pdbProc.write(command.toLatin1() + "\n");
+    QTC_ASSERT(m_pdbProc.state() == QProcess::Running, notifyEngineIll());
+    postCommand(command.toLatin1(), CB(handleExecuteDebuggerCommand));
+}
+
+void PdbEngine::handleExecuteDebuggerCommand(const PdbResponse &response)
+{
+    Q_UNUSED(response);
+}
+
+void PdbEngine::postDirectCommand(const QByteArray &command)
+{
+    QTC_ASSERT(m_pdbProc.state() == QProcess::Running, notifyEngineIll());
+    showMessage(_(command), LogInput);
+    m_pdbProc.write(command + "\n");
 }
 
 void PdbEngine::postCommand(const QByteArray &command,
@@ -108,12 +122,14 @@ void PdbEngine::postCommand(const QByteArray &command,
                  const char *callbackName,
                  const QVariant &cookie)
 {
+    QTC_ASSERT(m_pdbProc.state() == QProcess::Running, notifyEngineIll());
     PdbCommand cmd;
     cmd.command = command;
     cmd.callback = callback;
     cmd.callbackName = callbackName;
     cmd.cookie = cookie;
     m_commands.enqueue(cmd);
+    qDebug() << "ENQUEUE: " << command << cmd.callbackName;
     showMessage(_(cmd.command), LogInput);
     m_pdbProc.write(cmd.command + "\n");
 }
@@ -127,7 +143,6 @@ void PdbEngine::shutdownInferior()
 void PdbEngine::shutdownEngine()
 {
     QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
-    SDEBUG("PdbEngine::shutdownEngine()");
     m_pdbProc.kill();
 }
 
@@ -135,24 +150,8 @@ void PdbEngine::setupEngine()
 {
     QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
 
-    m_scriptFileName = QFileInfo(startParameters().executable).absoluteFilePath();
+    m_pdb = _("python");
-    QFile scriptFile(m_scriptFileName);
-    if (!scriptFile.open(QIODevice::ReadOnly|QIODevice::Text)) {
-        //showMessage("STARTING " +m_scriptFileName + "FAILED");
-        showMessage(QString::fromLatin1("Cannot open %1: %2").
-                   arg(m_scriptFileName, scriptFile.errorString()), LogError);
-        notifyEngineSetupFailed();
-        return;
-    }
-    m_pdbProc.disconnect(); // From any previous runs
-
-    m_pdb = _("/usr/bin/python");
     showMessage(_("STARTING PDB ") + m_pdb);
-    QStringList gdbArgs;
-    gdbArgs += _("-i");
-    gdbArgs += _("/usr/bin/pdb");
-    gdbArgs += m_scriptFileName;
-    //gdbArgs += args;
 
     connect(&m_pdbProc, SIGNAL(error(QProcess::ProcessError)),
         SLOT(handlePdbError(QProcess::ProcessError)));
@@ -163,13 +162,15 @@ void PdbEngine::setupEngine()
     connect(&m_pdbProc, SIGNAL(readyReadStandardError()),
         SLOT(readPdbStandardError()));
 
+    connect(this, SIGNAL(outputReady(QByteArray)),
+        SLOT(handleOutput2(QByteArray)), Qt::QueuedConnection);
+
     // We will stop immediatly, so setup a proper callback.
     PdbCommand cmd;
     cmd.callback = &PdbEngine::handleFirstCommand;
     m_commands.enqueue(cmd);
 
-    m_pdbProc.start(m_pdb, gdbArgs);
+    m_pdbProc.start(m_pdb, QStringList() << _("-i"));
-    //qDebug() << "STARTING:" << m_pdb << gdbArgs;
 
     if (!m_pdbProc.waitForStarted()) {
         const QString msg = tr("Unable to start pdb '%1': %2")
@@ -189,21 +190,33 @@ void PdbEngine::setupEngine()
 void PdbEngine::setupInferior()
 {
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
-    attemptBreakpointSynchronization();
 
-    showMessage(_("PDB STARTED, INITIALIZING IT"));
+    QString fileName = QFileInfo(startParameters().executable).absoluteFilePath();
-    const QByteArray dumperSourcePath =
+    QFile scriptFile(fileName);
-        Core::ICore::instance()->resourcePath().toLocal8Bit() + "/gdbmacros/";
+    if (!scriptFile.open(QIODevice::ReadOnly|QIODevice::Text)) {
-    postCommand("execfile('" + dumperSourcePath + "pdumper.py')",
+        showMessageBox(QMessageBox::Critical, tr("Python Error"),
-        CB(handleLoadDumper));
+            _("Cannot open script file %1:\n%2").
+               arg(fileName, scriptFile.errorString()));
+        notifyInferiorSetupFailed();
+        return;
+    }
+    notifyInferiorSetupOk();
 }
 
 void PdbEngine::runEngine()
 {
+    QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
     showStatusMessage(tr("Running requested..."), 5000);
-    SDEBUG("PdbEngine::runEngine()");
+    const QByteArray dumperSourcePath =
-    notifyEngineRunAndInferiorRunOk();
+        Core::ICore::instance()->resourcePath().toLocal8Bit() + "/gdbmacros/";
-    postCommand("continue", CB(handleUpdateAll));
+    QString fileName = QFileInfo(startParameters().executable).absoluteFilePath();
+    postDirectCommand("import sys");
+    postDirectCommand("sys.argv.append('" + fileName.toLocal8Bit() + "')");
+    postDirectCommand("execfile('/usr/bin/pdb')");
+    postDirectCommand("execfile('" + dumperSourcePath + "pdumper.py')");
+    attemptBreakpointSynchronization();
+    notifyEngineRunAndInferiorStopOk();
+    continueInferior();
 }
 
 void PdbEngine::interruptInferior()
@@ -388,7 +401,7 @@ void PdbEngine::loadAllSymbols()
 
 void PdbEngine::reloadModules()
 {
-    postCommand("qdebug('listmodules')", CB(handleListModules));
+    //postCommand("qdebug('listmodules')", CB(handleListModules));
 }
 
 void PdbEngine::handleListModules(const PdbResponse &response)
@@ -549,6 +562,7 @@ void PdbEngine::updateWatchData(const WatchData &data)
 
 void PdbEngine::handlePdbError(QProcess::ProcessError error)
 {
+    qDebug() << "HANDLE PDB ERROR";
     showMessage(_("HANDLE PDB ERROR"));
     switch (error) {
     case QProcess::Crashed:
@@ -595,6 +609,7 @@ QString PdbEngine::errorMessage(QProcess::ProcessError error) const
 
 void PdbEngine::handlePdbFinished(int code, QProcess::ExitStatus type)
 {
+    qDebug() << "PDB FINISHED";
     showMessage(_("PDB PROCESS FINISHED, status %1, code %2").arg(type).arg(code));
     notifyEngineSpontaneousShutdown();
 }
@@ -602,24 +617,48 @@ void PdbEngine::handlePdbFinished(int code, QProcess::ExitStatus type)
 void PdbEngine::readPdbStandardError()
 {
     QByteArray err = m_pdbProc.readAllStandardError();
-    qWarning() << "Unexpected pdb stderr:" << err;
+    qDebug() << "\nPDB STDERR" << err;
-    showMessage(_("Unexpected pdb stderr: " + err));
+    //qWarning() << "Unexpected pdb stderr:" << err;
+    //showMessage(_("Unexpected pdb stderr: " + err));
+    //handleOutput(err);
 }
 
 void PdbEngine::readPdbStandardOutput()
 {
-    m_inbuffer.append(m_pdbProc.readAllStandardOutput());
+    QByteArray out = m_pdbProc.readAllStandardOutput();
-    //qDebug() << "BUFFER FROM: '" << m_inbuffer << "'";
+    qDebug() << "\nPDB STDOUT" << out;
-    int pos = 1;
+    handleOutput(out);
-    while ((pos = m_inbuffer.indexOf("(Pdb)")) != -1) {
+}
-        PdbResponse response;
+
-        response.data = m_inbuffer.left(pos).trimmed();
+void PdbEngine::handleOutput(const QByteArray &data)
-        showMessage(_(response.data));
+{
+    //qDebug() << "READ: " << data;
+    m_inbuffer.append(data);
+    qDebug() << "BUFFER FROM: '" << m_inbuffer << "'";
+    while (true) {
+        int pos = m_inbuffer.indexOf("(Pdb)");
+        if (pos == -1)
+            pos = m_inbuffer.indexOf(">>>");
+        if (pos == -1)
+            break;
+        QByteArray response = m_inbuffer.left(pos).trimmed();
         m_inbuffer = m_inbuffer.mid(pos + 6);
-        QTC_ASSERT(!m_commands.isEmpty(),
+        emit outputReady(response);
-            qDebug() << "RESPONSE: " << response.data; return)
+    }
+    qDebug() << "BUFFER LEFT: '" << m_inbuffer << "'";
+    //m_inbuffer.clear();
+}
+
+
+void PdbEngine::handleOutput2(const QByteArray &data)
+{
+    PdbResponse response;
+    response.data = data;
+    showMessage(_(data));
+    QTC_ASSERT(!m_commands.isEmpty(), qDebug() << "RESPONSE: " << data; return)
     PdbCommand cmd = m_commands.dequeue();
     response.cookie = cmd.cookie;
+    qDebug() << "DEQUE: " << cmd.command << cmd.callbackName;
     if (cmd.callback) {
         //qDebug() << "EXECUTING CALLBACK " << cmd.callbackName
         //    << " RESPONSE: " << response.data;
@@ -628,9 +667,7 @@ void PdbEngine::readPdbStandardOutput()
         qDebug() << "NO CALLBACK FOR RESPONSE: " << response.data;
     }
 }
-    //qDebug() << "BUFFER LEFT: '" << m_inbuffer << "'";
+/*
-}
-
 void PdbEngine::handleResponse(const QByteArray &response0)
 {
     QByteArray response = response0;
@@ -663,6 +700,7 @@ void PdbEngine::handleResponse(const QByteArray &response0)
     }
     qDebug() << "COULD NOT PARSE RESPONSE: '" << response << "'";
 }
+*/
 
 void PdbEngine::handleFirstCommand(const PdbResponse &response)
 {
@@ -677,6 +715,12 @@ void PdbEngine::handleUpdateAll(const PdbResponse &response)
 }
 
 void PdbEngine::updateAll()
+{
+    postCommand("bt", CB(handleBacktrace));
+    //updateLocals();
+}
+
+void PdbEngine::updateLocals()
 {
     WatchHandler *handler = watchHandler();
 
@@ -706,7 +750,6 @@ void PdbEngine::updateAll()
         options += "defaults,";
     options.chop(1);
 
-    postCommand("bt", CB(handleBacktrace));
     postCommand("qdebug('" + options + "','"
         + handler->expansionRequests() + "','"
         + handler->typeFormatRequests() + "','"
@@ -768,6 +811,8 @@ void PdbEngine::handleBacktrace(const PdbResponse &response)
         stackHandler()->setCurrentIndex(currentIndex);
         gotoLocation(stackFrames.at(currentIndex), true);
     }
+
+    updateLocals();
 }
 
 void PdbEngine::handleListLocals(const PdbResponse &response)
@@ -792,14 +837,6 @@ void PdbEngine::handleListLocals(const PdbResponse &response)
     handler->insertBulkData(list);
 }
 
-void PdbEngine::handleLoadDumper(const PdbResponse &response)
-{
-    Q_UNUSED(response);
-    //qDebug() << " DUMPERS LOADED '" << response.data << "'";
-    //continueInferior();
-    notifyInferiorSetupOk();
-}
-
 unsigned PdbEngine::debuggerCapabilities() const
 {
     return ReloadModuleCapability;

src/plugins/debugger/pdb/pdbengine.h

@@ -105,6 +105,9 @@ private:
     bool isSynchroneous() const { return true; }
     void updateWatchData(const WatchData &data);
 
+signals:
+    void outputReady(const QByteArray &data);
+
 private:
     QString errorMessage(QProcess::ProcessError error) const;
     unsigned debuggerCapabilities() const;
@@ -113,10 +116,14 @@ private:
     Q_SLOT void handlePdbError(QProcess::ProcessError error);
     Q_SLOT void readPdbStandardOutput();
     Q_SLOT void readPdbStandardError();
+    Q_SLOT void handleOutput2(const QByteArray &data);
     void handleResponse(const QByteArray &ba);
+    void handleOutput(const QByteArray &data);
     void updateAll();
+    void updateLocals();
     void handleUpdateAll(const PdbResponse &response);
     void handleFirstCommand(const PdbResponse &response);
+    void handleExecuteDebuggerCommand(const PdbResponse &response);
 
     typedef void (PdbEngine::*PdbCommandCallback)
         (const PdbResponse &response);
@@ -139,7 +146,6 @@ private:
     void handleListLocals(const PdbResponse &response);
     void handleListModules(const PdbResponse &response);
     void handleListSymbols(const PdbResponse &response);
-    void handleLoadDumper(const PdbResponse &response);
     void handleBreakInsert(const PdbResponse &response);
 
     void handleChildren(const WatchData &data0, const GdbMi &item,
@@ -149,6 +155,7 @@ private:
                      PdbCommandCallback callback = 0,
                      const char *callbackName = 0,
                      const QVariant &cookie = QVariant());
+    void postDirectCommand(const QByteArray &command);
 
     QQueue<PdbCommand> m_commands;
 

src/plugins/debugger/script/scriptengine.cpp

@@ -327,7 +327,8 @@ void ScriptEngine::importExtensions()
                      "Make sure that the bindings have been built, "
                      "and that this executable and the plugins are "
                      "using compatible Qt libraries.",
-                     qPrintable(failExtensions.join(QLatin1String(", "))), qPrintable(dir.absolutePath()));
+                     qPrintable(failExtensions.join(QLatin1String(", "))),
+                        qPrintable(dir.absolutePath()));
         }
     }
     return; // failExtensions.isEmpty();
@@ -336,12 +337,12 @@ void ScriptEngine::importExtensions()
 void ScriptEngine::runEngine()
 {
     QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
-    SDEBUG("ScriptEngine::runEngine()");
     notifyEngineRunAndInferiorRunOk();
     showStatusMessage(tr("Running requested..."), 5000);
     showMessage(QLatin1String("Running: ") + m_scriptFileName, LogMisc);
     importExtensions();
-    const QScriptValue result = m_scriptEngine->evaluate(m_scriptContents, m_scriptFileName);
+    const QScriptValue result =
+        m_scriptEngine->evaluate(m_scriptContents, m_scriptFileName);
     QString msg;
     if (m_scriptEngine->hasUncaughtException()) {
         msg = _("An exception occurred during execution at line: %1\n%2\n")

tests/manual/gdbdebugger/python/math.py

@@ -46,8 +46,8 @@ def testMath():
     print cube(5)
 
 def main():
-    #testMath()
+    testMath()
-    testApp()
+    #testApp()
     return 0
 
 if __name__ == '__main__':