Changeset 14310 in vbox for trunk/src/VBox

Timestamp:

Nov 18, 2008 3:37:58 PM (16 years ago)

Author:

vboxsync

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

39501

Message:

VBoxGuest.cpp: fixes.

File:

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

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

@@ -920 +920 @@
 }
 
-# else /* HGCM_TIMEOUT defined */
+# else /* HGCM_TIMEOUT */
 /** Worker for VBoxGuestHGCMAsyncWaitCallback* */
 void
@@ -950 +950 @@
         if (pWait)
             break;
-        return;
+        if (fInterruptible)
+            return;
+        RTThreadSleep(1);
     }
     pWait->fReqEvents = VMMDEV_EVENT_HGCM;
@@ -970 +972 @@
     RTSpinlockReleaseNoInts(pDevExt->WaitSpinlock, &Tmp);
 
+    int rc;
     if (fInterruptible)
         rc = RTSemEventMultiWaitNoResume(pWait->Event, u32Timeout);
@@ -989 +992 @@
     RTSpinlockReleaseNoInts(pDevExt->WaitSpinlock, &Tmp);
 }
+
 
 /**
@@ -1005 +1009 @@
 }
 
+
 /**
  * This is a callback for dealing with async waits with a timeout.
@@ -1016 +1021 @@
     PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pvUser;
     LogFunc(("requestType=%d\n", pHdr->header.requestType));
-    VBoxGuestHGCMAsyncWaitCallbackWorker(pHdrNonVolatile, pDevExt, true, u32user);
-}
+    VBoxGuestHGCMAsyncWaitCallbackWorker(pHdrNonVolatile, pDevExt, true /* fInterruptible */, u32user);
+}
+
 
 /**
@@ -1030 +1036 @@
     PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pvUser;
     LogFunc(("requestType=%d\n", pHdr->header.requestType));
-    VBoxGuestHGCMAsyncWaitCallbackWorker(pHdrNonVolatile, pDevExt, false, u32user);
+    VBoxGuestHGCMAsyncWaitCallbackWorker(pHdrNonVolatile, pDevExt, false /* fInterruptible */, u32user);
 }
 # endif /* HGCM_TIMEOUT */