Changeset 12880 in vbox for trunk

Timestamp:

Oct 1, 2008 9:45:19 PM (16 years ago)

Author:

vboxsync

Message:

Debugger: fixed busy/ready.

Location:

trunk

Files:

• include/VBox/dbg.h (modified) (2 diffs)
• src/VBox/Debugger/DBGCInternal.h (modified) (1 diff)
• src/VBox/Debugger/DBGCTcp.cpp (modified) (2 diffs)
• src/VBox/Debugger/DBGConsole.cpp (modified) (6 diffs)
• src/VBox/Debugger/VBoxDbgConsole.cpp (modified) (5 diffs)
• src/VBox/Debugger/VBoxDbgConsole.h (modified) (2 diffs)

trunk/include/VBox/dbg.h

@@ -644 +644 @@
 typedef FNDBGCBACKWRITE *PFNDBGCBACKWRITE;
 
+/**
+ * Ready / busy notification.
+ *
+ * @param   pBack       Pointer to the backend structure supplied by
+ *                      the backend. The backend can use this to find
+ *                      it's instance data.
+ * @param   fReady      Whether it's ready (true) or busy (false).
+ */
+typedef DECLCALLBACK(void) FNDBGCBACKSETREADY(PDBGCBACK pBack, bool fReady);
+/** Pointer to a FNDBGCBACKSETREADY() callback. */
+typedef FNDBGCBACKSETREADY *PFNDBGCBACKSETREADY;
+
 
 /**
@@ -657 +669 @@
     /** Write output. */
     PFNDBGCBACKWRITE    pfnWrite;
+    /** Ready / busy notification. */
+    PFNDBGCBACKSETREADY pfnSetReady;
 } DBGCBACK;
 

trunk/src/VBox/Debugger/DBGCInternal.h

@@ -196 +196 @@
     /** Indicates whether or we're ready for input. */
     bool                fReady;
-
     /** Scratch buffer position. */
     char               *pszScratch;

trunk/src/VBox/Debugger/DBGCTcp.cpp

@@ -169 +169 @@
 }
 
+/** @copydoc FNDBGCBACKSETREADY */
+static DECLCALLBACK(void) dbgcTcpBackSetReady(PDBGCBACK pBack, bool fBusy)
+{
+    /* stub */
+    NOREF(pBack);
+    NOREF(fBusy);
+}
+
 
 /**
@@ -188 +196 @@
      */
     DBGCTCP    DbgcTcp;
-    DbgcTcp.Back.pfnInput = dbgcTcpBackInput;
-    DbgcTcp.Back.pfnRead  = dbgcTcpBackRead;
-    DbgcTcp.Back.pfnWrite = dbgcTcpBackWrite;
+    DbgcTcp.Back.pfnInput    = dbgcTcpBackInput;
+    DbgcTcp.Back.pfnRead     = dbgcTcpBackRead;
+    DbgcTcp.Back.pfnWrite    = dbgcTcpBackWrite;
+    DbgcTcp.Back.pfnSetReady = dbgcTcpBackSetReady;
     DbgcTcp.fAlive = true;
     DbgcTcp.Sock   = Sock;

trunk/src/VBox/Debugger/DBGConsole.cpp

@@ -1605 +1605 @@
      */
     int rc = dbgcInputRead(pDbgc);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -1613 +1613 @@
     if (pDbgc->cInputLines)
     {
-        /** @todo this fReady stuff is broken. */
+        pDbgc->pBack->pfnSetReady(pDbgc->pBack, false);
         pDbgc->fReady = false;
         rc = dbgcProcessCommands(pDbgc, fNoExecute);
-        if (VBOX_SUCCESS(rc) && rc != VWRN_DBGC_CMD_PENDING)
+        if (RT_SUCCESS(rc) && rc != VWRN_DBGC_CMD_PENDING)
             pDbgc->fReady = true;
-        if (    VBOX_SUCCESS(rc)
+
+        if (    RT_SUCCESS(rc)
             &&  pDbgc->iRead == pDbgc->iWrite
             &&  pDbgc->fReady)
             rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "VBoxDbg> ");
+
+        if (    RT_SUCCESS(rc)
+            &&  pDbgc->fReady)
+            pDbgc->pBack->pfnSetReady(pDbgc->pBack, true);
     }
     else
