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

Timestamp:

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

Author:

vboxsync

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

126657

Message:

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

Location:

trunk/src/VBox/Main

Files:

• include/HGCM.h (modified) (2 diffs)
• src-client/HGCM.cpp (modified) (8 diffs)
• src-client/VMMDevInterface.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/HGCM.h

@@ -16 +16 @@
  */
 
-#ifndef __HGCM_h__
-#define __HGCM_h__
+#ifndef ___HGCM_h_
+#define ___HGCM_h_
 
 #include <VBox/cdefs.h>
@@ -34 +34 @@
 
 RT_C_DECLS_BEGIN
-int HGCMHostInit (void);
-int HGCMHostShutdown (void);
+int HGCMHostInit(void);
+int HGCMHostShutdown(void);
 
-int HGCMHostReset (void);
+int HGCMHostReset(void);
 
-int HGCMHostLoad (const char *pszServiceLibrary, const char *pszServiceName, PUVM pUVM);
+int HGCMHostLoad(const char *pszServiceLibrary, const char *pszServiceName, PUVM pUVM);
 
-int HGCMHostRegisterServiceExtension (HGCMSVCEXTHANDLE *pHandle, const char *pszServiceName, PFNHGCMSVCEXT pfnExtension, void *pvExtension);
-void HGCMHostUnregisterServiceExtension (HGCMSVCEXTHANDLE handle);
+int HGCMHostRegisterServiceExtension(HGCMSVCEXTHANDLE *pHandle, const char *pszServiceName, PFNHGCMSVCEXT pfnExtension, void *pvExtension);
+void HGCMHostUnregisterServiceExtension(HGCMSVCEXTHANDLE handle);
 
-int HGCMGuestConnect (PPDMIHGCMPORT pHGCMPort, PVBOXHGCMCMD pCmdPtr, const char *pszServiceName, uint32_t *pClientID);
-int HGCMGuestDisconnect (PPDMIHGCMPORT pHGCMPort, PVBOXHGCMCMD pCmdPtr, uint32_t clientID);
-int HGCMGuestCall (PPDMIHGCMPORT pHGCMPort, PVBOXHGCMCMD pCmdPtr, uint32_t clientID, uint32_t function, uint32_t cParms, VBOXHGCMSVCPARM *paParms);
+int HGCMGuestConnect(PPDMIHGCMPORT pHGCMPort, PVBOXHGCMCMD pCmdPtr, const char *pszServiceName, uint32_t *pClientID);
+int HGCMGuestDisconnect(PPDMIHGCMPORT pHGCMPort, PVBOXHGCMCMD pCmdPtr, uint32_t clientID);
+int HGCMGuestCall(PPDMIHGCMPORT pHGCMPort, PVBOXHGCMCMD pCmdPtr, uint32_t clientID, uint32_t function, uint32_t cParms,
+                  VBOXHGCMSVCPARM *paParms, uint64_t tsArrival);
 
-int HGCMHostCall (const char *pszServiceName, uint32_t function, uint32_t cParms, VBOXHGCMSVCPARM aParms[]);
+int HGCMHostCall(const char *pszServiceName, uint32_t function, uint32_t cParms, VBOXHGCMSVCPARM aParms[]);
 
 #ifdef VBOX_WITH_CRHGSMI
-int HGCMHostSvcHandleCreate (const char *pszServiceName, HGCMCVSHANDLE * phSvc);
-int HGCMHostSvcHandleDestroy (HGCMCVSHANDLE hSvc);
-int HGCMHostFastCallAsync (HGCMCVSHANDLE hSvc, uint32_t function, PVBOXHGCMSVCPARM pParm, PHGCMHOSTFASTCALLCB pfnCompletion, void *pvCompletion);
+int HGCMHostSvcHandleCreate(const char *pszServiceName, HGCMCVSHANDLE * phSvc);
+int HGCMHostSvcHandleDestroy(HGCMCVSHANDLE hSvc);
+int HGCMHostFastCallAsync(HGCMCVSHANDLE hSvc, uint32_t function, PVBOXHGCMSVCPARM pParm,
+                          PHGCMHOSTFASTCALLCB pfnCompletion, void *pvCompletion);
 #endif
 
