Changeset 75500 in vbox for trunk/src/VBox/HostServices

Timestamp:

Nov 16, 2018 1:24:39 AM (6 years ago)

Author:

vboxsync

Message:

VMMDev,Main,HostServices: More profiling of HGCM guest call processing.

Location:

trunk/src/VBox/HostServices

Files:

• GuestControl/service.cpp (modified) (1 diff)
• GuestControl/testcase/tstGuestControlSvc.cpp (modified) (1 diff)
• GuestProperties/service.cpp (modified) (2 diffs)
• GuestProperties/testcase/tstGuestPropSvc.cpp (modified) (5 diffs)
• HostChannel/service.cpp (modified) (1 diff)
• SharedClipboard/service.cpp (modified) (1 diff)
• SharedClipboard/testcase/tstClipboardServiceHost.cpp (modified) (10 diffs)
• SharedFolders/service.cpp (modified) (3 diffs)
• SharedFolders/testcase/tstSharedFolderService.cpp (modified) (9 diffs)
• SharedOpenGL/crserver/crservice.cpp (modified) (1 diff)

trunk/src/VBox/HostServices/GuestControl/service.cpp

@@ -974 +974 @@
                                       uint32_t u32Function,
                                       uint32_t cParms,
-                                      VBOXHGCMSVCPARM paParms[])
+                                      VBOXHGCMSVCPARM paParms[],
+                                      uint64_t tsArrival)
     {
         AssertLogRelReturnVoid(VALID_PTR(pvService));
         SELF *pSelf = reinterpret_cast<SELF *>(pvService);
         AssertPtrReturnVoid(pSelf);
+        RT_NOREF_PV(tsArrival);
         pSelf->call(callHandle, u32ClientID, pvClient, u32Function, cParms, paParms);
     }

trunk/src/VBox/HostServices/GuestControl/testcase/tstGuestControlSvc.cpp

@@ -211 +211 @@
         aParmsGuest[1].setUInt32(0 /* Parameters */);
         pTable->pfnCall(pTable->pvService, &callHandle, 1 /* Client ID */, NULL /* pvClient */,
-                        GUEST_MSG_WAIT, 2, &aParmsGuest[0]);
+                        GUEST_MSG_WAIT, 2, &aParmsGuest[0], 0);
         RTTEST_CHECK_RC_RET(g_hTest, callHandle.rc, VINF_SUCCESS, callHandle.rc);
 

trunk/src/VBox/HostServices/GuestProperties/service.cpp

@@ -353 +353 @@
                                       uint32_t u32Function,
                                       uint32_t cParms,
-                                      VBOXHGCMSVCPARM paParms[])
+                                      VBOXHGCMSVCPARM paParms[],
+                                      uint64_t tsArrival)
     {
         AssertLogRelReturnVoid(VALID_PTR(pvService));
@@ -360 +361 @@
         pSelf->call(callHandle, u32ClientID, pvClient, u32Function, cParms, paParms);
         LogFlowFunc(("returning\n"));
+        RT_NOREF_PV(tsArrival);
     }
 

trunk/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp

@@ -424 +424 @@
     else
         pTable->pfnCall(pTable->pvService, &callHandle, 0, NULL, command,
-                        useSetProp ? 3 : 2, aParms);
+                        useSetProp ? 3 : 2, aParms, 0);
     return callHandle.rc;
 }
@@ -509 +509 @@
         callHandle.rc = pTable->pfnHostCall(pTable->pvService, command, 1, aParms);
     else
-        pTable->pfnCall(pTable->pvService, &callHandle, 0, NULL, command, 1, aParms);
+        pTable->pfnCall(pTable->pvService, &callHandle, 0, NULL, command, 1, aParms, 0);
     return callHandle.rc;
 }
@@ -703 +703 @@
         aParms[1].setUInt64(1);
         aParms[2].setPointer(pvBuf, cbBuf);
