Changeset 14352

Timestamp:

11/19/08 15:10:24 (2 months ago)

Author:

vboxsync

Message:

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

Files:

• trunk/include/VBox/HostServices/GuestPropertySvc.h (modified) (1 diff)
• trunk/include/VBox/VBoxGuest.h (modified) (2 diffs)
• trunk/include/VBox/VBoxGuestLib.h (modified) (1 diff)
• trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp (modified) (7 diffs)
• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp (modified) (13 diffs)
• trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp (modified) (1 diff)
• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp (modified) (1 diff)
• trunk/src/VBox/Additions/linux/module/cmc.c (modified) (4 diffs)
• trunk/src/VBox/Additions/linux/module/vboxmod.c (modified) (3 diffs)

trunk/include/VBox/HostServices/GuestPropertySvc.h

@@ -448 +448 @@
-typedef struct _GetNotification
-{
-out
+d
-
-    /**

trunk/include/VBox/VBoxGuest.h

@@ -1371 +1371 @@
-} VBoxGuestHGCMCallInfo;
-
-out
+d
-{
-    uint32_t u32Timeout;         /**< IN  How long to wait for completion before cancelling the call */
+    uint32_t fInterruptible;     /**< IN  Is this request interruptible? */
-    VBoxGuestHGCMCallInfo info;  /**< IN/OUT The rest of the call information.  Placed after the timeout
-                                  * so that the parameters follow as they would for a normal call. */
-    /* Parameters follow in form HGCMFunctionParameter aParms[cParms] */
-out
+d
-# pragma pack()
-
@@ -1383 +1384 @@
-# define VBOXGUEST_IOCTL_HGCM_DISCONNECT          VBOXGUEST_IOCTL_CODE(17, sizeof(VBoxGuestHGCMDisconnectInfo))
-# define VBOXGUEST_IOCTL_HGCM_CALL(Size)          VBOXGUEST_IOCTL_CODE(18, (Size))
-OUT(Size)
+D(Size)  
-# define VBOXGUEST_IOCTL_CLIPBOARD_CONNECT        VBOXGUEST_IOCTL_CODE(19, sizeof(uint32_t))
-

trunk/include/VBox/VBoxGuestLib.h

@@ -252 +252 @@
- * @return VBox status code.
- */
-out
-  VBoxGuestHGCMCallInfoTimeout
+d
+VBoxGuestHGCMCallInfoTimed
-/** @} */
-

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

@@ -341 +341 @@
-
-#ifdef VBOX_WITH_HGCM
-
-
-
-
-
-
+
+
+
-    /* Possible problem with request completion right between the fu32Flags check and KeWaitForSingleObject
-     * call; introduce a timeout to make sure we don't wait indefinitely.
-     */
-
+    LARGE_INTEGER timeout;
+    if (u32Timeout == RT_INDEFINITE_WAIT)
+        timeout.QuadPart = pDevExt->HGCMWaitTimeout.QuadPart;
+    else
+        timeout.QuadPart = u32Timeout * -10000; /* relative in 100ns units */
-    while ((pHeader->fu32Flags & VBOX_HGCM_REQ_DONE) == 0)
-    {
-
-
-
-
-
-
+
-        NTSTATUS rc = KeWaitForSingleObject (&pDevExt->keventNotification, Executive,
-                                             UserMode,
-FALSE, /* Not
-pDevExt->HGCMWaitT
+fInterruptible ? TRUE : FALSE, /*
+t
-                                            );
-        dprintf(("VBoxHGCMCallback: Wait returned %d fu32Flags=%x\n", rc, pHeader->fu32Flags));
-
-
+ && u32Timeout == RT_INDEFINITE_WAIT
-            continue;
-
@@ -380 +377 @@
-}
-
-
-
+
-{
-    PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pvData;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -937 +930 @@
-            dprintf(("a) ptr->u32ClientID = %d\n", ptr->u32ClientID));
-
-0
+RT_INDEFINITE_WAIT
-
-            dprintf(("b) ptr->u32ClientID = %d\n", ptr->u32ClientID));
@@ -980 +973 @@
-             */
-
-0
+RT_INDEFINITE_WAIT
-
-            if (RT_FAILURE(rc))
@@ -1009 +1002 @@
-            VBoxGuestHGCMCallInfo *ptr = (VBoxGuestHGCMCallInfo *)pBuf;
-
-0
+RT_INDEFINITE_WAIT
-
-            if (RT_FAILURE(rc))
@@ -1023 +1016 @@
-        } break;
-
-OUT
-
-OUT
+D
+
+D
-
-            Status = vboxHGCMVerifyIOBuffers (pStack,
-out
+d
-
-            if (Status != STATUS_SUCCESS)
@@ -1036 +1029 @@
-            }
-
-out *pInfo = (VBoxGuestHGCMCallInfoTimeout
+d *pInfo = (VBoxGuestHGCMCallInfoTimed
-            VBoxGuestHGCMCallInfo *ptr = &pInfo->info;
-
-            int rc;
-
-
-
-
+
+
+
+
+
-            }
-            else
-            {
-
+,
-                         pInfo->u32Timeout));
-Timeout
+
-            }
-
-            if (RT_FAILURE(rc))
-            {
-OUT
+D
-                Status = STATUS_UNSUCCESSFUL;
-            }

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

@@ -389 +389 @@
-            pSession->aHGCMClientIds[i] = 0;
-            Log(("VBoxGuestCloseSession: disconnecting client id %#RX32\n", Info.u32ClientID));
-false /* uninterruptible */
+RT_INDEFINITE_WAIT
-        }
-#endif
@@ -910 +910 @@
-}
-
-
-/**
- * This is a callback for dealing with async waits.
@@ -918 +917 @@
-static DECLCALLBACK(void) VBoxGuestHGCMAsyncWaitCallback(VMMDevHGCMRequestHeader *pHdr, void *pvUser, uint32_t u32User)
-{
-    const bool fInterruptible = (bool)u32User;
-    PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pvUser;
-    LogFunc(("requestType=%d\n", pHdr->header.requestType));
-
-
-
+
+
+
+
-
-/**
@@ -930 +929 @@
- * It operates in a manner similar to VBoxGuestCommonIOCtl_WaitEvent.
- */
-
+
+
-{
-    PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pvUser;
-    LogFunc(("requestType=%d\n", pHdr->header.requestType));
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-static int VBoxGuestCommonIOCtl_HGCMConnect(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, VBoxGuestHGCMConnectInfo *pInfo,
@@ -963 +951 @@
-         ? pInfo->Loc.u.host.achName : "<not local host>"));
-
-false /* uninterruptible */
+RT_INDEFINITE_WAIT
-    if (RT_SUCCESS(rc))
-    {
@@ -993 +981 @@
-                Info.result = 0;
-                Info.u32ClientID = pInfo->u32ClientID;
-false /* uninterruptible */
+RT_INDEFINITE_WAIT
-                return VERR_TOO_MANY_OPEN_FILES;
-            }
@@ -1035 +1023 @@
-     */
-    Log(("VBoxGuestCommonIOCtl: HGCM_DISCONNECT: u32Client=%RX32\n", pInfo->u32ClientID));
-false /* uninterruptible */
+RT_INDEFINITE_WAIT
-    if (RT_SUCCESS(rc))
-    {
@@ -1053 +1041 @@
-
-
-
-
+
+
+
+
-                                         size_t cbData, size_t *pcbDataReturned)
-{
@@ -1099 +1089 @@
-     */
-    Log(("VBoxGuestCommonIOCtl: HGCM_CALL: u32Client=%RX32\n", pInfo->u32ClientID));
-
+
+
+
+
+
+
-    if (RT_SUCCESS(rc))
-    {
@@ -1110 +1105 @@
-}
-
-
-# ifdef HGCM_TIMEOUT
-/** @remarks Identical to VBoxGuestCommonIOCtl_HGCMCall.
- * @todo r=bird: merge the two.  */
-static int VBoxGuestCommonIOCtl_HGCMCallTimeout(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, VBoxGuestHGCMCallInfoTimeout *pInfoTimeout,
-                                                size_t cbData, size_t *pcbDataReturned)
-{
-    VBoxGuestHGCMCallInfo *pInfo = &pInfoTimeout->info;
-    /*
-     * Some more validations.
-     */
-    if (pInfo->cParms > 4096) /* (Just make sure it doesn't overflow the next check.) */
-    {
-        Log(("VBoxGuestCommonIOCtl: HGCM_CALL: cParm=%RX32 is not sane\n", pInfo->cParms));
-        return VERR_INVALID_PARAMETER;
-    }
-    const size_t cbActual = sizeof(*pInfoTimeout) + pInfo->cParms * sizeof(HGCMFunctionParameter);
-    if (cbData < cbActual)
-    {
-        Log(("VBoxGuestCommonIOCtl: HGCM_CALL: cbData=%#zx (%zu) required size is %#zx (%zu)\n",
-             cbData, cbActual));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    /*
-     * Validate the client id.
-     */
-    const uint32_t u32ClientId = pInfo->u32ClientID;
-    unsigned i;
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    RTSpinlockAcquireNoInts(pDevExt->SessionSpinlock, &Tmp);
-    for (i = 0; i < RT_ELEMENTS(pSession->aHGCMClientIds); i++)
-        if (pSession->aHGCMClientIds[i] == u32ClientId)
-            break;
-    RTSpinlockReleaseNoInts(pDevExt->SessionSpinlock, &Tmp);
-    if (RT_UNLIKELY(i >= RT_ELEMENTS(pSession->aHGCMClientIds)))
-    {
-        static unsigned s_cErrors = 0;
-        if (s_cErrors++ > 32)
-            LogRel(("VBoxGuestCommonIOCtl: HGCM_CALL: Invalid handle. u32Client=%RX32\n", u32ClientId));
-        return VERR_INVALID_HANDLE;
-    }
-
-    /*
-     * The VbglHGCMCall call will invoke the callback if the HGCM
-     * call is performed in an ASYNC fashion. This function can
-     * deal with cancelled requests, so we let user more requests
-     * be interruptible (should add a flag for this later I guess).
-     */
-    Log(("VBoxGuestCommonIOCtl: HGCM_CALL: u32Client=%RX32\n", pInfo->u32ClientID));
-    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))
-    {
-        Log(("VBoxGuestCommonIOCtl: HGCM_CALL: result=%Rrc\n", pInfo->result));
-        if (pcbDataReturned)
-            *pcbDataReturned = cbActual;
-    }
-    Log(("VBoxGuestCommonIOCtl: HGCM_CALL: Failed. rc=%Rrc.\n", rc));
-    return rc;
-}
-# endif /* HGCM_TIMEOUT */
-
-
-/**
- * @returns VBox status code. Unlike the other HGCM IOCtls this will combine
@@ -1196 +1123 @@
-        Info.result = (uint32_t)VERR_WRONG_ORDER;           /** @todo Vitali, why is this member unsigned? */
-        Info.u32ClientID = pDevExt->u32ClipboardClientId;
-0
+RT_INDEFINITE_WAIT
-        if (RT_SUCCESS(rc))
-        {
@@ -1219 +1146 @@
-    Info.result = (uint32_t)VERR_WRONG_ORDER;
-
-0
+RT_INDEFINITE_WAIT
-    if (RT_FAILURE(rc))
-    {
@@ -1323 +1250 @@
-     * These ones are tricky and can be done later.
-     */
-/**@todo r=bird: Merge the handling of these two. The only difference is that the 2nd has one or two extra argument preceeding the call info. */
-    else if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL(0)))
-    {
-        CHECKRET_MIN_SIZE("HGCM_CALL", sizeof(VBoxGuestHGCMCallInfo));
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-#endif /* VBOX_WITH_HGCM */
-    else if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_LOG(0)))

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp

