Changeset 7232 in vbox

Timestamp:

Mar 3, 2008 11:13:15 AM (17 years ago)

Author:

vboxsync

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

28564

Message:

Get rid of the no longer needed hacky wait for the async I/O threads to exit code, and replace it with the official way to wait for thread termination.

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -5273 +5273 @@
     {
         uint64_t    u64Start = RTTimeMilliTS();
-        bool        fAllDone;
-        for (;;)
-        {
-            /* check */
-            fAllDone = true;
-            for (uint32_t i = 0; i < RT_ELEMENTS(pData->aCts) && fAllDone; i++)
-                fAllDone &= (pData->aCts[i].AsyncIOThread == NIL_RTTHREAD);
-
-            if (    fAllDone
-                ||  RTTimeMilliTS() - u64Start >= 5000)
-                break;
-
-            /* Sleep for a bit. */
-            RTThreadSleep(100);
-        }
-        AssertMsg(fAllDone, ("Some of the async I/O threads are still running!\n"));
+        int rc2 = VINF_SUCCESS;
+        for (unsigned i = 0; i < RT_ELEMENTS(pData->aCts); i++)
+        {
+            /* Wait for at most 5 seconds, and if that is elapsed for 100msec
+             * per remaining thread. Just to be on the safe side. */
+            rc = RTThreadWait(pData->aCts[i].AsyncIOThread,
+                              RT_MAX(RTTimeMilliTS() - u64Start + 5000, 100),
+                              NULL);
+            if (VBOX_FAILURE(rc) && rc != VERR_INVALID_HANDLE)
+                rc2 = rc;
+        }
+        AssertMsg(VBOX_SUCCESS(rc2), ("Some of the async I/O threads are still running!\n"));
     }
     else
@@ -6078 +6074 @@
         AssertRC(rc);
         ataAsyncIOClearRequests(pCtl);
-        rc = RTThreadCreate(&pCtl->AsyncIOThread, ataAsyncIOLoop, (void *)pCtl, 128*1024, RTTHREADTYPE_IO, 0, "ATA");
+        rc = RTThreadCreate(&pCtl->AsyncIOThread, ataAsyncIOLoop, (void *)pCtl, 128*1024, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "ATA");
         AssertRC(rc);
         Assert(pCtl->AsyncIOThread != NIL_RTTHREAD && pCtl->AsyncIOSem != NIL_RTSEMEVENT && pCtl->SuspendIOSem != NIL_RTSEMEVENT && pCtl->AsyncIORequestMutex != NIL_RTSEMMUTEX);