Changeset 87820 in vbox

Timestamp:

Feb 20, 2021 10:25:39 AM (4 years ago)

Author:

vboxsync

Message:

DevPS2M: The timer callbacks implicitly takes the device critical section before doing the callback.

File:

• trunk/src/VBox/Devices/Input/DevPS2M.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Input/DevPS2M.cpp

@@ -716 +716 @@
 static uint32_t ps2mR3HaveEvents(PPS2M pThis)
 {
+/** @todo r=bird: Why is this returning uint32_t when you're calculating a
+ *        boolean value here?  Also, it's a predicate function... */
     return   pThis->iAccumX || pThis->iAccumY || pThis->iAccumZ || pThis->iAccumW
            || ((pThis->fCurrB | pThis->fAccumB) != pThis->fReportedB);
@@ -729 +731 @@
     uint32_t    uHaveEvents;
     Assert(hTimer == pThis->hThrottleTimer);
-
-    /* Grab the lock to avoid races with PutEvent(). */
-    int rc = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_SEM_BUSY);
-    AssertReleaseRC(rc);
+    Assert(PDMDevHlpCritSectIsOwner(pDevIns, pDevIns->pCritSectRoR3));
 
     /* If more movement is accumulated, report it and restart the timer. */
@@ -747 +746 @@
     else
         pThis->fThrottleActive = false;
-
-    PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3);
 }