Changeset 72587 in vbox for trunk/src/VBox

Timestamp:

Jun 17, 2018 5:44:13 PM (7 years ago)

Author:

vboxsync

Message:

DevATA: Moved the static variables (there will be two in play here, R3 + R0/RC) cBusy to the ATADevState structure. bugref:1960

File:

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

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

@@ -286 +286 @@
     RCPTRTYPE(uint8_t *)                pbIOBufferRC;
 
-    RTRCPTR                             Aligmnent1; /**< Align the statistics at an 8-byte boundary. */
+    /** Counter for number of busy status seen in GC/R0 in a row. */
+    uint32_t                            cBusyStatusHack;
 
     /*
@@ -4452 +4453 @@
         case 7: /* primary status */
         {
-            /* Counter for number of busy status seen in GC in a row. */
-            static unsigned cBusy = 0;
-
             if (!s->pDrvMedia)
                 val = 0;
@@ -4471 +4469 @@
             {
 #ifdef IN_RING3
-                cBusy = 0;
+                s->cBusyStatusHack = 0;
                 ataR3LockLeave(pCtl);
 
-#ifndef RT_OS_WINDOWS
+# ifndef RT_OS_WINDOWS
                 /*
                  * The thread might be stuck in an I/O operation
@@ -4498 +4496 @@
                     }
                 }
-#endif
+# endif
 
                 RTThreadYield();
@@ -4510 +4508 @@
                  * especially on SMP systems where we don't gain much by
                  * yielding the CPU to someone else. */
-                if (++cBusy >= 20)
+                if (++s->cBusyStatusHack >= 20)
                 {
-                    cBusy = 0;
+                    s->cBusyStatusHack = 0;
                     return VINF_IOM_R3_IOPORT_READ;
                 }
@@ -4518 +4516 @@
             }
             else
-                cBusy = 0;
+                s->cBusyStatusHack = 0;
             ataUnsetIRQ(s);
             break;