Changeset 15879 in vbox for trunk/src/VBox

Timestamp:

Jan 8, 2009 6:39:41 PM (16 years ago)

Author:

vboxsync

Message:

ATA: Wait a bit until we interrupt the thread to avoid interruptions if running in gdb

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevATA.cpp (modified) (3 diffs)
• testcase/tstDeviceStructSizeGC.cpp (modified) (1 diff)

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

@@ -409 +409 @@
     uint32_t            Alignment0;
 #endif
+
+    /** Timestamp we started the reset. */
+    uint64_t            u64ResetTime;
 
     /* Statistics */
@@ -3731 +3734 @@
                 PDMCritSectLeave(&pCtl->lock);
 
+#ifndef RT_OS_WINDOWS
+                /*
+                 * The thread might be stuck in an I/O operation
+                 * due to a high I/O load on the host. (see @bugref{3301})
+                 * To perform the reset successfully
+                 * we interrupt the operation by sending a signal to the thread
+                 * if the thread didn't responded in 10ms.
+                 * This works only on POSIX hosts (Windows has a CancelSynchronousIo function which
+                 * does the same but it was introduced with Vista) but so far
+                 * this hang was only observed on Linux and Mac OS X.
+                 *
+                 * This is a workaround and needs to be solved properly.
+                 */
+                if (pCtl->fReset)
+                {
+                    uint64_t u64ResetTimeStop = RTTimeMilliTS();
+
+                    if ((u64ResetTimeStop - pCtl->u64ResetTime) >= 10)
+                    {
+                        LogRel(("PIIX3 ATA: Async I/O thread probably stuck in operation, interrupting\n"));
+                        pCtl->u64ResetTime = u64ResetTimeStop;
+                        RTThreadPoke(pCtl->AsyncIOThread);
+                    }
+                }
+#endif
+
                 RTThreadYield();
 
@@ -3824 +3853 @@
         }
 
-        /*
-         * The thread might be stuck in an I/O operation
-         * due to a high I/O load on the host. (see @bugref{3301})
-         * To perform the reset successfully
-         * we interrupt the operation by sending a signal to the thread.
-         * This works only on POSIX hosts (Windows has a CancelSynchronousIo function which
-         * does the same but it was introduced with Vista) but so far
-         * this hang was only observed on Linux and Mac OS X.
-         *
-         * This is a workaround and needs to be solved properly.
-         */
-#ifndef RT_OS_WINDOWS
-        RTThreadPoke(pCtl->AsyncIOThread);
-#endif
+        /* Save the timestamp we started the reset. */
+        pCtl->u64ResetTime = RTTimeMilliTS();
 
         /* Issue the reset request now. */

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp

@@ -750 +750 @@
     GEN_CHECK_OFF(ATACONTROLLER, SuspendIOSem);
     GEN_CHECK_OFF(ATACONTROLLER, DelayIRQMillies);
+    GEN_CHECK_OFF(ATACONTROLLER, u64ResetTime);
     GEN_CHECK_OFF(ATACONTROLLER, StatAsyncOps);
     GEN_CHECK_OFF(ATACONTROLLER, StatAsyncMinWait);