Changeset 45006 in vbox

Timestamp:

Mar 12, 2013 2:58:51 PM (12 years ago)

Author:

vboxsync

Message:

DBGF/DBGC: Fixing power off problems.

Location:

trunk

Files:

• include/VBox/vmm/dbgf.h (modified) (3 diffs)
• src/VBox/Debugger/DBGConsole.cpp (modified) (4 diffs)
• src/VBox/Debugger/testcase/tstDBGCStubs.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/DBGF.cpp (modified) (7 diffs)
• src/VBox/VMM/VMMR3/VM.cpp (modified) (1 diff)

trunk/include/VBox/vmm/dbgf.h

@@ -180 +180 @@
      */
     DBGFEVENT_DEV_STOP,
-    /** The VM is terminating.
+    /** The VM is powering off.
      * When this notification is received, the debugger thread should detach ASAP.
      */
-    DBGFEVENT_TERMINATING,
+    DBGFEVENT_POWERING_OFF,
 
     /** The usual 32-bit hack. */
@@ -284 +284 @@
 VMMR3_INT_DECL(int)     DBGFR3Init(PVM pVM);
 VMMR3_INT_DECL(int)     DBGFR3Term(PVM pVM);
+VMMR3_INT_DECL(void)    DBGFR3PowerOff(PVM pVM);
 VMMR3_INT_DECL(void)    DBGFR3Relocate(PVM pVM, RTGCINTPTR offDelta);
 VMMR3_INT_DECL(int)     DBGFR3VMMForcedAction(PVM pVM);
@@ -300 +301 @@
 VMMR3DECL(int)          DBGFR3Halt(PUVM pUVM);
 VMMR3DECL(bool)         DBGFR3IsHalted(PUVM pUVM);
-VMMR3DECL(bool)         DBGFR3CanWait(PUVM pUVM);
+VMMR3DECL(int)          DBGFR3QueryWaitable(PUVM pUVM);
 VMMR3DECL(int)          DBGFR3Resume(PUVM pUVM);
 VMMR3DECL(int)          DBGFR3Step(PUVM pUVM, VMCPUID idCpu);

trunk/src/VBox/Debugger/DBGConsole.cpp

@@ -738 +738 @@
         }
 
