Changeset 14352 in vbox for trunk/src/VBox/Additions/linux/module

Timestamp:

Nov 19, 2008 2:10:24 PM (16 years ago)

Author:

vboxsync

Message:

Additions/HGCM: merged code for HGCMCall and HGCMCallTimed, as per todo

Location:

trunk/src/VBox/Additions/linux/module

Files:

• cmc.c (modified) (4 diffs)
• vboxmod.c (modified) (3 diffs)

trunk/src/VBox/Additions/linux/module/cmc.c

@@ -31 +31 @@
 {
     VBoxDevice *dev = pvData;
-    wait_event (dev->eventq, pHeader->fu32Flags & VBOX_HGCM_REQ_DONE);
+    if (u32Data == RT_INDEFINITE_WAIT)
+        wait_event (dev->eventq, pHeader->fu32Flags & VBOX_HGCM_REQ_DONE);
+    else
+        wait_event_timeout (dev->eventq, pHeader->fu32Flags & VBOX_HGCM_REQ_DONE,
+                            msecs_to_jiffies (u32Data));
 }
 
@@ -38 +42 @@
 {
     VBoxDevice *dev = pvData;
-    wait_event_interruptible (dev->eventq, pHeader->fu32Flags & VBOX_HGCM_REQ_DONE);
-}
-
-static DECLVBGL(void)
-vboxadd_hgcm_callback_timeout (VMMDevHGCMRequestHeader *pHeader, void *pvData, uint32_t u32Data)
-{
-    VBoxDevice *dev = pvData;
-    wait_event_interruptible_timeout (dev->eventq, pHeader->fu32Flags & VBOX_HGCM_REQ_DONE,
-                                      msecs_to_jiffies (u32Data));
+    if (u32Data == RT_INDEFINITE_WAIT)
+        wait_event_interruptible (dev->eventq, pHeader->fu32Flags & VBOX_HGCM_REQ_DONE);
+    else
+        wait_event_interruptible_timeout (dev->eventq, pHeader->fu32Flags & VBOX_HGCM_REQ_DONE,
+                                          msecs_to_jiffies (u32Data));
 }
 
@@ -56 +56 @@
     if (   VBOXGUEST_IOCTL_STRIP_SIZE(func)
         == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL(0)))
-        rc = VbglHGCMCall (data, vboxadd_hgcm_callback_interruptible, opaque, 0);
+        rc = VbglHGCMCall (data, vboxadd_hgcm_callback_interruptible, opaque, RT_INDEFINITE_WAIT);
     /* this function can handle cancelled requests */
     else if (   VBOXGUEST_IOCTL_STRIP_SIZE(func)
-             == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL_TIMEOUT(0)))
+             == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL_TIMED(0)))
     {
-        VBoxGuestHGCMCallInfoTimeout *pCallInfo;
-        pCallInfo = (VBoxGuestHGCMCallInfoTimeout *) data;
-        rc = VbglHGCMCall (&pCallInfo->info, vboxadd_hgcm_callback_timeout,
-                           opaque, pCallInfo->u32Timeout);
+        VBoxGuestHGCMCallInfoTimed *pCallInfo;
+        pCallInfo = (VBoxGuestHGCMCallInfoTimed *) data;
+        if (pCallInfo->fInterruptible)
+            rc = VbglHGCMCall (&pCallInfo->info, vboxadd_hgcm_callback_interruptible,
+                               opaque, pCallInfo->u32Timeout);
+        else
+            rc = VbglHGCMCall (&pCallInfo->info, vboxadd_hgcm_callback,
+                               opaque, pCallInfo->u32Timeout);
     }
     else switch (func)
@@ -70 +74 @@
         /* this function can NOT handle cancelled requests */
         case VBOXGUEST_IOCTL_HGCM_CONNECT:
-            rc = VbglHGCMConnect (data, vboxadd_hgcm_callback, opaque, 0);
+            rc = VbglHGCMConnect (data, vboxadd_hgcm_callback, opaque, RT_INDEFINITE_WAIT);
             break;
 
         /* this function can NOT handle cancelled requests */
         case VBOXGUEST_IOCTL_HGCM_DISCONNECT:
-            rc = VbglHGCMDisconnect (data, vboxadd_hgcm_callback, opaque, 0);
+            rc = VbglHGCMDisconnect (data, vboxadd_hgcm_callback, opaque, RT_INDEFINITE_WAIT);
             break;
 

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -420 +420 @@
  * @param  u32Size        the size of the userspace structure
  */
-static int vboxadd_hgcm_call_timeout(unsigned long userspace_info,
+static int vboxadd_hgcm_call_timed(unsigned long userspace_info,
                                      uint32_t u32Size)
 {
-        VBoxGuestHGCMCallInfoTimeout *pInfo = NULL;
+        VBoxGuestHGCMCallInfoTimed *pInfo = NULL;
         int rc = 0;
         
@@ -445 +445 @@
                 LogRelFunc(("client ID %u\n", pInfo->info.u32ClientID));
                 vrc = vboxadd_cmc_call(vboxDev,
-                              VBOXGUEST_IOCTL_HGCM_CALL_TIMEOUT(u32Size), pInfo);
+                              VBOXGUEST_IOCTL_HGCM_CALL_TIMED(u32Size), pInfo);
                 rc = -RTErrConvertToErrno(vrc);
                 if (   rc >= 0
@@ -624 +624 @@
                 IOCTL_EXIT("VBOXGUEST_IOCTL_HGCM_CALL", arg);
         }
-        else if (   VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL_TIMEOUT(0))
+        else if (   VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL_TIMED(0))
                  == VBOXGUEST_IOCTL_STRIP_SIZE(cmd))
         {
         /* Do the HGCM call using the Vbgl bits */
-                IOCTL_ENTRY("VBOXGUEST_IOCTL_HGCM_CALL_TIMEOUT", arg);
-                rc = vboxadd_hgcm_call_timeout(arg, _IOC_SIZE(cmd));
-                IOCTL_EXIT("VBOXGUEST_IOCTL_HGCM_CALL_TIMEOUT", arg);
+                IOCTL_ENTRY("VBOXGUEST_IOCTL_HGCM_CALL_TIMED", arg);
+                rc = vboxadd_hgcm_call_timed(arg, _IOC_SIZE(cmd));
+                IOCTL_EXIT("VBOXGUEST_IOCTL_HGCM_CALL_TIMED", arg);
         }
         else