-        pTable->pfnCall(pTable->pvService, &callHandle, 0, NULL, GUEST_PROP_FN_GET_NOTIFICATION, 4, aParms);
+        pTable->pfnCall(pTable->pvService, &callHandle, 0, NULL, GUEST_PROP_FN_GET_NOTIFICATION, 4, aParms, 0);
 
         if (   callHandle.rc != VERR_BUFFER_OVERFLOW
@@ -729 +729 @@
         aParms[1].setUInt64(u64Timestamp);
         aParms[2].setPointer(pvBuf, cbBuf);
-        pTable->pfnCall(pTable->pvService, &callHandle, 0, NULL, GUEST_PROP_FN_GET_NOTIFICATION, 4, aParms);
+        pTable->pfnCall(pTable->pvService, &callHandle, 0, NULL, GUEST_PROP_FN_GET_NOTIFICATION, 4, aParms, 0);
         if (   RT_FAILURE(callHandle.rc)
             || (i == 0 && callHandle.rc != VWRN_NOT_FOUND)
@@ -770 +770 @@
     g_AsyncNotification.callHandle.rc = VINF_HGCM_ASYNC_EXECUTE;
     pTable->pfnCall(pTable->pvService, &g_AsyncNotification.callHandle, 0, NULL,
-                    GUEST_PROP_FN_GET_NOTIFICATION, 4, g_AsyncNotification.aParms);
+                    GUEST_PROP_FN_GET_NOTIFICATION, 4, g_AsyncNotification.aParms, 0);
     if (RT_FAILURE(g_AsyncNotification.callHandle.rc))
         RTTestIFailed("GET_NOTIFICATION call failed, rc=%Rrc.", g_AsyncNotification.callHandle.rc);

trunk/src/VBox/HostServices/HostChannel/service.cpp

@@ -206 +206 @@
                                   uint32_t u32Function,
                                   uint32_t cParms,
-                                  VBOXHGCMSVCPARM paParms[])
-{
-    NOREF(pvService);
+                                  VBOXHGCMSVCPARM paParms[],
+                                  uint64_t tsArrival)
+{
+    RT_NOREF(pvService, tsArrival);
 
     int rc = VINF_SUCCESS;

trunk/src/VBox/HostServices/SharedClipboard/service.cpp

@@ -406 +406 @@
                                    uint32_t u32Function,
                                    uint32_t cParms,
-                                   VBOXHGCMSVCPARM paParms[])
-{
+                                   VBOXHGCMSVCPARM paParms[],
+                                   uint64_t tsArrival)
+{
+    RT_NOREF_PV(tsArrival);
     int rc = VINF_SUCCESS;
 

trunk/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardServiceHost.cpp

@@ -118 +118 @@
     call.rc = VERR_TRY_AGAIN;
     table.pfnCall(NULL, &call, 1 /* clientId */, &g_Client, VBOX_SHARED_CLIPBOARD_FN_GET_HOST_MSG,
-                  2, parms);
+                  2, parms, 0);
     RTTESTI_CHECK_RC(call.rc, VERR_TRY_AGAIN);  /* This should get updated only when the guest call completes. */
     vboxSvcClipboardReportMsg (&g_Client, VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA,
@@ -127 +127 @@
     call.rc = VERR_TRY_AGAIN;
     table.pfnCall(NULL, &call, 1 /* clientId */, &g_Client, VBOX_SHARED_CLIPBOARD_FN_GET_HOST_MSG,
-                  2, parms);
+                  2, parms, 0);
     RTTESTI_CHECK_RC(call.rc, VERR_TRY_AGAIN);  /* This call should not complete yet. */
 
@@ -138 +138 @@
     call.rc = VERR_TRY_AGAIN;
     table.pfnCall(NULL, &call, 1 /* clientId */, &g_Client, VBOX_SHARED_CLIPBOARD_FN_GET_HOST_MSG,
-                  2, parms);
+                  2, parms, 0);
     RTTESTI_CHECK(parms[0].u.uint32 == VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA);
     RTTESTI_CHECK(parms[1].u.uint32 == VBOX_SHARED_CLIPBOARD_FMT_HTML);