@@ -187 +187 @@
-}
-
-out
-  VBoxGuestHGCMCallInfoTimeout
+d
+VBoxGuestHGCMCallInfoTimed
-{
-    int rc = VINF_SUCCESS;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-    return rc;

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp

@@ -846 +846 @@
-    Msg.size.SetUInt32(0);
-
-OUT
+D
-    if (RT_SUCCESS(rc))
-        rc = Msg.hdr.info.result;

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

@@ -31 +31 @@
-{
-    VBoxDevice *dev = pvData;
-
+
+
+
+
+
-}
-
@@ -38 +42 @@
-{
-    VBoxDevice *dev = pvData;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-
@@ -56 +56 @@
-    if (   VBOXGUEST_IOCTL_STRIP_SIZE(func)
-        == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL(0)))
-0
+RT_INDEFINITE_WAIT
-    /* this function can handle cancelled requests */
-    else if (   VBOXGUEST_IOCTL_STRIP_SIZE(func)
-OUT
+D
-    {
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-    else switch (func)
@@ -70 +74 @@
-        /* this function can NOT handle cancelled requests */
-        case VBOXGUEST_IOCTL_HGCM_CONNECT:
-0
+RT_INDEFINITE_WAIT
-            break;
-
-        /* this function can NOT handle cancelled requests */
-        case VBOXGUEST_IOCTL_HGCM_DISCONNECT:
-0
+RT_INDEFINITE_WAIT
-            break;
-

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

@@ -420 +420 @@
- * @param  u32Size        the size of the userspace structure
- */
-out
+d
-                                     uint32_t u32Size)
-{
-out
+d
-        int rc = 0;
-        
@@ -445 +445 @@
-                LogRelFunc(("client ID %u\n", pInfo->info.u32ClientID));
-                vrc = vboxadd_cmc_call(vboxDev,
-OUT
+D
-                rc = -RTErrConvertToErrno(vrc);
-                if (   rc >= 0
@@ -624 +624 @@
-                IOCTL_EXIT("VBOXGUEST_IOCTL_HGCM_CALL", arg);
-        }
-OUT
+D
-                 == VBOXGUEST_IOCTL_STRIP_SIZE(cmd))
-        {
-        /* Do the HGCM call using the Vbgl bits */
-OUT
-out
-OUT
+D
+d
+D
-        }
-        else