-        case DBGFEVENT_TERMINATING:
+        case DBGFEVENT_POWERING_OFF:
         {
             pDbgc->fReady = false;
             pDbgc->pBack->pfnSetReady(pDbgc->pBack, false);
-            pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\nVM is terminating!\n");
+            pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\nVM is powering off!\n");
             fPrintPrompt = false;
             rc = VERR_GENERAL_FAILURE;
@@ -808 +808 @@
      * before we must flush the log.
      */
-    int rc = VINF_SUCCESS;
+    int rc;
     for (;;)
     {
-        if (    pDbgc->pUVM
-            &&  DBGFR3CanWait(pDbgc->pUVM))
+        rc = VERR_SEM_OUT_OF_TURN;
+        if (pDbgc->pUVM)
+            rc = DBGFR3QueryWaitable(pDbgc->pUVM);
+
+        if (RT_SUCCESS(rc))
         {
             /*
@@ -838 +841 @@
             }
         }
-        else
+        else if (rc == VERR_SEM_OUT_OF_TURN)
         {
             /*
@@ -850 +853 @@
             }
         }
+        else
+            break;
 
         /*

trunk/src/VBox/Debugger/testcase/tstDBGCStubs.cpp

@@ -81 +81 @@
     return VERR_INTERNAL_ERROR;
 }
-VMMR3DECL(bool) DBGFR3CanWait(PUVM pUVM)
-{
-    return true;
+VMMR3DECL(int) DBGFR3QueryWaitable(PUVM pUVM)
+{
+    return VINF_SUCCESS;
 }
 VMMR3DECL(int) DBGFR3Detach(PUVM pUVM)

trunk/src/VBox/VMM/VMMR3/DBGF.cpp

@@ -165 +165 @@
 {
     PUVM pUVM = pVM->pUVM;
-    int rc;
-
-    /*
-     * Send a termination event to any attached debugger.
-     */
-    /* wait to become the speaker (we should already be that). */
-    if (    pVM->dbgf.s.fAttached
-        &&  RTSemPingShouldWait(&pVM->dbgf.s.PingPong))
-        RTSemPingWait(&pVM->dbgf.s.PingPong, 5000);
-
-    /* now, send the event if we're the speaker. */
-    if (    pVM->dbgf.s.fAttached
-        &&  RTSemPingIsSpeaker(&pVM->dbgf.s.PingPong))
-    {
-        DBGFCMD enmCmd = dbgfR3SetCmd(pVM, DBGFCMD_NO_COMMAND);
-        if (enmCmd == DBGFCMD_DETACH_DEBUGGER)
-            /* the debugger beat us to initiating the detaching. */
-            rc = VINF_SUCCESS;
-        else
-        {
-            /* ignore the command (if any). */
-            enmCmd = DBGFCMD_NO_COMMAND;
-            pVM->dbgf.s.DbgEvent.enmType = DBGFEVENT_TERMINATING;
-            pVM->dbgf.s.DbgEvent.enmCtx  = DBGFEVENTCTX_OTHER;
-            rc = RTSemPing(&pVM->dbgf.s.PingPong);
-        }
-
-        /*
-         * Process commands until we get a detached command.
-         */
-        while (RT_SUCCESS(rc) && enmCmd != DBGFCMD_DETACHED_DEBUGGER)
-        {
-            if (enmCmd != DBGFCMD_NO_COMMAND)
-            {
-                /* process command */
-                bool fResumeExecution;
-                DBGFCMDDATA CmdData = pVM->dbgf.s.VMMCmdData;
-                rc = dbgfR3VMMCmd(pVM, enmCmd, &CmdData, &fResumeExecution);
-                enmCmd = DBGFCMD_NO_COMMAND;
-            }
-            else
-            {
-                /* wait for new command. */
-                rc = RTSemPingWait(&pVM->dbgf.s.PingPong, RT_INDEFINITE_WAIT);
-                if (RT_SUCCESS(rc))
-                    enmCmd = dbgfR3SetCmd(pVM, DBGFCMD_NO_COMMAND);
-            }
-        }
-    }
-
-    /*
-     * Terminate the other bits.
-     */
+
     dbgfR3OSTerm(pUVM);
     dbgfR3AsTerm(pUVM);
@@ -223 +171 @@
     dbgfR3TraceTerm(pVM);
     dbgfR3InfoTerm(pUVM);
+
     return VINF_SUCCESS;
+}
+
+
+/**
+ * Called when the VM is powered off to detach debuggers.
+ *
+ * @param   pVM     The VM handle.
+ */
+VMMR3_INT_DECL(void) DBGFR3PowerOff(PVM pVM)
+{
+
+    /*
+     * Send a termination event to any attached debugger.
+     */
+    /* wait to become the speaker (we should already be that). */
+    if (    pVM->dbgf.s.fAttached
+        &&  RTSemPingShouldWait(&pVM->dbgf.s.PingPong))
+        RTSemPingWait(&pVM->dbgf.s.PingPong, 5000);
+
+    if (pVM->dbgf.s.fAttached)
+    {
+        /* Just mark it as detached if we're not in a position to send a power
+           off event.  It should fail later on. */
+        if (!RTSemPingIsSpeaker(&pVM->dbgf.s.PingPong))
+        {
+            ASMAtomicWriteBool(&pVM->dbgf.s.fAttached, false);
+            if (RTSemPingIsSpeaker(&pVM->dbgf.s.PingPong))
+                ASMAtomicWriteBool(&pVM->dbgf.s.fAttached, true);
+        }
+
+        if (RTSemPingIsSpeaker(&pVM->dbgf.s.PingPong))
+        {
+            /* Try send the power off event. */
+            int rc;
+            DBGFCMD enmCmd = dbgfR3SetCmd(pVM, DBGFCMD_NO_COMMAND);
+            if (enmCmd == DBGFCMD_DETACH_DEBUGGER)
+                /* the debugger beat us to initiating the detaching. */
+                rc = VINF_SUCCESS;
+            else
+            {
+                /* ignore the command (if any). */
+                enmCmd = DBGFCMD_NO_COMMAND;
+                pVM->dbgf.s.DbgEvent.enmType = DBGFEVENT_POWERING_OFF;
+                pVM->dbgf.s.DbgEvent.enmCtx  = DBGFEVENTCTX_OTHER;
+                rc = RTSemPing(&pVM->dbgf.s.PingPong);
+            }
+
+            /*
+             * Process commands and priority requests until we get a command
+             * indicating that the debugger has detached.
+             */
+            uint32_t cPollHack = 1;
+            PVMCPU   pVCpu     = VMMGetCpu(pVM);
+            while (RT_SUCCESS(rc))
+            {
+                if (enmCmd != DBGFCMD_NO_COMMAND)
+                {
+                    /* process command */
+                    bool fResumeExecution;
+                    DBGFCMDDATA CmdData = pVM->dbgf.s.VMMCmdData;
+                    rc = dbgfR3VMMCmd(pVM, enmCmd, &CmdData, &fResumeExecution);
+                    if (enmCmd == DBGFCMD_DETACHED_DEBUGGER)
+                        break;
+                    enmCmd = DBGFCMD_NO_COMMAND;
+                }
+                else
+                {
+                    /* Wait for new command, processing pending priority requests
+                       first.  The request processing is a bit crazy, but
+                       unfortunately required by plugin unloading. */
+                    if (   VM_FF_ISPENDING(pVM, VM_FF_REQUEST)
+                        || VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_REQUEST))
+                    {
+                        LogFlow(("DBGFR3PowerOff: Processes priority requests...\n"));
+                        rc = VMR3ReqProcessU(pVM->pUVM, VMCPUID_ANY, true /*fPriorityOnly*/);
+                        if (rc == VINF_SUCCESS)
+                            rc = VMR3ReqProcessU(pVM->pUVM, pVCpu->idCpu, true /*fPriorityOnly*/);
+                        LogFlow(("DBGFR3PowerOff: VMR3ReqProcess -> %Rrc\n", rc));
+                        cPollHack = 1;
+                    }
+                    else if (cPollHack < 120)
+                        cPollHack++;
+
+                    rc = RTSemPingWait(&pVM->dbgf.s.PingPong, cPollHack);
+                    if (RT_SUCCESS(rc))
+                        enmCmd = dbgfR3SetCmd(pVM, DBGFCMD_NO_COMMAND);
+                    else if (rc == VERR_TIMEOUT)
+                        rc = VINF_SUCCESS;
+                }
+            }
+
+            /*
+             * Clear the FF so we won't get confused later on.
+             */
+            VM_FF_CLEAR(pVM, VM_FF_DBGF);
+        }
+    }
 }
 
@@ -869 +915 @@
 VMMR3DECL(int) DBGFR3Attach(PUVM pUVM)
 {
-    UVM_ASSERT_VALID_EXT_RETURN(pUVM, false);
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE);
     PVM pVM = pUVM->pVM;
-    VM_ASSERT_VALID_EXT_RETURN(pVM, false);
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
 
     /*
@@ -925 +971 @@
      * Check if attached.
      */
-    UVM_ASSERT_VALID_EXT_RETURN(pUVM, false);
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE);
     PVM pVM = pUVM->pVM;