-int HGCMHostSaveState (PSSMHANDLE pSSM);
-int HGCMHostLoadState (PSSMHANDLE pSSM);
+int HGCMHostSaveState(PSSMHANDLE pSSM);
+int HGCMHostLoadState(PSSMHANDLE pSSM);
 
 RT_C_DECLS_END
 
-#endif /* !__HGCM_h__ */
+#endif /* !___HGCM_h_ */
+

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

@@ -191 +191 @@
 
         int GuestCall(PPDMIHGCMPORT pHGCMPort, PVBOXHGCMCMD pCmd, uint32_t u32ClientId,
-                      uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM aParms[]);
+                      uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM aParms[], uint64_t tsArrival);
 };
 
@@ -448 +448 @@
 
         VBOXHGCMSVCPARM *paParms;
+
+        /** The STAM_GET_TS() value when the request arrived. */
+        uint64_t tsArrival;
 };
 
@@ -637 +640 @@
                     pSvc->m_fntable.pfnCall(pSvc->m_fntable.pvService, (VBOXHGCMCALLHANDLE)pMsg, pMsg->u32ClientId,
                                             HGCM_CLIENT_DATA(pSvc, pClient), pMsg->u32Function,
-                                            pMsg->cParms, pMsg->paParms);
+                                            pMsg->cParms, pMsg->paParms, pMsg->tsArrival);
 
                     hgcmObjDereference(pClient);
@@ -1662 +1665 @@
  * @param cParms         Number of parameters.
  * @param paParms        Pointer to array of parameters.
+ * @param tsArrival      The STAM_GET_TS() value when the request arrived.
  * @return VBox rc.
  */
 int HGCMService::GuestCall(PPDMIHGCMPORT pHGCMPort, PVBOXHGCMCMD pCmd, uint32_t u32ClientId, uint32_t u32Function,
-                           uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+                           uint32_t cParms, VBOXHGCMSVCPARM paParms[], uint64_t tsArrival)
 {
     HGCMMSGHANDLE hMsg = 0;
@@ -1686 +1690 @@
         pMsg->cParms      = cParms;
         pMsg->paParms     = paParms;
+        pMsg->tsArrival   = tsArrival;
 
         hgcmObjDereference(pMsg);
@@ -2462 +2467 @@
  * @param cParms         Number of parameters.
  * @param paParms        Pointer to array of parameters.
+ * @param tsArrival      The STAM_GET_TS() value when the request arrived.
  * @return VBox rc.
  */
@@ -2469 +2475 @@
                   uint32_t u32Function,
                   uint32_t cParms,
-                  VBOXHGCMSVCPARM *paParms)
+                  VBOXHGCMSVCPARM *paParms,
+                  uint64_t tsArrival)
 {
     LogFlowFunc(("pHGCMPort = %p, pCmd = %p, u32ClientId = %d, u32Function = %d, cParms = %d, paParms = %p\n",
@@ -2489 +2496 @@
 
         /* Forward the message to the service thread. */
-        rc = pClient->pService->GuestCall(pHGCMPort, pCmd, u32ClientId, u32Function, cParms, paParms);
+        rc = pClient->pService->GuestCall(pHGCMPort, pCmd, u32ClientId, u32Function, cParms, paParms, tsArrival);
 
         hgcmObjDereference(pClient);

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

@@ -642 +642 @@
 
 static DECLCALLBACK(int) iface_hgcmCall(PPDMIHGCMCONNECTOR pInterface, PVBOXHGCMCMD pCmd, uint32_t u32ClientID,
-                                        uint32_t u32Function, uint32_t cParms, PVBOXHGCMSVCPARM paParms)
+                                        uint32_t u32Function, uint32_t cParms, PVBOXHGCMSVCPARM paParms, uint64_t tsArrival)
 {
     Log9(("Enter\n"));
@@ -651 +651 @@
         return VERR_INVALID_STATE;
 
-    return HGCMGuestCall(pDrv->pHGCMPort, pCmd, u32ClientID, u32Function, cParms, paParms);
+    return HGCMGuestCall(pDrv->pHGCMPort, pCmd, u32ClientID, u32Function, cParms, paParms, tsArrival);
 }