@@ -144 +144 @@
     call.rc = VERR_TRY_AGAIN;
     table.pfnCall(NULL, &call, 1 /* clientId */, &g_Client, VBOX_SHARED_CLIPBOARD_FN_GET_HOST_MSG,
-                  2, parms);
+                  2, parms, 0);
     RTTESTI_CHECK_RC(call.rc, VERR_TRY_AGAIN);  /* This call should not complete yet. */
 
@@ -153 +153 @@
     call.rc = VERR_TRY_AGAIN;
     table.pfnCall(NULL, &call, 1 /* clientId */, &g_Client, VBOX_SHARED_CLIPBOARD_FN_GET_HOST_MSG,
-                  2, parms);
+                  2, parms, 0);
     RTTESTI_CHECK_RC(call.rc, VERR_TRY_AGAIN);  /* This should get updated only when the guest call completes. */
     vboxSvcClipboardReportMsg (&g_Client, VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA,
@@ -162 +162 @@
     call.rc = VERR_TRY_AGAIN;
     table.pfnCall(NULL, &call, 1 /* clientId */, &g_Client, VBOX_SHARED_CLIPBOARD_FN_GET_HOST_MSG,
-                  2, parms);
+                  2, parms, 0);
     RTTESTI_CHECK(parms[0].u.uint32 == VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA);
     RTTESTI_CHECK(parms[1].u.uint32 == VBOX_SHARED_CLIPBOARD_FMT_HTML);
@@ -168 +168 @@
     call.rc = VERR_TRY_AGAIN;
     table.pfnCall(NULL, &call, 1 /* clientId */, &g_Client, VBOX_SHARED_CLIPBOARD_FN_GET_HOST_MSG,
-                  2, parms);
+                  2, parms, 0);
     RTTESTI_CHECK_RC(call.rc, VERR_TRY_AGAIN);  /* This call should not complete yet. */
 
@@ -179 +179 @@
     call.rc = VERR_TRY_AGAIN;
     table.pfnCall(NULL, &call, 1 /* clientId */, &g_Client, VBOX_SHARED_CLIPBOARD_FN_GET_HOST_MSG,
-                  2, parms);
+                  2, parms, 0);
     RTTESTI_CHECK(parms[0].u.uint32 == VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA);
     RTTESTI_CHECK(parms[1].u.uint32 == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT);
@@ -185 +185 @@
     call.rc = VERR_TRY_AGAIN;
     table.pfnCall(NULL, &call, 1 /* clientId */, &g_Client, VBOX_SHARED_CLIPBOARD_FN_GET_HOST_MSG,
-                  2, parms);
+                  2, parms, 0);
     RTTESTI_CHECK(parms[0].u.uint32 == VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA);
     RTTESTI_CHECK(parms[1].u.uint32 == VBOX_SHARED_CLIPBOARD_FMT_HTML);
@@ -191 +191 @@
     call.rc = VERR_TRY_AGAIN;
     table.pfnCall(NULL, &call, 1 /* clientId */, &g_Client, VBOX_SHARED_CLIPBOARD_FN_GET_HOST_MSG,
-                  2, parms);
+                  2, parms, 0);
     RTTESTI_CHECK_RC(call.rc, VERR_TRY_AGAIN);  /* This call should not complete yet. */
     table.pfnUnload(NULL);

trunk/src/VBox/HostServices/SharedFolders/service.cpp

@@ -98 +98 @@
 static STAMPROFILE g_StatCancelMappingsChangesWait;
 static STAMPROFILE g_StatUnknown;
+static STAMPROFILE g_StatMsgStage1;
 /** @} */
 
@@ -398 +399 @@
 }
 
