Changeset 8823 in vbox for trunk/src/VBox/VMM/DBGF.cpp

Timestamp:

May 14, 2008 9:51:07 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

30830

Message:

Don't loop forever in DBGFR3Term if the debugger and EMT race each other.

File:

• trunk/src/VBox/VMM/DBGF.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/DBGF.cpp

@@ -159 +159 @@
         &&  pVM->dbgf.s.PingPong.enmSpeaker == RTPINGPONGSPEAKER_PONG)
     {
-        do  rc = RTSemPingWait(&pVM->dbgf.s.PingPong, 5000);
-        while (pVM->dbgf.s.fAttached);
+        RTThreadSleep(32); /* Don't want that assertion if we can help it. */
+        while (   pVM->dbgf.s.fAttached
+               && pVM->dbgf.s.PingPong.enmSpeaker == RTPINGPONGSPEAKER_PONG)
+            if (RTSemPingWait(&pVM->dbgf.s.PingPong, 5000) != VERR_TIMEOUT)
+                break;
     }
 
@@ -827 +830 @@
 DBGFR3DECL(int) DBGFR3Detach(PVM pVM)
 {
+    LogFlowFunc(("\n"));
+
     /*
      * Check if attached.
@@ -839 +844 @@
      * Send detach command.
      */
+    DBGFCMD enmCmd;
     if (pVM->dbgf.s.PingPong.enmSpeaker == RTPINGPONGSPEAKER_PONG)
     {
-        dbgfr3SetCmd(pVM, DBGFCMD_DETACH_DEBUGGER);
+        enmCmd = dbgfr3SetCmd(pVM, DBGFCMD_DETACH_DEBUGGER);
         int rc = RTSemPong(&pVM->dbgf.s.PingPong);
         if (VBOX_FAILURE(rc))
@@ -848 +854 @@
             return rc;
         }
+        LogFunc(("enmCmd=%d (pong -> ping)\n", enmCmd));
     }
     else
-        dbgfr3SetCmd(pVM, DBGFCMD_DETACH_DEBUGGER);
+    {
+        enmCmd = dbgfr3SetCmd(pVM, DBGFCMD_DETACH_DEBUGGER);
+        LogFunc(("enmCmd=%d (ping)\n", enmCmd));
+    }
 
     /*
@@ -866 +876 @@
      * Destroy the ping-pong construct and return.
      */
-    pVM->dbgf.s.fAttached = false;
+    ASMAtomicWriteBool(&pVM->dbgf.s.fAttached, false);
     RTThreadSleep(10);
     rc = RTSemPingPongDestroy(&pVM->dbgf.s.PingPong);
     AssertRC(rc);
 
+    LogFlowFunc(("returns VINF_SUCCESS\n"));
     return VINF_SUCCESS;
 }