-    VM_ASSERT_VALID_EXT_RETURN(pVM, false);
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
     AssertReturn(pVM->dbgf.s.fAttached, VERR_DBGF_NOT_ATTACHED);
 
@@ -973 +1019 @@
      * Check state.
      */
-    UVM_ASSERT_VALID_EXT_RETURN(pUVM, false);
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE);
     PVM pVM = pUVM->pVM;
-    VM_ASSERT_VALID_EXT_RETURN(pVM, false);
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
     AssertReturn(pVM->dbgf.s.fAttached, VERR_DBGF_NOT_ATTACHED);
     *ppEvent = NULL;
@@ -1008 +1054 @@
      * Check state.
      */
-    UVM_ASSERT_VALID_EXT_RETURN(pUVM, false);
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE);
     PVM pVM = pUVM->pVM;
-    VM_ASSERT_VALID_EXT_RETURN(pVM, false);
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
     AssertReturn(pVM->dbgf.s.fAttached, VERR_DBGF_NOT_ATTACHED);
     RTPINGPONGSPEAKER enmSpeaker = pVM->dbgf.s.PingPong.enmSpeaker;
@@ -1051 +1097 @@
  * This function is only used by lazy, multiplexing debuggers. :-)
  *
- * @returns True if waitable.
- * @returns False if not waitable.
+ * @returns VBox status code.
+ * @retval  VINF_SUCCESS if waitable.
+ * @retval  VERR_SEM_OUT_OF_TURN if not waitable.
+ * @retval  VERR_INVALID_VM_HANDLE if the VM is being (/ has been) destroyed
+ *          (not asserted) or if the handle is invalid (asserted).
+ * @retval  VERR_DBGF_NOT_ATTACHED if not attached.
+ *
  * @param   pUVM        The user mode VM handle.
  */
-VMMR3DECL(bool) DBGFR3CanWait(PUVM pUVM)
-{
-    UVM_ASSERT_VALID_EXT_RETURN(pUVM, false);
+VMMR3DECL(int) DBGFR3QueryWaitable(PUVM pUVM)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE);
+
+    /* Note! There is a slight race here, unfortunately. */
     PVM pVM = pUVM->pVM;
-    VM_ASSERT_VALID_EXT_RETURN(pVM, false);
-    AssertReturn(pVM->dbgf.s.fAttached, false);
-
-    return RTSemPongShouldWait(&pVM->dbgf.s.PingPong);
+    if (!RT_VALID_PTR(pVM))
+        return VERR_INVALID_VM_HANDLE;
+    if (pVM->enmVMState >= VMSTATE_DESTROYING)
+        return VERR_INVALID_VM_HANDLE;
+    AssertReturn(pVM->dbgf.s.fAttached, VERR_DBGF_NOT_ATTACHED);
+
+    if (!RTSemPongShouldWait(&pVM->dbgf.s.PingPong))
+        return VERR_SEM_OUT_OF_TURN;
+
+    return VINF_SUCCESS;
 }
 

trunk/src/VBox/VMM/VMMR3/VM.cpp

@@ -2257 +2257 @@
          */
         PDMR3PowerOff(pVM);
+        DBGFR3PowerOff(pVM);
 
         PUVM pUVM = pVM->pUVM;