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

Timestamp:

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

Author:

vboxsync

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, ++]

Location:

trunk/src/VBox/Main/src-client

Files:

• HGCM.cpp (modified) (2 diffs)
• HGCMThread.cpp (modified) (10 diffs)

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

@@ -909 +909 @@
         RTStrCopy(szThreadName, sizeof(szThreadName), pszServiceName);
 
-    int rc = hgcmThreadCreate(&m_thread, szThreadName, hgcmServiceThread, this);
+    int rc = hgcmThreadCreate(&m_thread, szThreadName, hgcmServiceThread, this, pszServiceName, pUVM);
 
     if (RT_SUCCESS(rc))
@@ -2681 +2681 @@
          */
 
-        rc = hgcmThreadCreate(&g_hgcmThread, "MainHGCMthread", hgcmThread, NULL);
+        rc = hgcmThreadCreate(&g_hgcmThread, "MainHGCMthread", hgcmThread, NULL /*pvUser*/, NULL /*pszStatsSubDir*/, NULL /*pUVM*/);
 
         if (RT_FAILURE(rc))

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

@@ -22 +22 @@
 
 #include <VBox/err.h>
+#include <VBox/vmm/stam.h>
 #include <iprt/semaphore.h>
 #include <iprt/thread.h>
@@ -119 +120 @@
         HGCMTHREADHANDLE m_handle;
 
+        /** @name Statistics
+         * @{ */
+        STAMCOUNTER m_StatPostMsgNoPending;
+        STAMCOUNTER m_StatPostMsgOnePending;
+        STAMCOUNTER m_StatPostMsgTwoPending;
+        STAMCOUNTER m_StatPostMsgThreePending;
+        STAMCOUNTER m_StatPostMsgManyPending;
+        /** @} */
+
         inline int Enter (void);
         inline void Leave (void);
@@ -133 +143 @@
         int WaitForTermination (void);
 
-        int Initialize (HGCMTHREADHANDLE handle, const char *pszThreadName, PFNHGCMTHREAD pfnThread, void *pvUser);
+        int Initialize (HGCMTHREADHANDLE handle, const char *pszThreadName, PFNHGCMTHREAD pfnThread, void *pvUser,
+                        const char *pszStatsSubDir, PUVM pUVM);
 
         int MsgAlloc (HGCMMSGHANDLE *pHandle, uint32_t u32MsgId, PFNHGCMNEWMSGALLOC pfnNewMessage);
@@ -264 +275 @@
 }
 
-int HGCMThread::Initialize (HGCMTHREADHANDLE handle, const char *pszThreadName, PFNHGCMTHREAD pfnThread, void *pvUser)
-{
-    int rc = VINF_SUCCESS;
-
-    rc = RTSemEventMultiCreate (&m_eventThread);
+int HGCMThread::Initialize (HGCMTHREADHANDLE handle, const char *pszThreadName, PFNHGCMTHREAD pfnThread, void *pvUser,
+                            const char *pszStatsSubDir, PUVM pUVM)
+{
+    int rc = RTSemEventMultiCreate (&m_eventThread);
 
     if (RT_SUCCESS(rc))
@@ -294 +304 @@
                 if (RT_SUCCESS(rc))
                 {
+                    /* Register statistics while the thread starts. */
+                    if (pUVM)
+                    {
+                        STAMR3RegisterFU(pUVM, &m_StatPostMsgNoPending, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT,
+                                         "Times a message was appended to an empty input queue.",
+                                         "/HGCM/%s/PostMsg0Pending", pszStatsSubDir);
+                        STAMR3RegisterFU(pUVM, &m_StatPostMsgOnePending, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT,
+                                         "Times a message was appended to input queue with only one pending message.",
+                                         "/HGCM/%s/PostMsg1Pending", pszStatsSubDir);
+                        STAMR3RegisterFU(pUVM, &m_StatPostMsgTwoPending, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT,
+                                         "Times a message was appended to input queue with only one pending message.",
+                                         "/HGCM/%s/PostMsg2Pending", pszStatsSubDir);
+                        STAMR3RegisterFU(pUVM, &m_StatPostMsgTwoPending, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT,
+                                         "Times a message was appended to input queue with only one pending message.",
+                                         "/HGCM/%s/PostMsg3Pending", pszStatsSubDir);
+                        STAMR3RegisterFU(pUVM, &m_StatPostMsgManyPending, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT,
+                                         "Times a message was appended to input queue with only one pending message.",
+                                         "/HGCM/%s/PostMsgManyPending", pszStatsSubDir);
+                    }
+
+
                     /* Wait until the thread is ready. */
                     rc = RTThreadUserWait (thread, 30000);
@@ -314 +345 @@
         {
             Log(("hgcmThreadCreate: FAILURE: Can't create an event semaphore for a sent messages.\n"));
-            m_eventSend = 0;
+            m_eventSend = NIL_RTSEMEVENTMULTI;
         }
     }
@@ -320 +351 @@
     {
         Log(("hgcmThreadCreate: FAILURE: Can't create an event semaphore for a hgcm worker thread.\n"));
-        m_eventThread = 0;
+        m_eventThread = NIL_RTSEMEVENTMULTI;
     }
 
@@ -409 +440 @@
         /* Insert the message to the queue tail. */
         pMsg->m_pNext = NULL;
-        pMsg->m_pPrev = m_pMsgInputQueueTail;
-
-        if (m_pMsgInputQueueTail)
-        {
-            m_pMsgInputQueueTail->m_pNext = pMsg;
+        HGCMMsgCore * const pPrev = m_pMsgInputQueueTail;
+        pMsg->m_pPrev = pPrev;
+
+        if (pPrev)
+        {
+            pPrev->m_pNext = pMsg;
+            if (!pPrev->m_pPrev)
+                STAM_REL_COUNTER_INC(&m_StatPostMsgOnePending);
+            else if (!pPrev->m_pPrev)
+                STAM_REL_COUNTER_INC(&m_StatPostMsgTwoPending);
+            else if (!pPrev->m_pPrev->m_pPrev)
+                STAM_REL_COUNTER_INC(&m_StatPostMsgThreePending);
+            else
+                STAM_REL_COUNTER_INC(&m_StatPostMsgManyPending);
         }
         else
         {
             m_pMsgInputQueueHead = pMsg;
+            STAM_REL_COUNTER_INC(&m_StatPostMsgNoPending);
         }
 
@@ -630 +671 @@
  */
 
-int hgcmThreadCreate (HGCMTHREADHANDLE *pHandle, const char *pszThreadName, PFNHGCMTHREAD pfnThread, void *pvUser)
+int hgcmThreadCreate (HGCMTHREADHANDLE *pHandle, const char *pszThreadName, PFNHGCMTHREAD pfnThread, void *pvUser,
+                      const char *pszStatsSubDir, PUVM pUVM)
 {
     int rc = VINF_SUCCESS;
@@ -647 +689 @@
 
         /* Initialize the object. */
-        rc = pThread->Initialize (handle, pszThreadName, pfnThread, pvUser);
+        rc = pThread->Initialize (handle, pszThreadName, pfnThread, pvUser, pszStatsSubDir, pUVM);
     }
     else