Changeset 81561 in vbox

Timestamp:

Oct 28, 2019 12:44:44 PM (5 years ago)

Author:

vboxsync

Message:

PDMR3Task: The task thread (pdmR3TaskThread) should quit eventually when shutdown is signalled. Old code just keep processing tasks till nothing was pending. Will now do three loops trying to quice things and assert before exiting. bugref:9218

File:

• trunk/src/VBox/VMM/VMMR3/PDMR3Task.cpp (modified) (2 diffs)

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

@@ -225 +225 @@
             if (iTask == 0)
                 break;
+            uint32_t cShutdown = 3;
             do
             {
@@ -282 +283 @@
                 iTask = ASMBitFirstSetU64(fTriggered);
             } while (iTask != 0);
+
+            /*
+             * If we're shutting down, we'll try drain the pending tasks by
+             * looping three more times before just quitting.  We don't want
+             * to get stuck here if some stuff is misbehaving.
+             */
+            if (!ASMAtomicReadBool(&pTaskSet->fShutdown))
+            { /* likely */ }
+            else if (--cShutdown == 0)
+                break;
         }
 
         /*
-         * Wait.
+         * Wait unless we're shutting down.
          */
-        if (pTaskSet->fRZEnabled)
-            SUPSemEventWaitNoResume(pTaskSet->pVM->pSession, pTaskSet->hEventR0, RT_MS_15SEC);
-        else
-            RTSemEventWaitNoResume(pTaskSet->hEventR3, RT_MS_15SEC);
-    }
+        if (!ASMAtomicReadBool(&pTaskSet->fShutdown))
+        {
+            if (pTaskSet->fRZEnabled)
+                SUPSemEventWaitNoResume(pTaskSet->pVM->pSession, pTaskSet->hEventR0, RT_MS_15SEC);
+            else
+                RTSemEventWaitNoResume(pTaskSet->hEventR3, RT_MS_15SEC);
+        }
+    }
+
+    /*
+     * Complain about pending tasks.
+     */
+    uint64_t const fTriggered = ASMAtomicReadU64(&pTaskSet->fTriggered);
+    AssertLogRelMsg(fTriggered == 0, ("fTriggered=%#RX64 - %u %s\n", fTriggered, ASMBitFirstSetU64(fTriggered) - 1,
+                                      pTaskSet->aTasks[ASMBitFirstSetU64(fTriggered) - 1].pszName));
 
     return VINF_SUCCESS;