vbox的更動 8708 路徑 trunk/src/VBox/Devices/Storage

時間撮記:

2008-5-8 下午01:40:32 (17 年 以前)

作者:

vboxsync

訊息:

Just do the simple 30 second wait for each worker thread. There shouldn't be timeouts, but it seems there is something busted in the linux (64-bit) multiple release event semaphores that makes them time out too early. (linux 2.6.23)

檔案:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (修改) (1 筆差異)

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

@@ -5276 +5276 @@
     if (ataWaitForAllAsyncIOIsIdle(pDevIns, 20000))
     {
-        uint64_t u64Start = RTTimeMilliTS();
-        int rc2 = VINF_SUCCESS;
-        int iFailed = -1;
         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. */
-            int64_t cMsElapsed = RTTimeMilliTS() - u64Start;
-            rc = RTThreadWait(pData->aCts[i].AsyncIOThread,
-                              RT_MAX(5000 - cMsElapsed, 100),
-                              NULL);
-            if (VBOX_FAILURE(rc) && rc != VERR_INVALID_HANDLE)
-            {
-                AssertMsg(rc == VERR_TIMEOUT && RTTimeMilliTS() - u64Start >= 5000,
-                          ("rc=%Rrc cMsElapsed=%RI64 ms  Now: %RI64 ms i=%d\n", rc, cMsElapsed, RTTimeMilliTS() - u64Start, i));
-                rc2 = rc;
-                iFailed = i;
-            }
-        }
-        AssertMsgRC(rc2, ("Some of the async I/O threads are still running! (%RU64 ms) rc2=%Rrc iFailed=%d\n",
-                          RTTimeMilliTS() - u64Start, rc2, iFailed));
+            rc = RTThreadWait(pData->aCts[i].AsyncIOThread, 30000 /* 30 s*/, NULL);
+            AssertMsg(VBOX_SUCCESS(rc) || rc == VERR_INVALID_HANDLE, ("rc=%Rrc i=%d\n", rc, i));
+        }
     }
     else