Changeset 75539 in vbox for trunk/src/VBox/Main/src-client/HGCM.cpp

Timestamp:

Nov 17, 2018 2:35:23 AM (7 years ago)

Author:

vboxsync

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

126697

Message:

Main/HGCM: Skip the handle stuff for the HGCMThread class, it just add overhead. bugref:9172

File:

• trunk/src/VBox/Main/src-client/HGCM.cpp (modified) (35 diffs)

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

@@ -90 +90 @@
         static int sm_cServices;
 
-        HGCMTHREADHANDLE m_thread;
-        friend DECLCALLBACK(void) hgcmServiceThread(HGCMTHREADHANDLE ThreadHandle, void *pvUser);
+        HGCMThread *m_pThread;
+        friend DECLCALLBACK(void) hgcmServiceThread(HGCMThread *pThread, void *pvUser);
 
         uint32_t volatile m_u32RefCnt;
@@ -245 +245 @@
 HGCMService::HGCMService()
     :
-    m_thread     (0),
+    m_pThread    (NULL),
     m_u32RefCnt  (0),
     m_pSvcNext   (NULL),
@@ -531 +531 @@
  * The service thread. Loads the service library and calls the service entry points.
  */
-DECLCALLBACK(void) hgcmServiceThread(HGCMTHREADHANDLE ThreadHandle, void *pvUser)
+DECLCALLBACK(void) hgcmServiceThread(HGCMThread *pThread, void *pvUser)
 {
     HGCMService *pSvc = (HGCMService *)pvUser;
@@ -541 +541 @@
     {
         HGCMMsgCore *pMsgCore;
-        int rc = hgcmMsgGet(ThreadHandle, &pMsgCore);
+        int rc = hgcmMsgGet(pThread, &pMsgCore);
 
         if (RT_FAILURE(rc))
@@ -912 +912 @@
         RTStrCopy(szThreadName, sizeof(szThreadName), pszServiceName);
 
-    int rc = hgcmThreadCreate(&m_thread, szThreadName, hgcmServiceThread, this, pszServiceName, pUVM);
+    int rc = hgcmThreadCreate(&m_pThread, szThreadName, hgcmServiceThread, this, pszServiceName, pUVM);
 
     if (RT_SUCCESS(rc))
@@ -948 +948 @@
             /* Execute the load request on the service thread. */
             HGCMMSGHANDLE hMsg;
-            rc = hgcmMsgAlloc(m_thread, &hMsg, SVC_MSG_LOAD, hgcmMessageAllocSvc);
+            rc = hgcmMsgAlloc(m_pThread, &hMsg, SVC_MSG_LOAD, hgcmMessageAllocSvc);
 
             if (RT_SUCCESS(rc))
@@ -976 +976 @@
 
     HGCMMSGHANDLE hMsg;
-    int rc = hgcmMsgAlloc(m_thread, &hMsg, SVC_MSG_UNLOAD, hgcmMessageAllocSvc);
+    int rc = hgcmMsgAlloc(m_pThread, &hMsg, SVC_MSG_UNLOAD, hgcmMessageAllocSvc);
 
     if (RT_SUCCESS(rc))
@@ -983 +983 @@
 
         if (RT_SUCCESS(rc))
-        {
-            hgcmThreadWait(m_thread);
-        }
+            hgcmThreadWait(m_pThread);
     }
 
@@ -1004 +1002 @@
 
     HGCMMSGHANDLE hMsg;
-    int rc = hgcmMsgAlloc(m_thread, &hMsg, SVC_MSG_SAVESTATE, hgcmMessageAllocSvc);
+    int rc = hgcmMsgAlloc(m_pThread, &hMsg, SVC_MSG_SAVESTATE, hgcmMessageAllocSvc);
 
     if (RT_SUCCESS(rc))
@@ -1028 +1026 @@
 
     HGCMMSGHANDLE hMsg;
-    int rc = hgcmMsgAlloc(m_thread, &hMsg, SVC_MSG_LOADSTATE, hgcmMessageAllocSvc);
+    int rc = hgcmMsgAlloc(m_pThread, &hMsg, SVC_MSG_LOADSTATE, hgcmMessageAllocSvc);
 
     if (RT_SUCCESS(rc))
@@ -1475 +1473 @@
         HGCMMSGHANDLE hMsg;
 
-        rc = hgcmMsgAlloc(m_thread, &hMsg, SVC_MSG_CONNECT, hgcmMessageAllocSvc);
+        rc = hgcmMsgAlloc(m_pThread, &hMsg, SVC_MSG_CONNECT, hgcmMessageAllocSvc);
 
         if (RT_SUCCESS(rc))
@@ -1560 +1558 @@
         HGCMMSGHANDLE hMsg;
 
-        rc = hgcmMsgAlloc(m_thread, &hMsg, SVC_MSG_DISCONNECT, hgcmMessageAllocSvc);
+        rc = hgcmMsgAlloc(m_pThread, &hMsg, SVC_MSG_DISCONNECT, hgcmMessageAllocSvc);
 
         if (RT_SUCCESS(rc))
@@ -1576 +1574 @@
         {
             LogRel(("(%d, %d) [%s] hgcmMsgAlloc(%p, SVC_MSG_DISCONNECT) failed %Rrc\n",
-                    u32ClientId, fFromService, RT_VALID_PTR(m_pszSvcName)? m_pszSvcName: "", m_thread, rc));
+                    u32ClientId, fFromService, RT_VALID_PTR(m_pszSvcName)? m_pszSvcName: "", m_pThread, rc));
         }
     }
