Changeset 39288 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Nov 14, 2011 9:58:38 AM (13 years ago)

Author:

vboxsync

Message:

CrOpenGL: avoid blocked client polling & extra memcpy (block hgsmi command until completion)

File:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -2942 +2942 @@
     {
         Assert(mhCrOglSvc);
-    }
-    else
-    {
-        mhCrOglSvc = NULL;
-    }
+        /* setup command completion callback */
+        VBOXVDMACMD_CHROMIUM_CTL_CRHGSMI_SETUP_COMPLETION Completion;
+        Completion.Hdr.enmType = VBOXVDMACMD_CHROMIUM_CTL_TYPE_CRHGSMI_SETUP_COMPLETION;
+        Completion.Hdr.cbCmd = sizeof (Completion);
+        Completion.hCompletion = mpDrv->pVBVACallbacks;
+        Completion.pfnCompletion = mpDrv->pVBVACallbacks->pfnCrHgsmiCommandCompleteAsync;
+
+        int rc = VERR_INVALID_FUNCTION;
+        VBOXHGCMSVCPARM parm;
+        parm.type = VBOX_HGCM_SVC_PARM_PTR;
+        parm.u.pointer.addr = &Completion;
+        parm.u.pointer.size = 0;
+
+        rc = pVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_CRHGSMI_CTL, 1, &parm);
+        if (RT_SUCCESS(rc))
+            return;
+
+        AssertMsgFailed(("VBOXVDMACMD_CHROMIUM_CTL_TYPE_CRHGSMI_SETUP_COMPLETION failed rc %d", rc));
+    }
+
+    mhCrOglSvc = NULL;
 }
 
@@ -3495 +3511 @@
         if (pVMMDev)
         {
-            rc = pVMMDev->hgcmHostFastCallAsync(mhCrOglSvc, SHCRGL_HOST_FN_CRHGSMI_CMD, &parm, Display::displayCrHgsmiCommandCompletion, this);
+            /* no completion callback is specified with this call,
+             * the CrOgl code will complete the CrHgsmi command once it processes it */
+            rc = pVMMDev->hgcmHostFastCallAsync(mhCrOglSvc, SHCRGL_HOST_FN_CRHGSMI_CMD, &parm, NULL, NULL);
             AssertRC(rc);
             if (RT_SUCCESS(rc))
@@ -3534 +3552 @@
 }
 
+
 DECLCALLBACK(void) Display::displayCrHgsmiCommandProcess(PPDMIDISPLAYCONNECTOR pInterface, PVBOXVDMACMD_CHROMIUM_CMD pCmd)
 {
@@ -3550 +3569 @@
 DECLCALLBACK(void) Display::displayCrHgsmiCommandCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam, void *pvContext)
 {
+    AssertMsgFailed(("not expected!"));
     Display *pDisplay = (Display *)pvContext;
     pDisplay->handleCrHgsmiCommandCompletion(result, u32Function, pParam);