Changeset 91945 in vbox

Timestamp:

Oct 21, 2021 1:17:30 PM (3 years ago)

Author:

vboxsync

Message:

VMM,Devices: Eliminate calls to PDMR3Thread and use the driver hlper callbacks, bugref:10074

Location:

trunk

Files:

• include/VBox/vmm/pdmdrv.h (modified) (3 diffs)
• src/VBox/Devices/Network/DrvIntNet.cpp (modified) (1 diff)
• src/VBox/Devices/Serial/DrvHostSerial.cpp (modified) (1 diff)
• src/VBox/Devices/USB/DrvVUSBRootHub.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDriver.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmdrv.h

@@ -1256 +1256 @@
                                                PFNPDMTHREADWAKEUPDRV pfnWakeup, size_t cbStack, RTTHREADTYPE enmType, const char *pszName));
 
+    /** @name Exported PDM Thread Functions
+     * @{ */
+    DECLR3CALLBACKMEMBER(int, pfnThreadDestroy,(PPDMTHREAD pThread, int *pRcThread));
+    DECLR3CALLBACKMEMBER(int, pfnThreadIAmSuspending,(PPDMTHREAD pThread));
+    DECLR3CALLBACKMEMBER(int, pfnThreadIAmRunning,(PPDMTHREAD pThread));
+    DECLR3CALLBACKMEMBER(int, pfnThreadSleep,(PPDMTHREAD pThread, RTMSINTERVAL cMillies));
+    DECLR3CALLBACKMEMBER(int, pfnThreadSuspend,(PPDMTHREAD pThread));
+    DECLR3CALLBACKMEMBER(int, pfnThreadResume,(PPDMTHREAD pThread));
+    /** @} */
+
     /**
      * Creates an async completion template for a driver instance.
@@ -1469 +1479 @@
 } PDMDRVHLPR3;
 /** Current DRVHLP version number. */
-#define PDM_DRVHLPR3_VERSION                    PDM_VERSION_MAKE(0xf0fb, 11, 0)
+#define PDM_DRVHLPR3_VERSION                    PDM_VERSION_MAKE(0xf0fb, 12, 0)
 
 
@@ -1956 +1966 @@
 {
     return pDrvIns->pHlpR3->pfnThreadCreate(pDrvIns, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName);
+}
+
+/**
+ * @copydoc PDMR3ThreadDestroy
+ * @param   pDrvIns     The driver instance.
+ */
+DECLINLINE(int) PDMDrvHlpThreadDestroy(PPDMDRVINS pDrvIns, PPDMTHREAD pThread, int *pRcThread)
+{
+    return pDrvIns->pHlpR3->pfnThreadDestroy(pThread, pRcThread);
+}
+
+/**
+ * @copydoc PDMR3ThreadIAmSuspending
+ * @param   pDrvIns     The driver instance.
+ */
+DECLINLINE(int) PDMDrvHlpThreadIAmSuspending(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
+{
+    return pDrvIns->pHlpR3->pfnThreadIAmSuspending(pThread);
+}
+
+/**
+ * @copydoc PDMR3ThreadIAmRunning
+ * @param   pDrvIns     The driver instance.
+ */
+DECLINLINE(int) PDMDrvHlpThreadIAmRunning(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
+{
+    return pDrvIns->pHlpR3->pfnThreadIAmRunning(pThread);
+}
+
+/**
+ * @copydoc PDMR3ThreadSleep
+ * @param   pDrvIns     The driver instance.
+ */
+DECLINLINE(int) PDMDrvHlpThreadSleep(PPDMDRVINS pDrvIns, PPDMTHREAD pThread, RTMSINTERVAL cMillies)
+{
+    return pDrvIns->pHlpR3->pfnThreadSleep(pThread, cMillies);
+}
+
+/**
+ * @copydoc PDMR3ThreadSuspend
+ * @param   pDrvIns     The driver instance.
+ */
+DECLINLINE(int) PDMDrvHlpThreadSuspend(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
+{
+    return pDrvIns->pHlpR3->pfnThreadSuspend(pThread);
+}
+
+/**
+ * @copydoc PDMR3ThreadResume
+ * @param   pDrvIns     The driver instance.
+ */
+DECLINLINE(int) PDMDrvHlpThreadResume(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
+{
+    return pDrvIns->pHlpR3->pfnThreadResume(pThread);
 }
 

trunk/src/VBox/Devices/Network/DrvIntNet.cpp

@@ -1199 +1199 @@
     if (pThis->pXmitThread)
     {
-        int rc = PDMR3ThreadDestroy(pThis->pXmitThread, NULL);
+        int rc = PDMDrvHlpThreadDestroy(pDrvIns, pThis->pXmitThread, NULL);
         AssertRC(rc);
         pThis->pXmitThread = NULL;

trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

@@ -628 +628 @@
              * this mode.
              */
-            PDMR3ThreadSleep(pThread, 100);
+            PDMDrvHlpThreadSleep(pThis->pDrvIns, pThread, 100);
         }
     }

trunk/src/VBox/Devices/USB/DrvVUSBRootHub.cpp

@@ -934 +934 @@
             || enmState == VMSTATE_RUNNING_LS)
         {
-            rc = PDMR3ThreadResume(pThis->hThreadPeriodFrame);
+            rc = PDMDrvHlpThreadResume(pThis->pDrvIns, pThis->hThreadPeriodFrame);
             AssertRCReturn(rc, rc);
         }

trunk/src/VBox/VMM/VMMR3/PDMDriver.cpp

@@ -2231 +2231 @@
     pdmR3DrvHlp_AsyncNotificationCompleted,
     pdmR3DrvHlp_ThreadCreate,
+    PDMR3ThreadDestroy,
+    PDMR3ThreadIAmSuspending,
+    PDMR3ThreadIAmRunning,
+    PDMR3ThreadSleep,
+    PDMR3ThreadSuspend,
+    PDMR3ThreadResume,
     pdmR3DrvHlp_AsyncCompletionTemplateCreate,
     pdmR3DrvHlp_NetShaperAttach,