Changeset 75737 in vbox for trunk/src/VBox/HostServices/SharedFolders/testcase

Timestamp:

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

Author:

vboxsync

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.

File:

• trunk/src/VBox/HostServices/SharedFolders/testcase/tstSharedFolderService.cpp (modified) (10 diffs)

trunk/src/VBox/HostServices/SharedFolders/testcase/tstSharedFolderService.cpp

@@ -659 +659 @@
     fillTestShflString(&Mapping, pcszMapping);
     fillTestShflString(&AutoMountPoint, "");
-    aParms[0].setPointer(&FolderName,   RT_UOFFSETOF(SHFLSTRING, String)
+    HGCMSvcSetPv(&aParms[0], &FolderName,   RT_UOFFSETOF(SHFLSTRING, String)
                                       + FolderName.string.u16Size);
-    aParms[1].setPointer(&Mapping,   RT_UOFFSETOF(SHFLSTRING, String)
+    HGCMSvcSetPv(&aParms[1], &Mapping,   RT_UOFFSETOF(SHFLSTRING, String)
                                    + Mapping.string.u16Size);
-    aParms[2].setUInt32(1);
-    aParms[3].setPointer(&AutoMountPoint, SHFLSTRING_HEADER_SIZE + AutoMountPoint.string.u16Size);
+    HGCMSvcSetU32(&aParms[2], 1);
+    HGCMSvcSetPv(&aParms[3], &AutoMountPoint, SHFLSTRING_HEADER_SIZE + AutoMountPoint.string.u16Size);
     rc = psvcTable->pfnHostCall(psvcTable->pvService, SHFL_FN_ADD_MAPPING,
                                 SHFL_CPARMS_ADD_MAPPING, aParms);
     AssertReleaseRC(rc);
-    aParms[0].setPointer(&Mapping,   RT_UOFFSETOF(SHFLSTRING, String)
+    HGCMSvcSetPv(&aParms[0], &Mapping,   RT_UOFFSETOF(SHFLSTRING, String)
                                    + Mapping.string.u16Size);
-    aParms[1].setUInt32(0);  /* root */
-    aParms[2].setUInt32('/');  /* delimiter */
-    aParms[3].setUInt32(fCaseSensitive);
+    HGCMSvcSetU32(&aParms[1], 0);  /* root */
+    HGCMSvcSetU32(&aParms[2], '/');  /* delimiter */
+    HGCMSvcSetU32(&aParms[3], fCaseSensitive);
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_MAP_FOLDER,
@@ -692 +692 @@
     int rc;
 
-    aParms[0].setUInt32(root);
+    HGCMSvcSetU32(&aParms[0], root);
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_UNMAP_FOLDER,
@@ -698 +698 @@
     AssertReleaseRC(callHandle.rc);
     fillTestShflString(&FolderName, pcszFolderName);
-    aParms[0].setPointer(&FolderName,   RT_UOFFSETOF(SHFLSTRING, String)
+    HGCMSvcSetPv(&aParms[0], &FolderName,   RT_UOFFSETOF(SHFLSTRING, String)
                                       + FolderName.string.u16Size);
     rc = psvcTable->pfnHostCall(psvcTable->pvService, SHFL_FN_REMOVE_MAPPING,
@@ -717 +717 @@
     RT_ZERO(CreateParms);
     CreateParms.CreateFlags = fCreateFlags;
-    aParms[0].setUInt32(Root);
-    aParms[1].setPointer(&Path,   RT_UOFFSETOF(SHFLSTRING, String)
+    HGCMSvcSetU32(&aParms[0], Root);
+    HGCMSvcSetPv(&aParms[1], &Path,   RT_UOFFSETOF(SHFLSTRING, String)
                                 + Path.string.u16Size);
-    aParms[2].setPointer(&CreateParms, sizeof(CreateParms));
+    HGCMSvcSetPv(&aParms[2], &CreateParms, sizeof(CreateParms));
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_CREATE,
@@ -740 +740 @@
     VBOXHGCMCALLHANDLE_TYPEDEF callHandle = { VINF_SUCCESS };
 
-    aParms[0].setUInt32(Root);
-    aParms[1].setUInt64((uint64_t) hFile);
-    aParms[2].setUInt64(offSeek);
-    aParms[3].setUInt32(cbRead);
-    aParms[4].setPointer(pvBuf, cbBuf);
+    HGCMSvcSetU32(&aParms[0], Root);
+    HGCMSvcSetU64(&aParms[1], (uint64_t) hFile);
+    HGCMSvcSetU64(&aParms[2], offSeek);
+    HGCMSvcSetU32(&aParms[3], cbRead);
+    HGCMSvcSetPv(&aParms[4], pvBuf, cbBuf);
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_READ,
@@ -760 +760 @@
     VBOXHGCMCALLHANDLE_TYPEDEF callHandle = { VINF_SUCCESS };
 
-    aParms[0].setUInt32(Root);
-    aParms[1].setUInt64((uint64_t) hFile);
-    aParms[2].setUInt64(offSeek);
-    aParms[3].setUInt32(cbWrite);
-    aParms[4].setPointer((void *)pvBuf, cbBuf);
+    HGCMSvcSetU32(&aParms[0], Root);
+    HGCMSvcSetU64(&aParms[1], (uint64_t) hFile);
+    HGCMSvcSetU64(&aParms[2], offSeek);
+    HGCMSvcSetU32(&aParms[3], cbWrite);
+    HGCMSvcSetPv(&aParms[4], (void *)pvBuf, cbBuf);
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_WRITE,
@@ -779 +779 @@
     VBOXHGCMCALLHANDLE_TYPEDEF callHandle = { VINF_SUCCESS };
 
-    aParms[0].setUInt32(root);
-    aParms[1].setUInt64(handle);
+    HGCMSvcSetU32(&aParms[0], root);
+    HGCMSvcSetU64(&aParms[1], handle);
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_FLUSH,
@@ -796 +796 @@
     VBOXHGCMCALLHANDLE_TYPEDEF callHandle = { VINF_SUCCESS };
 
-    aParms[0].setUInt32(root);
-    aParms[1].setUInt64(handle);
-    aParms[2].setUInt32(fFlags);
-    aParms[3].setUInt32(cbBuf);
+    HGCMSvcSetU32(&aParms[0], root);
+    HGCMSvcSetU64(&aParms[1], handle);
+    HGCMSvcSetU32(&aParms[2], fFlags);
+    HGCMSvcSetU32(&aParms[3], cbBuf);
     if (pcszPath)
     {
         fillTestShflString(&Path, pcszPath);
-        aParms[4].setPointer(&Path,   RT_UOFFSETOF(SHFLSTRING, String)
+        HGCMSvcSetPv(&aParms[4], &Path,   RT_UOFFSETOF(SHFLSTRING, String)
                                     + Path.string.u16Size);
     }
     else
-        aParms[4].setPointer(NULL, 0);
-    aParms[5].setPointer(pvBuf, cbBuf);
-    aParms[6].setUInt32(resumePoint);
-    aParms[7].setUInt32(0);
+        HGCMSvcSetPv(&aParms[4], NULL, 0);
+    HGCMSvcSetPv(&aParms[5], pvBuf, cbBuf);
+    HGCMSvcSetU32(&aParms[6], resumePoint);
+    HGCMSvcSetU32(&aParms[7], 0);
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_LIST,
@@ -826 +826 @@
     VBOXHGCMCALLHANDLE_TYPEDEF callHandle = { VINF_SUCCESS };
 
-    aParms[0].setUInt32(root);
-    aParms[1].setUInt64(handle);
-    aParms[2].setUInt32(fFlags);
-    aParms[3].setUInt32(cb);
-    aParms[4].setPointer(pInfo, cb);
+    HGCMSvcSetU32(&aParms[0], root);
+    HGCMSvcSetU64(&aParms[1], handle);
+    HGCMSvcSetU32(&aParms[2], fFlags);
+    HGCMSvcSetU32(&aParms[3], cb);
+    HGCMSvcSetPv(&aParms[4], pInfo, cb);
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_INFORMATION,
@@ -844 +844 @@
     VBOXHGCMCALLHANDLE_TYPEDEF callHandle = { VINF_SUCCESS };
 
-    aParms[0].setUInt32(root);
-    aParms[1].setUInt64(handle);
-    aParms[2].setUInt64(offLock);
-    aParms[3].setUInt64(cbLock);
-    aParms[4].setUInt32(fFlags);
+    HGCMSvcSetU32(&aParms[0], root);
+    HGCMSvcSetU64(&aParms[1], handle);
+    HGCMSvcSetU64(&aParms[2], offLock);
+    HGCMSvcSetU64(&aParms[3], cbLock);
+    HGCMSvcSetU32(&aParms[4], fFlags);
     psvcTable->pfnCall(psvcTable->pvService, &callHandle, 0,
                        psvcTable->pvService, SHFL_FN_LOCK,