Changeset 14276 in vbox for trunk/src/VBox

Timestamp:

Nov 18, 2008 6:18:54 AM (16 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxGuest: split VBoxGuestHGCMAsyncWaitCallback* into wrappers and a worker function

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -841 +841 @@
 #ifdef VBOX_WITH_HGCM
 
+# ifndef HGCM_TIMEOUT
 /**
  * This is a callback for dealing with async waits.
@@ -919 +920 @@
 }
 
-
-# ifdef HGCM_TIMEOUT
-/**
- * This is a callback for dealing with async waits with a timeout.
- *
- * It operates in a manner similar to VBoxGuestCommonIOCtl_WaitEvent.
- * @todo r=bird: merge VBoxGuestHGCMAsyncWaitCallbackTimeout into
- *       VBoxGuestHGCMAsyncWaitCallback, either by using a stack argument or
- *       (better) create a common worker for them
- */
-static DECLCALLBACK(void)
-VBoxGuestHGCMAsyncWaitCallbackTimeout(VMMDevHGCMRequestHeader *pHdrNonVolatile, void *pvUser, uint32_t u32User)
+# else /* HGCM_TIMEOUT defined */
+/** Worker for VBoxGuestHGCMAsyncWaitCallback* */
+void
+VBoxGuestHGCMAsyncWaitCallbackWorker(VMMDevHGCMRequestHeader *pHdrNonVolatile, PVBOXGUESTDEVEXT pDevExt,
+                                     bool fInterruptible, uint32_t u32Timeout)
 {
     VMMDevHGCMRequestHeader volatile *pHdr = (VMMDevHGCMRequestHeader volatile *)pHdrNonVolatile;
-    PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pvUser;
-    Log(("VBoxGuestHGCMAsyncWaitCallback: requestType=%d\n", pHdr->header.requestType));
 
     /*
@@ -978 +970 @@
     RTSpinlockReleaseNoInts(pDevExt->WaitSpinlock, &Tmp);
 
-    int rc = RTSemEventMultiWaitNoResume(pWait->Event, u32User);
+    if (fInterruptible)
+        rc = RTSemEventMultiWaitNoResume(pWait->Event, u32Timeout);
+    else
+        rc = RTSemEventMultiWait(pWait->Event, u32Timeout);
 
     /*
@@ -993 +988 @@
     VBoxGuestWaitFreeLocked(pDevExt, pWait);
     RTSpinlockReleaseNoInts(pDevExt->WaitSpinlock, &Tmp);
+}
+
+/**
+ * This is a callback for dealing with async waits.
+ *
+ * It operates in a manner similar to VBoxGuestCommonIOCtl_WaitEvent.
+ */
+static DECLCALLBACK(void)
+VBoxGuestHGCMAsyncWaitCallback(VMMDevHGCMRequestHeader *pHdrNonVolatile, void *pvUser, uint32_t u32User)
+{
+    VMMDevHGCMRequestHeader volatile *pHdr = (VMMDevHGCMRequestHeader volatile *)pHdrNonVolatile;
+    const bool fInterruptible = (bool)u32User;
+    PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pvUser;
+    LogFunc(("requestType=%d\n", pHdr->header.requestType));
+    VBoxGuestHGCMAsyncWaitCallbackWorker(pHdrNonVolatile, pDevExt, fInterruptible, RT_INDEFINITE_WAIT);
+}
+
+/**
+ * This is a callback for dealing with async waits with a timeout.
+ *
+ * It operates in a manner similar to VBoxGuestCommonIOCtl_WaitEvent.
+ */
+static DECLCALLBACK(void)
+VBoxGuestHGCMAsyncWaitCallbackTimeoutInterruptible(VMMDevHGCMRequestHeader *pHdrNonVolatile,
+                                                   void *pvUser, uint32_t u32User)
+{
+    PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pvUser;
+    LogFunc(("requestType=%d\n", pHdr->header.requestType));
+    VBoxGuestHGCMAsyncWaitCallbackWorker(pHdrNonVolatile, pDevExt, true, u32user);
+}
+
+/**
+ * This is an uninterruptible callback for dealing with async waits with a timeout.
+ *
+ * It operates in a manner similar to VBoxGuestCommonIOCtl_WaitEvent.
+ */
+static DECLCALLBACK(void)
+VBoxGuestHGCMAsyncWaitCallbackTimeout(VMMDevHGCMRequestHeader *pHdrNonVolatile, void *pvUser,
+                                      uint32_t u32User)
+{
+    PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pvUser;
+    LogFunc(("requestType=%d\n", pHdr->header.requestType));
+    VBoxGuestHGCMAsyncWaitCallbackWorker(pHdrNonVolatile, pDevExt, false, u32user);
 }
 # endif /* HGCM_TIMEOUT */
@@ -1205 +1243 @@
      */
     Log(("VBoxGuestCommonIOCtl: HGCM_CALL: u32Client=%RX32\n", pInfo->u32ClientID));
-    int rc = VbglHGCMCall(pInfo, VBoxGuestHGCMAsyncWaitCallbackTimeout, pDevExt, pInfoTimeout->u32Timeout);
+    int rc;
+    if (pSession->R0Process == NIL_RTR0PROCESS)
+        rc = VbglHGCMCall(pInfo, VBoxGuestHGCMAsyncWaitCallbackTimeout, pDevExt, pInfoTimeout->u32Timeout);
+    else
+        rc = VbglHGCMCall(pInfo, VBoxGuestHGCMAsyncWaitCallbackTimeoutInterruptible, pDevExt,
+                          pInfoTimeout->u32Timeout);
     if (RT_SUCCESS(rc))
     {