Changeset 98818 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Mar 2, 2023 1:52:48 PM (2 years ago)

Author:

vboxsync

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

156138

Message:

Guest Control: Specify the directory reading parameters (additional attributes + reading flags) when opening the directory calls, not on every directory entry read. Should save a few bytes on every read. bugref:9783

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControl.h (modified) (1 diff)
• VBoxServiceControlSession.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.h

@@ -80 +80 @@
     /** Context ID. */
     uint32_t                        uContextID;
+    /** Flags for reading directory entries. */
+    uint32_t                        fRead;
+    /** Additional attributes enumeration to use for reading directory entries. */
+    GSTCTLFSOBJATTRADD              enmReadAttrAdd;
 } VBOXSERVICECTRLDIR;
 /** Pointer to a guest directory. */

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -1015 +1015 @@
     AssertPtrReturn(pHostCtx, VERR_INVALID_POINTER);
 
-    char            szPath[RTPATH_MAX];
-    uint32_t        fFlags;
-    GSTCTLDIRFILTER enmFilter;
-    uint32_t        uHandle = 0;
-    int rc = VbglR3GuestCtrlDirGetOpen(pHostCtx, szPath, sizeof(szPath), &fFlags, &enmFilter);
+    char               szPath[RTPATH_MAX];
+    uint32_t           fFlags;
+    GSTCTLDIRFILTER    enmFilter;
+    uint32_t           uHandle = 0;
+    uint32_t           fReadFlags;
+    GSTCTLFSOBJATTRADD enmAttrAdd;
+    int rc = VbglR3GuestCtrlDirGetOpen(pHostCtx, szPath, sizeof(szPath), &fFlags, &enmFilter, &enmAttrAdd, &fReadFlags);
     VGSvcVerbose(4, "[Dir %s]: fFlags=%#x, enmFilter=%#x, rc=%Rrc\n", szPath, fFlags, enmFilter, rc);
     if (RT_SUCCESS(rc))
@@ -1031 +1033 @@
             if (!pDir->pszPathAbs)
                 rc = VERR_NO_MEMORY;
+
+            /* Save reading parameters for subsequent directory entry read calls later. */
+            pDir->fRead          = fReadFlags;
+            pDir->enmReadAttrAdd = enmAttrAdd;
 
             if (RT_SUCCESS(rc))
@@ -1138 +1144 @@
     uint32_t           uHandle;
     size_t             cbDirEntry = 0;
-    GSTCTLFSOBJATTRADD enmAttrAdd;
-    uint32_t           fFlags;
     GSTCTLDIRENTRYEX   DirEntryEx;
-    int rc = VbglR3GuestCtrlDirGetRead(pHostCtx, &uHandle, (uint32_t *)&cbDirEntry, (uint32_t *)&enmAttrAdd, &fFlags);
+    int rc = VbglR3GuestCtrlDirGetRead(pHostCtx, &uHandle, (uint32_t *)&cbDirEntry);
     if (RT_SUCCESS(rc))
     {
@@ -1162 +1166 @@
             PRTDIRENTRYEX pDirEntryExRuntime = (PRTDIRENTRYEX)&DirEntryEx;
 
-            rc = RTDirReadEx(pDir->hDir, pDirEntryExRuntime, &cbDirEntry, (RTFSOBJATTRADD)enmAttrAdd, fFlags);
+            rc = RTDirReadEx(pDir->hDir, pDirEntryExRuntime, &cbDirEntry, (RTFSOBJATTRADD)pDir->enmReadAttrAdd, pDir->fRead);
 
             /* Paranoia. */