Changeset 77226 in vbox

Timestamp:

Feb 8, 2019 5:13:26 PM (6 years ago)

Author:

vboxsync

Message:

Devices/DevVGA-SVGA: move an assertion out of the FIFO access handler.
bugref:9376: Complete hardware cursor implementation in VMSVGA.
I put an assertion into the FIFO access handler that it would not trigger more
than once every 500ms. However, disabling it is not reliable, so that can
still happen. Instead, I moved the assertion to the code re-enabling the
handler. That should really not happen more frequently.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -2402 +2402 @@
      * Temporarily disable the access handler now that we've kicked the FIFO thread.
      */
-#  ifdef VBOX_STRICT /** @todo r=bird: This is _not_ guaranteed at all.  Expect spurious assertions! */
-    /* Invariant: The access handler should never trigger twice within a certain
-       time span; calling it 500ms here for simplicity. */
-    uint64_t TimeNow = RTTimeMilliTS();
-    Assert(TimeNow - pThis->svga.pSvgaR3State->TimeLastFIFOIntercept > 500);
-    pThis->svga.pSvgaR3State->TimeLastFIFOIntercept = TimeNow;
-#  endif
 
     STAM_REL_COUNTER_INC(&pThis->svga.pSvgaR3State->StatFifoAccessHandler);
@@ -3417 +3410 @@
             else
             {
+# ifdef VBOX_STRICT
+                /* Invariant: The access handler should never be reset twice within
+                   a certain time span; calling it 500ms here for simplicity. */
+                uint64_t TimeNow = RTTimeMilliTS();
+                Assert(TimeNow - pSVGAState->TimeLastFIFOIntercept > 500);
+                pSVGAState->TimeLastFIFOIntercept = TimeNow;
+# endif
                 int rc2 = PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pThis->svga.GCPhysFIFO);
                 AssertRC(rc2); /* No break. Racing EMTs unmapping and remapping the region. */