Changeset 82053 in vbox

Timestamp:

Nov 20, 2019 8:49:19 PM (5 years ago)

Author:

vboxsync

Message:

DevVGA: PDMR3Thread -> PDMDevHlpThread. bugref:9218

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (12 diffs)
• DevVGA-SVGA3d-info.cpp (modified) (3 diffs)
• DevVGA-SVGA3d.h (modified) (2 diffs)

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

@@ -3002 +3002 @@
  *
  * @returns VBox status code (fully asserted).
+ * @param   pDevIns         The device instance.
  * @param   pThis           VGA device instance data.
  * @param   uExtCmd         The command to execute on the FIFO thread.
@@ -3008 +3009 @@
  *                          milliseconds.
  */
-static int vmsvgaR3RunExtCmdOnFifoThread(PVGASTATE pThis, uint8_t uExtCmd, void *pvParam, RTMSINTERVAL cMsWait)
+static int vmsvgaR3RunExtCmdOnFifoThread(PPDMDEVINS pDevIns, PVGASTATE pThis, uint8_t uExtCmd, void *pvParam, RTMSINTERVAL cMsWait)
 {
     Assert(cMsWait >= RT_MS_1SEC * 5);
@@ -3032 +3033 @@
 
         /* Resume the thread. */
-        rc = PDMR3ThreadResume(pThread);
+        rc = PDMDevHlpThreadResume(pDevIns, pThread);
         AssertLogRelRC(rc);
         if (RT_SUCCESS(rc))
@@ -3046 +3047 @@
             /* suspend the thread */
             pThis->svga.fFifoExtCommandWakeup = false;
-            int rc2 = PDMR3ThreadSuspend(pThread);
+            int rc2 = PDMDevHlpThreadSuspend(pDevIns, pThread);
             AssertLogRelRC(rc2);
             if (RT_FAILURE(rc2) && RT_SUCCESS(rc))
@@ -5369 +5370 @@
  * surfaces to VMSVGA3DMIPMAPLEVEL::pSurfaceData heap buffers.
  *
+ * @param   pDevIns             The device instance.
  * @param   pThis               The VGA device instance data.
  * @param   sid                 Either UINT32_MAX or the ID of a specific
@@ -5374 +5376 @@
  *                              are processed.
  */
-void vmsvga3dSurfaceUpdateHeapBuffersOnFifoThread(PVGASTATE pThis, uint32_t sid)
+void vmsvga3dSurfaceUpdateHeapBuffersOnFifoThread(PPDMDEVINS pDevIns, PVGASTATE pThis, uint32_t sid)
 {
-    vmsvgaR3RunExtCmdOnFifoThread(pThis, VMSVGA_FIFO_EXTCMD_UPDATE_SURFACE_HEAP_BUFFERS, (void *)(uintptr_t)sid,
+    vmsvgaR3RunExtCmdOnFifoThread(pDevIns, pThis, VMSVGA_FIFO_EXTCMD_UPDATE_SURFACE_HEAP_BUFFERS, (void *)(uintptr_t)sid,
                                   sid == UINT32_MAX ? 10 * RT_MS_1SEC : RT_MS_1MIN);
 }
@@ -5421 +5423 @@
         fInvY = true;
 
-    vmsvga3dInfoSurfaceWorker(PDMINS_2_DATA(pDevIns, PVGASTATE), pHlp, sid, fVerbose, cxAscii, fInvY, NULL);
+    vmsvga3dInfoSurfaceWorker(pDevIns, PDMINS_2_DATA(pDevIns, PVGASTATE), pHlp, sid, fVerbose, cxAscii, fInvY, NULL);
 }
 
@@ -5446 +5448 @@
     const uint32_t cxAscii = 0; /* No ASCII */
     const bool fInvY = false;   /* Do not invert. */
-    vmsvga3dInfoSurfaceWorker(PDMINS_2_DATA(pDevIns, PVGASTATE), pHlp, sid, fVerbose, cxAscii, fInvY, pszBitmapPath);
+    vmsvga3dInfoSurfaceWorker(pDevIns, PDMINS_2_DATA(pDevIns, PVGASTATE), pHlp, sid, fVerbose, cxAscii, fInvY, pszBitmapPath);
 }
 
@@ -5680 +5682 @@
     LoadState.uVersion = uVersion;
     LoadState.uPass    = uPass;
-    rc = vmsvgaR3RunExtCmdOnFifoThread(pThis, VMSVGA_FIFO_EXTCMD_LOADSTATE, &LoadState, RT_INDEFINITE_WAIT);
+    rc = vmsvgaR3RunExtCmdOnFifoThread(pDevIns, pThis, VMSVGA_FIFO_EXTCMD_LOADSTATE, &LoadState, RT_INDEFINITE_WAIT);
     AssertLogRelRCReturn(rc, rc);
 
@@ -5794 +5796 @@
      * Must save some state (3D in particular) in the FIFO thread.
      */
