Changeset 21491 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Jul 10, 2009 5:29:54 PM (16 years ago)

Author:

vboxsync

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

49935

Message:

VBoxGuest: Implemented missing VBOXGUEST_IOCTL_CANCEL_ALL_WAITEVENTS. VBoxClient should exit cleanly now.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest.cpp (modified) (10 diffs)
• VBoxGuestInternal.h (modified) (3 diffs)

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

@@ -277 +277 @@
         rc2 = RTSemEventMultiDestroy(pWait->Event); AssertRC(rc2);
         pWait->Event = NIL_RTSEMEVENTMULTI;
+        pWait->pSession = NULL;
         RTMemFree(pWait);
     }
@@ -458 +459 @@
  * @returns The wait-for-event entry.
  * @param   pDevExt         The device extension.
- */
-static PVBOXGUESTWAIT VBoxGuestWaitAlloc(PVBOXGUESTDEVEXT pDevExt)
+ * @param   pSession        The session that's allocating this. Can be NULL.
+ */
+static PVBOXGUESTWAIT VBoxGuestWaitAlloc(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession)
 {
     /*
@@ -506 +508 @@
     pWait->fReqEvents = 0;
     pWait->fResEvents = 0;
+    pWait->pSession = pSession;
 #ifdef VBOX_WITH_HGCM
     pWait->pHGCMReq = NULL;
@@ -641 +644 @@
 
 
-static int VBoxGuestCommonIOCtl_WaitEvent(PVBOXGUESTDEVEXT pDevExt, VBoxGuestWaitEventInfo *pInfo, size_t *pcbDataReturned,
-                                          bool fInterruptible)
+static int VBoxGuestCommonIOCtl_WaitEvent(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession,
+                                          VBoxGuestWaitEventInfo *pInfo,  size_t *pcbDataReturned, bool fInterruptible)
 {
     pInfo->u32EventFlagsOut = 0;
@@ -677 +680 @@
     }
 
-    PVBOXGUESTWAIT pWait = VBoxGuestWaitAlloc(pDevExt);
+    PVBOXGUESTWAIT pWait = VBoxGuestWaitAlloc(pDevExt, pSession);
     if (!pWait)
         return VERR_NO_MEMORY;
@@ -724 +727 @@
      * Now deal with the return code.
      */
-    if (fResEvents)
+    if (    fResEvents
+        &&  fResEvents != UINT32_MAX)
     {
         pInfo->u32EventFlagsOut = fResEvents;
@@ -734 +738 @@
         rc = VINF_SUCCESS;
     }
+    else if (   fResEvents == UINT32_MAX
+             || rc == VERR_INTERRUPTED)
+    {
+        pInfo->u32Result = VBOXGUEST_WAITEVENT_INTERRUPTED;
+        rc == VERR_INTERRUPTED;
+        Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns VERR_INTERRUPTED\n"));
+    }
     else if (rc == VERR_TIMEOUT)
     {
         pInfo->u32Result = VBOXGUEST_WAITEVENT_TIMEOUT;
         Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns VERR_TIMEOUT\n"));
-    }
-    else if (rc == VERR_INTERRUPTED)
-    {
-        pInfo->u32Result = VBOXGUEST_WAITEVENT_INTERRUPTED;
-        Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns VERR_INTERRUPTED\n"));
     }
     else
@@ -761 +767 @@
 
 
+static int VBoxGuestCommonIOCtl_CancelAllWaitEvents(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession)
+{
+    RTSPINLOCKTMP   Tmp = RTSPINLOCKTMP_INITIALIZER;
+    PVBOXGUESTWAIT  pWait;
+    int             rc = 0;
+
+    Log(("VBoxGuestCommonIOCtl: CANCEL_ALL_WAITEVENTS\n"));
+
+    /*
+     * Walk the event list and wake up anyone with a matching session.
+     */
+    RTSpinlockAcquireNoInts(pDevExt->EventSpinlock, &Tmp);
+    for (pWait = pDevExt->WaitList.pHead; pWait; pWait = pWait->pNext)
+        if (pWait->pSession == pSession)
+        {
+            pWait->fResEvents = UINT32_MAX;
+            rc |= RTSemEventMultiSignal(pWait->Event);
+        }
+    RTSpinlockReleaseNoInts(pDevExt->EventSpinlock, &Tmp);
+    Assert(rc == 0);
+
+    return VINF_SUCCESS;
+}
+
+
 static int VBoxGuestCommonIOCtl_VMMRequest(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession,
                                            VMMDevRequestHeader *pReqHdr, size_t cbData, size_t *pcbDataReturned)
@@ -884 +915 @@
         RTSpinlockReleaseNoInts(pDevExt->EventSpinlock, &Tmp);
 
-        pWait = VBoxGuestWaitAlloc(pDevExt);
+        pWait = VBoxGuestWaitAlloc(pDevExt, NULL);
         if (pWait)
             break;
@@ -1354 +1385 @@
             case VBOXGUEST_IOCTL_WAITEVENT:
                 CHECKRET_MIN_SIZE("WAITEVENT", sizeof(VBoxGuestWaitEventInfo));
-                rc = VBoxGuestCommonIOCtl_WaitEvent(pDevExt, (VBoxGuestWaitEventInfo *)pvData, pcbDataReturned,
-                                                    pSession->R0Process != NIL_RTR0PROCESS);
+                rc = VBoxGuestCommonIOCtl_WaitEvent(pDevExt, pSession, (VBoxGuestWaitEventInfo *)pvData,
+                                                    pcbDataReturned, pSession->R0Process != NIL_RTR0PROCESS);
+                break;
+
+            case VBOXGUEST_IOCTL_CANCEL_ALL_WAITEVENTS:
+                if (cbData != 0)
+                    rc = VERR_INVALID_PARAMETER;
+                rc = VBoxGuestCommonIOCtl_CancelAllWaitEvents(pDevExt, pSession);
                 break;
 

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h

@@ -31 +31 @@
 
 
+/** Pointer to the VBoxGuest per session data. */
+typedef struct VBOXGUESTSESSION *PVBOXGUESTSESSION;
+
 /** Pointer to a wait-for-event entry. */
 typedef struct VBOXGUESTWAIT *PVBOXGUESTWAIT;
@@ -52 +55 @@
     /** The events we received. */
     uint32_t volatile           fResEvents;
+    /** The session that's waiting. */
+    PVBOXGUESTSESSION           pSession;
 #ifdef VBOX_WITH_HGCM
     /** The HGCM request we're waiting for to complete. */
@@ -117 +122 @@
 typedef VBOXGUESTDEVEXT *PVBOXGUESTDEVEXT;
 
-
-/** Pointer to the VBoxGuest per session data. */
-typedef struct VBOXGUESTSESSION *PVBOXGUESTSESSION;
 
 /**