Changeset 81850 in vbox

Timestamp:

Nov 14, 2019 9:36:00 PM (5 years ago)

Author:

vboxsync

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

134644

Message:

PDMDevHlp: Adding PDMDevHlpCritSectScheduleExitEvent. bugref:9218

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (5 diffs)
• src/VBox/VMM/VMMR0/PDMR0Device.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -2278 +2278 @@
 
 /** Current PDMDEVHLPR3 version number. */
-#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 34, 0)
+#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 35, 0)
 
 /**
@@ -3940 +3940 @@
     DECLR3CALLBACKMEMBER(bool,     pfnCritSectHasWaiters,(PPDMDEVINS pDevIns, PCPDMCRITSECT pCritSect));
     DECLR3CALLBACKMEMBER(uint32_t, pfnCritSectGetRecursion,(PPDMDEVINS pDevIns, PCPDMCRITSECT pCritSect));
+    DECLR3CALLBACKMEMBER(int,      pfnCritSectScheduleExitEvent,(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, SUPSEMEVENT hEventToSignal));
     DECLR3CALLBACKMEMBER(int,      pfnCritSectDelete,(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect));
     /** @} */
@@ -4977 +4978 @@
 
 /** Current PDMDEVHLP version number. */
-#define PDM_DEVHLPRC_VERSION                    PDM_VERSION_MAKE(0xffe6, 9, 0)
+#define PDM_DEVHLPRC_VERSION                    PDM_VERSION_MAKE(0xffe6, 10, 0)
 
 
@@ -5391 +5392 @@
     DECLR0CALLBACKMEMBER(bool,     pfnCritSectHasWaiters,(PPDMDEVINS pDevIns, PCPDMCRITSECT pCritSect));
     DECLR0CALLBACKMEMBER(uint32_t, pfnCritSectGetRecursion,(PPDMDEVINS pDevIns, PCPDMCRITSECT pCritSect));
+    DECLR0CALLBACKMEMBER(int,      pfnCritSectScheduleExitEvent,(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, SUPSEMEVENT hEventToSignal));
     /** @} */
 
@@ -7735 +7737 @@
 }
 
+#if defined(IN_RING3) || defined(IN_RING0)
+/**
+ * @copydoc PDMHCCritSectScheduleExitEvent
+ * @param   pDevIns  The device instance.
+ */
+DECLINLINE(int) PDMDevHlpCritSectScheduleExitEvent(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, SUPSEMEVENT hEventToSignal)
+{
+    return pDevIns->CTX_SUFF(pHlp)->pfnCritSectScheduleExitEvent(pDevIns, pCritSect, hEventToSignal);
+}
+#endif
+
 /* Strict build: Remap the two enter calls to the debug versions. */
 #ifdef VBOX_STRICT

trunk/src/VBox/VMM/VMMR0/PDMR0Device.cpp

@@ -1019 +1019 @@
     RT_NOREF(pDevIns);
     return PDMCritSectGetRecursion(pCritSect);
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR0,pfnCritSectScheduleExitEvent} */
+static DECLCALLBACK(int) pdmR0DevHlp_CritSectScheduleExitEvent(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect,
+                                                               SUPSEMEVENT hEventToSignal)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    RT_NOREF(pDevIns);
+    return PDMHCCritSectScheduleExitEvent(pCritSect, hEventToSignal);
 }
 
@@ -1161 +1171 @@
     pdmR0DevHlp_CritSectHasWaiters,
     pdmR0DevHlp_CritSectGetRecursion,
+    pdmR0DevHlp_CritSectScheduleExitEvent,
     pdmR0DevHlp_DBGFTraceBuf,
     pdmR0DevHlp_PCIBusSetUpContext,

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

@@ -3043 +3043 @@
     RT_NOREF(pDevIns);
     return PDMCritSectGetRecursion(pCritSect);
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR3,pfnCritSectScheduleExitEvent} */
+static DECLCALLBACK(int) pdmR3DevHlp_CritSectScheduleExitEvent(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect,
+                                                               SUPSEMEVENT hEventToSignal)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    RT_NOREF(pDevIns);
+    return PDMHCCritSectScheduleExitEvent(pCritSect, hEventToSignal);
 }
 
@@ -4795 +4805 @@
     pdmR3DevHlp_CritSectHasWaiters,
     pdmR3DevHlp_CritSectGetRecursion,
+    pdmR3DevHlp_CritSectScheduleExitEvent,
     pdmR3DevHlp_CritSectDelete,
     pdmR3DevHlp_ThreadCreate,
@@ -5290 +5301 @@
     pdmR3DevHlp_CritSectHasWaiters,
     pdmR3DevHlp_CritSectGetRecursion,
+    pdmR3DevHlp_CritSectScheduleExitEvent,
     pdmR3DevHlp_CritSectDelete,
     pdmR3DevHlp_ThreadCreate,