@@ -1590 +1588 @@
 
             if (m_cClients > i)
-            {
-                memmove (&m_paClientIds[i], &m_paClientIds[i + 1], sizeof(m_paClientIds[0]) * (m_cClients - i));
-            }
+                memmove(&m_paClientIds[i], &m_paClientIds[i + 1], sizeof(m_paClientIds[0]) * (m_cClients - i));
 
             /* Delete the client handle. */
@@ -1616 +1612 @@
     /* Forward the message to the service thread. */
     HGCMMSGHANDLE hMsg = 0;
-    int rc = hgcmMsgAlloc(m_thread, &hMsg, SVC_MSG_REGEXT, hgcmMessageAllocSvc);
+    int rc = hgcmMsgAlloc(m_pThread, &hMsg, SVC_MSG_REGEXT, hgcmMessageAllocSvc);
 
     if (RT_SUCCESS(rc))
@@ -1640 +1636 @@
     /* Forward the message to the service thread. */
     HGCMMSGHANDLE hMsg = 0;
-    int rc = hgcmMsgAlloc(m_thread, &hMsg, SVC_MSG_UNREGEXT, hgcmMessageAllocSvc);
+    int rc = hgcmMsgAlloc(m_pThread, &hMsg, SVC_MSG_UNREGEXT, hgcmMessageAllocSvc);
 
     if (RT_SUCCESS(rc))
@@ -1675 +1671 @@
     LogFlow(("MAIN::HGCMService::Call\n"));
 
-    int rc = hgcmMsgAlloc(m_thread, &hMsg, SVC_MSG_GUESTCALL, hgcmMessageAllocSvc);
+    int rc = hgcmMsgAlloc(m_pThread, &hMsg, SVC_MSG_GUESTCALL, hgcmMessageAllocSvc);
 
     if (RT_SUCCESS(rc))
@@ -1718 +1714 @@
 
     HGCMMSGHANDLE hMsg = 0;
-    int rc = hgcmMsgAlloc(m_thread, &hMsg, SVC_MSG_HOSTCALL, hgcmMessageAllocSvc);
+    int rc = hgcmMsgAlloc(m_pThread, &hMsg, SVC_MSG_HOSTCALL, hgcmMessageAllocSvc);
 
     if (RT_SUCCESS(rc))
@@ -1775 +1771 @@
 
     HGCMMSGHANDLE hMsg = 0;
-    int rc = hgcmMsgAlloc(m_thread, &hMsg, SVC_MSG_HOSTFASTCALLASYNC, hgcmMessageAllocSvc);
+    int rc = hgcmMsgAlloc(m_pThread, &hMsg, SVC_MSG_HOSTFASTCALLASYNC, hgcmMessageAllocSvc);
 
     if (RT_SUCCESS(rc))
@@ -1939 +1935 @@
 
 /* The main HGCM thread handler. */
