Changeset 75737 in vbox for trunk/src/VBox/HostServices/GuestControl

Timestamp:

Nov 26, 2018 3:44:41 PM (6 years ago)

Author:

vboxsync

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

126937

Message:

HGCM: Replace C++-style inline members on VBOXHGCMSVCPARM with simple functions.
bugref:9172: Shared folder performance tuning
Changes in bugref:9172 caused a build regression on Ubuntu 18.10 due to the
use of RT_ZERO on a structure containing an embedded VBOXHGCMSVCPARM, as
VBOXHGCMSVCPARM had member functions and was therefore not a simple plain-
old-data structure. Rather than just doing the sensible thing and zeroing
it in a different way, I converted the inline member getters and setters to
standard inline C functions, including fixing callers. Actually I had planned
this for some time, as the member function use seemed a bit gratuitous in
hindsight.

Location:

trunk/src/VBox/HostServices/GuestControl

Files:

• service.cpp (modified) (6 diffs)
• testcase/tstGuestControlSvc.cpp (modified) (3 diffs)

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

@@ -224 +224 @@
              * assign the context ID to the command.
              */
-            rc = mpParms[0].getUInt32(&mContextID);
+            rc = HGCMSvcGetU32(&mpParms[0], &mContextID);
 
             /* Set timestamp so that clients can distinguish between already
@@ -418 +418 @@
         if (pConnection->mNumParms >= 2)
         {
-            pConnection->mParms[0].setUInt32(mMsgType);   /* Message ID */
-            pConnection->mParms[1].setUInt32(mParmCount); /* Required parameters for message */
+            HGCMSvcSetU32(&pConnection->mParms[0], mMsgType);   /* Message ID */
+            HGCMSvcSetU32(&pConnection->mParms[1], mParmCount); /* Required parameters for message */
         }
         else
@@ -777 +777 @@
             && mPendingCon.mNumParms >= 2)
         {
-            mPendingCon.mParms[0].setUInt32(HOST_CANCEL_PENDING_WAITS); /* Message ID. */
-            mPendingCon.mParms[1].setUInt32(0);                         /* Required parameters for message. */
+            HGCMSvcSetU32(&mPendingCon.mParms[0], HOST_CANCEL_PENDING_WAITS); /* Message ID. */
+            HGCMSvcSetU32(&mPendingCon.mParms[1], 0);                         /* Required parameters for message. */
 
             AssertPtr(mSvcHelpers);
@@ -1109 +1109 @@
             uint32_t cParms = 0;
             VBOXHGCMSVCPARM arParms[2];
-            arParms[cParms++].setUInt32(pCurCmd->mContextID);
+            HGCMSvcSetU32(&arParms[cParms++], pCurCmd->mContextID);
 
             int rc2 = hostCallback(GUEST_DISCONNECTED, cParms, arParms);
@@ -1207 +1207 @@
 
     uint32_t uValue;
-    int rc = paParms[0].getUInt32(&uValue);
+    int rc = HGCMSvcGetU32(&paParms[0], &uValue);
     if (RT_SUCCESS(rc))
     {
         uint32_t uMaskAdd;
-        rc = paParms[1].getUInt32(&uMaskAdd);
+        rc = HGCMSvcGetU32(&paParms[1], &uMaskAdd);
         if (RT_SUCCESS(rc))
         {
             uint32_t uMaskRemove;
-            rc = paParms[2].getUInt32(&uMaskRemove);
+            rc = HGCMSvcGetU32(&paParms[2], &uMaskRemove);
             /** @todo paParm[3] (flags) not used yet. */
             if (RT_SUCCESS(rc))
@@ -1584 +1584 @@
 
     uint32_t uContextID, uFlags;
-    int rc = paParms[0].getUInt32(&uContextID);
+    int rc = HGCMSvcGetU32(&paParms[0], &uContextID);
     if (RT_SUCCESS(rc))
-        rc = paParms[1].getUInt32(&uFlags);
+        rc = HGCMSvcGetU32(&paParms[1], &uFlags);
 
     uint32_t uSessionID = VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(uContextID);

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

@@ -152 +152 @@
 
     VBOXHGCMSVCPARM aParms[1];
-    aParms[0].setUInt32(1000 /* Context ID */);
+    HGCMSvcSetU32(&aParms[0], 1000 /* Context ID */);
 
     CMDHOST aCmdHostAll[] =
@@ -208 +208 @@
         /* No commands from host yet. */
         VBOXHGCMSVCPARM aParmsGuest[8];
-        aParmsGuest[0].setUInt32(0 /* Msg type */);
-        aParmsGuest[1].setUInt32(0 /* Parameters */);
+        HGCMSvcSetU32(&aParmsGuest[0], 0 /* Msg type */);
+        HGCMSvcSetU32(&aParmsGuest[1], 0 /* Parameters */);
         pTable->pfnCall(pTable->pvService, &callHandle, 1 /* Client ID */, NULL /* pvClient */,
                         GUEST_MSG_WAIT, 2, &aParmsGuest[0], 0);
@@ -216 +216 @@
         /* Host: Add a dummy command. */
         VBOXHGCMSVCPARM aParmsHost[8];
-        aParmsHost[0].setUInt32(1000 /* Context ID */);
-        aParmsHost[1].setString("foo.bar");
-        aParmsHost[2].setString("baz");
+        HGCMSvcSetU32(&aParmsHost[0], 1000 /* Context ID */);
+        HGCMSvcSetStr(&aParmsHost[1], "foo.bar");
+        HGCMSvcSetStr(&aParmsHost[2], "baz");
 
         rc = pTable->pfnHostCall(pTable->pvService, HOST_EXEC_CMD, 3, &aParmsHost[0]);