Changeset 90609 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Aug 10, 2021 9:35:16 PM (4 years ago)

Author:

vboxsync

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

146220

Message:

VMMDev/Testing: Updated lock thread code with r/w and new config (forgot). bugref:6695

File:

• trunk/src/VBox/Devices/VMMDev/VMMDevTesting.cpp (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VMMDevTesting.cpp

@@ -837 +837 @@
     while (RT_LIKELY(pThread->enmState == PDMTHREADSTATE_RUNNING))
     {
-        /*
-         * Enter the critical section and
-         */
-        int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_SUCCESS);
-        AssertLogRelRCReturn(rc, rc);
-
-        uint32_t cNsNextWait;
-        if (pThis->TestingLockControl.s.cUsHold)
+        int             rc;
+        uint32_t        cNsNextWait = 0;
+        uint32_t const  fCfgHi      = pThis->TestingLockControl.au32[1];
+        if (fCfgHi & VMMDEV_TESTING_LOCKED_HI_ENABLED)
         {
-            PDMDevHlpSUPSemEventWaitNsRelIntr(pDevIns, pThis->hTestingLockEvt, pThis->TestingLockControl.s.cUsHold);
-            if (pThis->TestingLockControl.s.fPokeBeforeRelease)
-                VMCC_FOR_EACH_VMCPU_STMT(pVM, RTThreadPoke(pVCpu->hThread));
+            /*
+             * take lock
+             */
+            if (!(fCfgHi & VMMDEV_TESTING_LOCKED_HI_TYPE_RW))
+                rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_SUCCESS);
+            else if (!(fCfgHi & VMMDEV_TESTING_LOCKED_HI_THREAD_SHARED))
+                rc = PDMDevHlpCritSectRwEnterExcl(pDevIns, &pThis->CritSectRw, VINF_SUCCESS);
+            else
+                rc = PDMDevHlpCritSectRwEnterShared(pDevIns, &pThis->CritSectRw, VINF_SUCCESS);
+            AssertLogRelRCReturn(rc, rc);
+
+            /*
+             * Delay releasing lock.
+             */
             cNsNextWait = pThis->TestingLockControl.s.cUsBetween * RT_NS_1US;
+            if (pThis->TestingLockControl.s.cUsHold)
+            {
+                PDMDevHlpSUPSemEventWaitNsRelIntr(pDevIns, pThis->hTestingLockEvt, pThis->TestingLockControl.s.cUsHold);
+                if (pThis->TestingLockControl.s.fPokeBeforeRelease)
+                    VMCC_FOR_EACH_VMCPU_STMT(pVM, RTThreadPoke(pVCpu->hThread));
+            }
+
+            /*
+             * Release lock.
+             */
+            if (!(fCfgHi & VMMDEV_TESTING_LOCKED_HI_TYPE_RW))
+                rc = PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
+            else if (!(fCfgHi & VMMDEV_TESTING_LOCKED_HI_THREAD_SHARED))
+                rc = PDMDevHlpCritSectRwLeaveExcl(pDevIns, &pThis->CritSectRw);
+            else
+                rc = PDMDevHlpCritSectRwLeaveShared(pDevIns, &pThis->CritSectRw);
+            AssertLogRelRCReturn(rc, rc);
         }
-        else
-            cNsNextWait = 0;
-
-        rc = PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
-        AssertLogRelRCReturn(rc, rc);
 
         /*