@@ -1796 +1801 @@
         {
             rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\ndbgf/dbgc error: Invalid command event!\n");
-            fPrintPrompt = !pDbgc->fReady;
             break;
         }
@@ -1802 +1806 @@
         case DBGFEVENT_TERMINATING:
         {
+            pDbgc->fReady = false;
+            pDbgc->pBack->pfnSetReady(pDbgc->pBack, false);
             pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\nVM is terminating!\n");
+            fPrintPrompt = false;
             rc = VERR_GENERAL_FAILURE;
             break;
@@ -1811 +1818 @@
         {
             rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\ndbgf/dbgc error: Unknown event %d!\n", pEvent->enmType);
-            fPrintPrompt = !pDbgc->fReady;
             break;
         }
@@ -1822 +1828 @@
     {
         rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "VBoxDbg> ");
+        pDbgc->fReady = true;
+        if (RT_SUCCESS(rc))
+            pDbgc->pBack->pfnSetReady(pDbgc->pBack, true);
     }
 

trunk/src/VBox/Debugger/VBoxDbgConsole.cpp

@@ -276 +276 @@
 
 VBoxDbgConsole::VBoxDbgConsole(PVM pVM, QWidget *pParent/* = NULL*/, const char *pszName/* = NULL*/)
-    : VBoxDbgBase(pVM), m_pOutput(NULL), m_pInput(NULL),
-    m_fInputNeedsEnabling(false), m_fInputRestoreFocus(false),
+    : VBoxDbgBase(pVM), m_pOutput(NULL), m_pInput(NULL), m_fInputRestoreFocus(false),
     m_pszInputBuf(NULL), m_cbInputBuf(0), m_cbInputBufAlloc(0),
     m_pszOutputBuf(NULL), m_cbOutputBuf(0), m_cbOutputBufAlloc(0),
@@ -380 +379 @@
      * Init the backend structure.
      */
-    m_Back.Core.pfnInput = backInput;
-    m_Back.Core.pfnRead  = backRead;
-    m_Back.Core.pfnWrite = backWrite;
+    m_Back.Core.pfnInput   = backInput;
+    m_Back.Core.pfnRead    = backRead;
+    m_Back.Core.pfnWrite   = backWrite;
+    m_Back.Core.pfnSetReady = backSetReady;
     m_Back.pSelf = this;
 
@@ -506 +506 @@
 
     m_fInputRestoreFocus = m_pInput->hasFocus();    /* dirty focus hack */
-    m_fInputNeedsEnabling = true;
     m_pInput->setEnabled(false);
 
@@ -568 +567 @@
     if (!pThis->m_cbInputBuf)
     {
-        /*
-         * Questing for input and not finding any means it's done processing
-         * any commands that we've queued. Re-enable the input field if required.
-         */
-        if (pThis->m_fInputNeedsEnabling)
-        {
-            pThis->m_fInputNeedsEnabling = false;
-            QApplication::postEvent(pThis, new VBoxDbgConsoleEvent(VBoxDbgConsoleEvent::kInputEnable));
-        }
-
         /*
          * Wait outside the lock for the requested time, then check again.
@@ -693 +682 @@
 
 
+/*static*/ DECLCALLBACK(void)
+VBoxDbgConsole::backSetReady(PDBGCBACK pBack, bool fReady)
+{
+    VBoxDbgConsole *pThis = VBOXDBGCONSOLE_FROM_DBGCBACK(pBack);
+    if (fReady)
+        QApplication::postEvent(pThis, new VBoxDbgConsoleEvent(VBoxDbgConsoleEvent::kInputEnable));
+}
+
+
 /**
  * The Debugger Console Thread

trunk/src/VBox/Debugger/VBoxDbgConsole.h

@@ -239 +239 @@
 
     /**
+     * @copydoc FNDBGCBACKSETREADY
+     */
+    static DECLCALLBACK(void) backSetReady(PDBGCBACK pBack, bool fReady);
+
+    /**
      * The Debugger Console Thread
      *
@@ -264 +269 @@
     /** The input widget. */
     VBoxDbgConsoleInput *m_pInput;
-    /** Whether we should send the kInputEnable event or not. */
-    bool m_fInputNeedsEnabling;
     /** A hack to restore focus to the combobox after a command execution. */
     bool m_fInputRestoreFocus;