Changeset 60872 in vbox

Timestamp:

May 7, 2016 5:52:54 PM (9 years ago)

Author:

vboxsync

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

107084

Message:

DBGF: Allow attaching the debugger via the GUI during the dbgfR3WaitForAttach countdown.

File:

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

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

@@ -327 +327 @@
  * @returns True is a debugger have attached.
  * @param   pVM         The cross context VM structure.
+ * @param   pVCpu       The cross context per CPU structure.
  * @param   enmEvent    Event.
- */
-bool dbgfR3WaitForAttach(PVM pVM, DBGFEVENTTYPE enmEvent)
+ *
+ * @thread  EMT(pVCpu)
+ */
+bool dbgfR3WaitForAttach(PVM pVM, PVMCPU pVCpu, DBGFEVENTTYPE enmEvent)
 {
     /*
@@ -359 +362 @@
         }
 
+        /* Process priority stuff. */
+        if (   VM_FF_IS_PENDING(pVM, VM_FF_REQUEST)
+            || VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_REQUEST))
+        {
+            int rc = VMR3ReqProcessU(pVM->pUVM, VMCPUID_ANY, true /*fPriorityOnly*/);
+            if (rc == VINF_SUCCESS)
+                rc = VMR3ReqProcessU(pVM->pUVM, pVCpu->idCpu, true /*fPriorityOnly*/);
+            if (rc != VINF_SUCCESS)
+            {
+                RTStrmPrintf(g_pStdErr, "[rcReq=%Rrc, ignored!]", rc);
+                RTStrmFlush(g_pStdErr);
+            }
+        }
+
         /* next */
         if (!(cWait % 10))
@@ -481 +498 @@
      */
     if (    !pVM->dbgf.s.fAttached
-        &&  !dbgfR3WaitForAttach(pVM, enmEvent))
+        &&  !dbgfR3WaitForAttach(pVM, pVCpu, enmEvent))
     {
         Log(("DBGFR3VMMEventSrc: enmEvent=%d - debugger not attached\n", enmEvent));
@@ -989 +1006 @@
     /*
      * Call the VM, use EMT for serialization.
+     *
+     * Using a priority call here so we can actually attach a debugger during
+     * the countdown in dbgfR3WaitForAttach.
      */
     /** @todo SMP */
-    return VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)dbgfR3Attach, 1, pVM);
+    return VMR3ReqPriorityCallWait(pVM, VMCPUID_ANY, (PFNRT)dbgfR3Attach, 1, pVM);
 }