-static DECLCALLBACK(void) hgcmThread(HGCMTHREADHANDLE ThreadHandle, void *pvUser)
-{
-    LogFlowFunc(("ThreadHandle = %p, pvUser = %p\n",
-                 ThreadHandle, pvUser));
+static DECLCALLBACK(void) hgcmThread(HGCMThread *pThread, void *pvUser)
+{
+    LogFlowFunc(("pThread = %p, pvUser = %p\n", pThread, pvUser));
 
     NOREF(pvUser);
@@ -1951 +1946 @@
     {
         HGCMMsgCore *pMsgCore;
-        int rc = hgcmMsgGet(ThreadHandle, &pMsgCore);
+        int rc = hgcmMsgGet(pThread, &pMsgCore);
 
         if (RT_FAILURE(rc))
@@ -2192 +2187 @@
  */
 
-/* The main hgcm thread. */
-static HGCMTHREADHANDLE g_hgcmThread = 0;
+/** The main hgcm thread. */
+static HGCMThread *g_pHgcmThread = 0;
 
 /*
@@ -2224 +2219 @@
     HGCMMSGHANDLE hMsg = 0;
 
-    int rc = hgcmMsgAlloc(g_hgcmThread, &hMsg, HGCM_MSG_LOAD, hgcmMainMessageAlloc);
+    int rc = hgcmMsgAlloc(g_pHgcmThread, &hMsg, HGCM_MSG_LOAD, hgcmMainMessageAlloc);
 
     if (RT_SUCCESS(rc))
@@ -2268 +2263 @@
     HGCMMSGHANDLE hMsg = 0;
 
-    int rc = hgcmMsgAlloc(g_hgcmThread, &hMsg, HGCM_MSG_REGEXT, hgcmMainMessageAlloc);
+    int rc = hgcmMsgAlloc(g_pHgcmThread, &hMsg, HGCM_MSG_REGEXT, hgcmMainMessageAlloc);
 
     if (RT_SUCCESS(rc))
@@ -2297 +2292 @@
     HGCMMSGHANDLE hMsg = 0;
 
-    int rc = hgcmMsgAlloc(g_hgcmThread, &hMsg, HGCM_MSG_UNREGEXT, hgcmMainMessageAlloc);
+    int rc = hgcmMsgAlloc(g_pHgcmThread, &hMsg, HGCM_MSG_UNREGEXT, hgcmMainMessageAlloc);
 
     if (RT_SUCCESS(rc))
@@ -2340 +2335 @@
     HGCMMSGHANDLE hMsg = 0;
 
-    int rc = hgcmMsgAlloc(g_hgcmThread, &hMsg, HGCM_MSG_CONNECT, hgcmMainMessageAlloc);
+    int rc = hgcmMsgAlloc(g_pHgcmThread, &hMsg, HGCM_MSG_CONNECT, hgcmMainMessageAlloc);
 
     if (RT_SUCCESS(rc))
@@ -2387 +2382 @@
     HGCMMSGHANDLE hMsg = 0;
 
-    int rc = hgcmMsgAlloc(g_hgcmThread, &hMsg, HGCM_MSG_DISCONNECT, hgcmMainMessageAlloc);
+    int rc = hgcmMsgAlloc(g_pHgcmThread, &hMsg, HGCM_MSG_DISCONNECT, hgcmMainMessageAlloc);
 
     if (RT_SUCCESS(rc))
@@ -2421 +2416 @@
     HGCMMSGHANDLE hMsg = 0;
 
-    int rc = hgcmMsgAlloc(g_hgcmThread, &hMsg, u32MsgId, hgcmMainMessageAlloc);
+    int rc = hgcmMsgAlloc(g_pHgcmThread, &hMsg, u32MsgId, hgcmMainMessageAlloc);
 
     if (RT_SUCCESS(rc))
@@ -2534 +2529 @@
      * other non-time-critical functions.
      */
-    int rc = hgcmMsgAlloc(g_hgcmThread, &hMsg, HGCM_MSG_HOSTCALL, hgcmMainMessageAlloc);
+    int rc = hgcmMsgAlloc(g_pHgcmThread, &hMsg, HGCM_MSG_HOSTCALL, hgcmMainMessageAlloc);
 
     if (RT_SUCCESS(rc))
@@ -2578 +2573 @@
      * other non-time-critical functions.
      */
-    int rc = hgcmMsgAlloc(g_hgcmThread, &hMsg, HGCM_MSG_SVCAQUIRE, hgcmMainMessageAlloc);
+    int rc = hgcmMsgAlloc(g_pHgcmThread, &hMsg, HGCM_MSG_SVCAQUIRE, hgcmMainMessageAlloc);
 
     if (RT_SUCCESS(rc))
@@ -2619 +2614 @@
      * other non-time-critical functions.
      */
-    int rc = hgcmMsgAlloc(g_hgcmThread, &hMsg, HGCM_MSG_SVCRELEASE, hgcmMainMessageAlloc);
+    int rc = hgcmMsgAlloc(g_pHgcmThread, &hMsg, HGCM_MSG_SVCRELEASE, hgcmMainMessageAlloc);
 
     if (RT_SUCCESS(rc))
@@ -2665 +2660 @@
     HGCMMSGHANDLE hMsg = 0;
 
-    int rc = hgcmMsgAlloc(g_hgcmThread, &hMsg, HGCM_MSG_RESET, hgcmMainMessageAlloc);
+    int rc = hgcmMsgAlloc(g_pHgcmThread, &hMsg, HGCM_MSG_RESET, hgcmMainMessageAlloc);
 
     if (RT_SUCCESS(rc))
@@ -2688 +2683 @@
          */
 
-        rc = hgcmThreadCreate(&g_hgcmThread, "MainHGCMthread", hgcmThread, NULL /*pvUser*/, NULL /*pszStatsSubDir*/, NULL /*pUVM*/);
+        rc = hgcmThreadCreate(&g_pHgcmThread, "MainHGCMthread", hgcmThread, NULL /*pvUser*/, NULL /*pszStatsSubDir*/, NULL /*pUVM*/);
 
         if (RT_FAILURE(rc))
@@ -2715 +2710 @@
         HGCMMSGHANDLE hMsg = 0;
 
-        rc = hgcmMsgAlloc(g_hgcmThread, &hMsg, HGCM_MSG_QUIT, hgcmMainMessageAlloc);
+        rc = hgcmMsgAlloc(g_pHgcmThread, &hMsg, HGCM_MSG_QUIT, hgcmMainMessageAlloc);
 
         if (RT_SUCCESS(rc))
@@ -2724 +2719 @@
             {
                 /* Wait for the thread termination. */
-                hgcmThreadWait(g_hgcmThread);
-                g_hgcmThread = 0;
+                hgcmThreadWait(g_pHgcmThread);
+                g_pHgcmThread = 0;
 
                 hgcmThreadUninit();