-static DECLCALLBACK(void) svcCall (void *, VBOXHGCMCALLHANDLE callHandle, uint32_t u32ClientID,
-                                   void *pvClient, uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+static DECLCALLBACK(void) svcCall (void *, VBOXHGCMCALLHANDLE callHandle, uint32_t u32ClientID, void *pvClient,
+                                   uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[], uint64_t tsArrival)
 {
-    RT_NOREF1(u32ClientID);
+    RT_NOREF(u32ClientID, tsArrival);
 #ifndef VBOX_WITHOUT_RELEASE_STATISTICS
     uint64_t tsStart;
     STAM_GET_TS(tsStart);
+    STAM_REL_PROFILE_ADD_PERIOD(&g_StatMsgStage1, tsStart - tsArrival);
 #endif
     Log(("SharedFolders host service: svcCall: u32ClientID = %u, fn = %u, cParms = %u, pparms = %p\n", u32ClientID, u32Function, cParms, paParms));
@@ -1804 +1806 @@
              HGCMSvcHlpStamRegister(g_pHelpers, &g_StatCancelMappingsChangesWait, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_CALLS, "SHFL_FN_CANCEL_MAPPINGS_CHANGES_WAITS",     "/HGCM/VBoxSharedFolders/FnCancelMappingsChangesWaits");
              HGCMSvcHlpStamRegister(g_pHelpers, &g_StatUnknown,                   STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_CALLS, "SHFL_FN_???",                               "/HGCM/VBoxSharedFolders/FnUnknown");
+             HGCMSvcHlpStamRegister(g_pHelpers, &g_StatMsgStage1,                 STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_CALLS, "Time from VMMDev arrival to worker thread.","/HGCM/VBoxSharedFolders/MsgStage1");
         }
     }

trunk/src/VBox/HostServices/SharedFolders/testcase/tstSharedFolderService.cpp

@@ -645 +645 @@
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_MAP_FOLDER,
-                       SHFL_CPARMS_MAP_FOLDER, aParms);
+                       SHFL_CPARMS_MAP_FOLDER, aParms, 0);
     AssertReleaseRC(callHandle.rc);
     return aParms[1].u.uint32;
@@ -665 +665 @@
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_UNMAP_FOLDER,
-                       SHFL_CPARMS_UNMAP_FOLDER, aParms);
+                       SHFL_CPARMS_UNMAP_FOLDER, aParms, 0);
     AssertReleaseRC(callHandle.rc);
     fillTestShflString(&FolderName, pcszFolderName);
@@ -693 +693 @@
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_CREATE,
-                       RT_ELEMENTS(aParms), aParms);
+                       RT_ELEMENTS(aParms), aParms, 0);
     if (RT_FAILURE(callHandle.rc))
         return callHandle.rc;
@@ -717 +717 @@
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_READ,
-                       RT_ELEMENTS(aParms), aParms);
+                       RT_ELEMENTS(aParms), aParms, 0);
     if (pcbRead)
         *pcbRead = aParms[3].u.uint32;
@@ -737 +737 @@
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_WRITE,
-                       RT_ELEMENTS(aParms), aParms);
+                       RT_ELEMENTS(aParms), aParms, 0);
     if (pcbWritten)
         *pcbWritten = aParms[3].u.uint32;
@@ -753 +753 @@
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_FLUSH,
-                       SHFL_CPARMS_FLUSH, aParms);
+                       SHFL_CPARMS_FLUSH, aParms, 0);
     return callHandle.rc;
 }
@@ -783 +783 @@
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_LIST,
-                       RT_ELEMENTS(aParms), aParms);
+                       RT_ELEMENTS(aParms), aParms, 0);
     if (pcFiles)
         *pcFiles = aParms[7].u.uint32;
@@ -803 +803 @@
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_INFORMATION,
-                       RT_ELEMENTS(aParms), aParms);
+                       RT_ELEMENTS(aParms), aParms, 0);
     return callHandle.rc;
 }
@@ -821 +821 @@
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_LOCK,
-                       RT_ELEMENTS(aParms), aParms);
+                       RT_ELEMENTS(aParms), aParms, 0);
     return callHandle.rc;
 }

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -414 +414 @@
 }
 
-static DECLCALLBACK(void) svcCall (void *, VBOXHGCMCALLHANDLE callHandle, uint32_t u32ClientID, void *pvClient, uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+static DECLCALLBACK(void) svcCall (void *, VBOXHGCMCALLHANDLE callHandle, uint32_t u32ClientID, void *pvClient,
+                                   uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[], uint64_t tsArrival)
 {
+    RT_NOREF(pvClient, tsArrival);
     int rc = VINF_SUCCESS;
-
-    NOREF(pvClient);
 
     if (g_u32fCrHgcmDisabled)