-    rc = vmsvgaR3RunExtCmdOnFifoThread(pThis, VMSVGA_FIFO_EXTCMD_SAVESTATE, pSSM, RT_INDEFINITE_WAIT);
+    rc = vmsvgaR3RunExtCmdOnFifoThread(pDevIns, pThis, VMSVGA_FIFO_EXTCMD_SAVESTATE, pSSM, RT_INDEFINITE_WAIT);
     AssertLogRelRCReturn(rc, rc);
 
@@ -6059 +6061 @@
     /* Reset the FIFO processing as well as the 3d state (if we have one). */
     pThis->svga.pFIFOR3[SVGA_FIFO_NEXT_CMD] = pThis->svga.pFIFOR3[SVGA_FIFO_STOP] = 0; /** @todo should probably let the FIFO thread do this ... */
-    int rc = vmsvgaR3RunExtCmdOnFifoThread(pThis, VMSVGA_FIFO_EXTCMD_RESET, NULL /*pvParam*/, 10000 /*ms*/);
+    int rc = vmsvgaR3RunExtCmdOnFifoThread(pDevIns, pThis, VMSVGA_FIFO_EXTCMD_RESET, NULL /*pvParam*/, 10000 /*ms*/);
 
     /* Reset other stuff. */
@@ -6107 +6109 @@
     if (pThis->svga.pFIFOIOThread)
     {
-        int rc = vmsvgaR3RunExtCmdOnFifoThread(pThis, VMSVGA_FIFO_EXTCMD_TERMINATE, NULL /*pvParam*/, 30000 /*ms*/);
+        int rc = vmsvgaR3RunExtCmdOnFifoThread(pDevIns, pThis, VMSVGA_FIFO_EXTCMD_TERMINATE, NULL /*pvParam*/, 30000 /*ms*/);
         AssertLogRelRC(rc);
 
-        rc = PDMR3ThreadDestroy(pThis->svga.pFIFOIOThread, NULL);
+        rc = PDMDevHlpThreadDestroy(pDevIns, pThis->svga.pFIFOIOThread, NULL);
         AssertLogRelRC(rc);
         pThis->svga.pFIFOIOThread = NULL;

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp

@@ -2079 +2079 @@
 
 
-void vmsvga3dInfoSurfaceWorker(PVGASTATE pThis, PCDBGFINFOHLP pHlp, uint32_t sid, bool fVerbose, uint32_t cxAscii, bool fInvY, const char *pszBitmapPath)
+void vmsvga3dInfoSurfaceWorker(PPDMDEVINS pDevIns, PVGASTATE pThis, PCDBGFINFOHLP pHlp, uint32_t sid, bool fVerbose,
+                               uint32_t cxAscii, bool fInvY, const char *pszBitmapPath)
 {
     /* Warning! This code is currently racing papSurfaces reallocation! */
@@ -2098 +2099 @@
                 {
                     if (fVerbose)
-                        vmsvga3dSurfaceUpdateHeapBuffersOnFifoThread(pThis, sid);
+                        vmsvga3dSurfaceUpdateHeapBuffersOnFifoThread(pDevIns, pThis, sid);
                     vmsvga3dInfoSurfaceWorkerOne(pHlp, pSurface, fVerbose, cxAscii, fInvY);
                     if (pszBitmapPath && *pszBitmapPath)
@@ -2113 +2114 @@
              */
             if (fVerbose)
-                vmsvga3dSurfaceUpdateHeapBuffersOnFifoThread(pThis, UINT32_MAX);
+                vmsvga3dSurfaceUpdateHeapBuffersOnFifoThread(pDevIns, pThis, UINT32_MAX);
             uint32_t cSurfaces = pState->cSurfaces;
             pHlp->pfnPrintf(pHlp, "cSurfaces=%d\n", cSurfaces);

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.h

@@ -52 +52 @@
 
 /* DevVGA-SVGA.cpp: */
-void vmsvga3dSurfaceUpdateHeapBuffersOnFifoThread(PVGASTATE pThis, uint32_t sid);
+void vmsvga3dSurfaceUpdateHeapBuffersOnFifoThread(PPDMDEVINS pDevIns, PVGASTATE pThis, uint32_t sid);
 
 
@@ -120 +120 @@
 void vmsvga3dUpdateHeapBuffersForSurfaces(PVGASTATE pThis, uint32_t sid);
 void vmsvga3dInfoContextWorker(PVGASTATE pThis, PCDBGFINFOHLP pHlp, uint32_t cid, bool fVerbose);
-void vmsvga3dInfoSurfaceWorker(PVGASTATE pThis, PCDBGFINFOHLP pHlp, uint32_t sid, bool fVerbose, uint32_t cxAscii, bool fInvY, const char *pszBitmapPath);
+void vmsvga3dInfoSurfaceWorker(PPDMDEVINS pDevIns, PVGASTATE pThis, PCDBGFINFOHLP pHlp, uint32_t sid, bool fVerbose,
+                               uint32_t cxAscii, bool fInvY, const char *pszBitmapPath);
 
 /* DevVGA-SVGA3d-shared.cpp: */