Changeset 75498 in vbox for trunk/src/VBox/HostServices/GuestProperties

Timestamp:

Nov 16, 2018 12:03:41 AM (6 years ago)

Author:

vboxsync

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

126655

Message:

HGCM,Main,SharedFolder,SharedClipboard,GuestProperties: Added HGCM service helpers for statistics and dbg info registration/deregistration. A PUVM is passed to HGCMService (where the helpers are implemented) when the service is loaded. Since this drags in both dbg.h and stam.h, LOG_GROUP defines now have to be at the top of the include list as everywhere else (i.e. hgcmsvc.h will define LOG_GROUP default by dragging in log.h). Added generic statistics of HGCM message processing and function level statistics to the shared folder service. [missing files, ++]

File:

• trunk/src/VBox/HostServices/GuestProperties/service.cpp (modified) (15 diffs)

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

@@ -394 +394 @@
     }
 
-#ifdef ASYNC_HOST_NOTIFY
     int initialize();
-#endif
 
 private:
@@ -422 +420 @@
     int hostCall(uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int uninit();
-    void dbgInfoShow(PCDBGFINFOHLP pHlp);
     static DECLCALLBACK(void) dbgInfo(void *pvUser, PCDBGFINFOHLP pHlp, const char *pszArgs);
 
@@ -1439 +1436 @@
 static DECLCALLBACK(int) dbgInfoCallback(PRTSTRSPACECORE pStr, void *pvUser)
 {
-    Property *pProp = (Property *)pStr;
-    PCDBGFINFOHLP pHlp = ((ENUMDBGINFO*)pvUser)->pHlp;
+    Property     *pProp = (Property *)pStr;
+    PCDBGFINFOHLP pHlp  = ((ENUMDBGINFO *)pvUser)->pHlp;
 
     char szFlags[GUEST_PROP_MAX_FLAGS_LEN];
@@ -1447 +1444 @@
         RTStrPrintf(szFlags, sizeof(szFlags), "???");
 
-    pHlp->pfnPrintf(pHlp, "%s: '%s', %RU64",
-                    pProp->mName.c_str(), pProp->mValue.c_str(), pProp->mTimestamp);
+    pHlp->pfnPrintf(pHlp, "%s: '%s', %RU64", pProp->mName.c_str(), pProp->mValue.c_str(), pProp->mTimestamp);
     if (strlen(szFlags))
         pHlp->pfnPrintf(pHlp, " (%s)", szFlags);
@@ -1455 +1451 @@
 }
 
-void Service::dbgInfoShow(PCDBGFINFOHLP pHlp)
-{
-    ENUMDBGINFO EnumData = { pHlp };
-    RTStrSpaceEnumerate(&mhProperties, dbgInfoCallback, &EnumData);
-}
 
 /**
@@ -1468 +1459 @@
  * @param   pszArgs     Arguments, ignored.
  */
-void Service::dbgInfo(void *pvUser, PCDBGFINFOHLP pHlp, const char *pszArgs)
+DECLCALLBACK(void) Service::dbgInfo(void *pvUser, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
     RT_NOREF1(pszArgs);
     SELF *pSelf = reinterpret_cast<SELF *>(pvUser);
-    pSelf->dbgInfoShow(pHlp);
+
+    ENUMDBGINFO EnumData = { pHlp };
+    RTStrSpaceEnumerate(&pSelf->mhProperties, dbgInfoCallback, &EnumData);
 }
 
@@ -1542 +1535 @@
                 break;
 
-            case GUEST_PROP_FN_HOST_GET_DBGF_INFO:
-                if (cParms != 2)
-                    return VERR_INVALID_PARAMETER;
-                paParms[0].u.pointer.addr = (void*)(uintptr_t)dbgInfo;
-                paParms[1].u.pointer.addr = (void*)this;
-                break;
-
             default:
                 rc = VERR_NOT_SUPPORTED;
@@ -1564 +1550 @@
 
 #ifdef ASYNC_HOST_NOTIFY
+
 /* static */
 DECLCALLBACK(int) Service::threadNotifyHost(RTTHREAD hThreadSelf, void *pvUser)
@@ -1596 +1583 @@
 }
 
+#endif /* ASYNC_HOST_NOTIFY */
+
 int Service::initialize()
 {
+#ifdef ASYNC_HOST_NOTIFY
     /* The host notification thread and queue. */
     int rc = RTReqQueueCreate(&mhReqQNotifyHost);
@@ -1619 +1609 @@
         }
     }
+#else  /* !ASYNC_HOST_NOTIFY */
+    int rc = VINF_SUCCESS;
+#endif /* !ASYNC_HOST_NOTIFY */
+
+    /* Finally debug stuff (ignore failures): */
+    if (RT_SUCCESS(rc))
+        HGCMSvcHlpInfoRegister(mpHelpers, "guestprops", "Display the guest properties", Service::dbgInfo, this);
 
     return rc;
 }
 
+#ifdef ASYNC_HOST_NOTIFY
 /**
  * @callback_method_impl{FNRTSTRSPACECALLBACK, Destroys Property.}
@@ -1638 +1636 @@
 int Service::uninit()
 {
+    if (mpHelpers)
+        HGCMSvcHlpInfoDeregister(mpHelpers, "guestprops");
+
 #ifdef ASYNC_HOST_NOTIFY
     if (mhReqQNotifyHost != NIL_RTREQQUEUE)
@@ -1656 +1657 @@
     }
 #endif
-
     return VINF_SUCCESS;
 }
@@ -1667 +1667 @@
  * @copydoc VBOXHGCMSVCLOAD
  */
-extern "C" DECLCALLBACK(DECLEXPORT(int)) VBoxHGCMSvcLoad (VBOXHGCMSVCFNTABLE *ptable)
+extern "C" DECLCALLBACK(DECLEXPORT(int)) VBoxHGCMSvcLoad(VBOXHGCMSVCFNTABLE *ptable)
 {
     int rc = VERR_IPE_UNINITIALIZED_STATUS;
@@ -1713 +1713 @@
                 ptable->pfnLoadState          = NULL;  /* construction done before restoring suffices */
                 ptable->pfnRegisterExtension  = Service::svcRegisterExtension;
+                ptable->pvService             = pService;
 
                 /* Service specific initialization. */
-                ptable->pvService = pService;
-
-#ifdef ASYNC_HOST_NOTIFY
                 rc = pService->initialize();
                 if (RT_FAILURE(rc))
@@ -1724 +1722 @@
                     pService = NULL;
                 }
-#endif
             }
             else