Changeset 98817 in vbox

Timestamp:

Mar 2, 2023 1:16:17 PM (21 months ago)

Author:

vboxsync

Message:

Guest Control: Use two separate caches for UID / GID lookups, to avoid temporary string allocations. bugref:9783

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (3 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceControl.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (4 diffs)

trunk/include/VBox/VBoxGuestLib.h

@@ -1152 +1152 @@
 VBGLR3DECL(int) VbglR3GuestCtrlDirCbOpen(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, uint32_t uFileHandle);
 VBGLR3DECL(int) VbglR3GuestCtrlDirCbClose(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc);
-VBGLR3DECL(int) VbglR3GuestCtrlDirCbReadEx(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, PGSTCTLDIRENTRYEX pEntry, uint32_t cbSize, char *pszUser, char *pszGroups);
+VBGLR3DECL(int) VbglR3GuestCtrlDirCbReadEx(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, PGSTCTLDIRENTRYEX pEntry, uint32_t cbSize, const char *pszUser, const char *pszGroups);
 VBGLR3DECL(int) VbglR3GuestCtrlDirCbRead(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, PGSTCTLDIRENTRYEX pEntry, uint32_t cbSize);
 VBGLR3DECL(int) VbglR3GuestCtrlDirCbRewind(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc);
@@ -1174 +1174 @@
  * @{
  */
-VBGLR3DECL(int) VbglR3GuestCtrlFsCbQueryInfoEx(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, PGSTCTLFSOBJINFO pObjInfo, char *pszUser, char *pszGroups);
+VBGLR3DECL(int) VbglR3GuestCtrlFsCbQueryInfoEx(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, PGSTCTLFSOBJINFO pObjInfo, const char *pszUser, const char *pszGroups);
 VBGLR3DECL(int) VbglR3GuestCtrlFsCbQueryInfo(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, PGSTCTLFSOBJINFO pObjInfo);
 VBGLR3DECL(int) VbglR3GuestCtrlFsCbCreateTemp(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, const char *pszPath);

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp

@@ -2283 +2283 @@
  */
 VBGLR3DECL(int) VbglR3GuestCtrlDirCbReadEx(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, PGSTCTLDIRENTRYEX pEntry, uint32_t cbSize,
-                                           char *pszUser, char *pszGroups)
+                                           const char *pszUser, const char *pszGroups)
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
@@ -2601 +2601 @@
  */
 VBGLR3DECL(int) VbglR3GuestCtrlFsCbQueryInfoEx(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, PGSTCTLFSOBJINFO pFsObjInfo,
-                                               char *pszUser, char *pszGroups)
+                                               const char *pszUser, const char *pszGroups)
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
@@ -2632 +2632 @@
 VBGLR3DECL(int) VbglR3GuestCtrlFsCbQueryInfo(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, PGSTCTLFSOBJINFO pFsObjInfo)
 {
-    char szIgnored[1];
+    char szIgnored[1] = { 0 };
     return VbglR3GuestCtrlFsCbQueryInfoEx(pCtx, uRc, pFsObjInfo, szIgnored /* pszUser */, szIgnored /* pszGroups */);
 }

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

@@ -221 +221 @@
     /** How many processes do we allow keeping around at a time? */
     uint32_t                        uProcsMaxKept;
-    /** The uid/gid cache for this session. */
-    VGSVCIDCACHE                    IdCache;
+    /** The uid cache for this session. */
+    VGSVCIDCACHE                    UidCache;
+    /** The gid cache for this session. */
+    VGSVCIDCACHE                    GidCache;
 } VBOXSERVICECTRLSESSION;
 /** Pointer to guest session. */

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

@@ -1170 +1170 @@
                          pDir->pszPathAbs, RT_SUCCESS(rc) ? DirEntryEx.szName : "<None>", rc);
 
-            char *pszUser = RT_SUCCESS(rc)
-                          ? RTStrDup(VGSvcIdCacheGetUidName(&pSession->IdCache,
-                                                            DirEntryEx.Info.Attr.u.Unix.uid, DirEntryEx.szName, pDir->pszPathAbs))
-                          : NULL;
-
-            char *pszGroup = RT_SUCCESS(rc)
-                           ? RTStrDup(VGSvcIdCacheGetGidName(&pSession->IdCache,
-                                                             DirEntryEx.Info.Attr.u.Unix.gid, DirEntryEx.szName, pDir->pszPathAbs))
-                           : NULL;
+            const char *pszUser  = VGSvcIdCacheGetUidName(&pSession->UidCache, DirEntryEx.Info.Attr.u.Unix.uid, DirEntryEx.szName,
+                                                          pDir->pszPathAbs);
+            const char *pszGroup = VGSvcIdCacheGetGidName(&pSession->GidCache, DirEntryEx.Info.Attr.u.Unix.gid, DirEntryEx.szName,
+                                                          pDir->pszPathAbs);
 
             VGSvcVerbose(2, "[Dir %s] Entry '%s': %zu bytes, uid=%s (%d), gid=%s (%d)\n",
@@ -1185 +1180 @@
                          pszGroup ? pszGroup : "", DirEntryEx.Info.Attr.u.UnixGroup.gid);
 
-            char szIgnored[] = "???";
             int rc2 = VbglR3GuestCtrlDirCbReadEx(pHostCtx, rc,
                                                  &DirEntryEx, (uint32_t)(sizeof(GSTCTLDIRENTRYEX) + cbDirEntry),
-                                                 pszUser ? pszUser : szIgnored, pszGroup ? pszGroup : szIgnored);
-            RTStrFree(pszUser);
-            RTStrFree(pszGroup);
-
+                                                 pszUser, pszGroup);
             if (RT_FAILURE(rc2))
                 VGSvcError("Failed to report directory read status (%Rrc), rc=%Rrc\n", rc, rc2);
@@ -1859 +1850 @@
         PGSTCTLFSOBJINFO pObjInfo = (PGSTCTLFSOBJINFO)&objInfoRuntime;
 
-        char *pszUser = RTStrDup(  RT_SUCCESS(rc)
-                                 ? VGSvcIdCacheGetUidName(&pSession->IdCache, pObjInfo->Attr.u.Unix.uid, szPath, NULL /* pszRelativeTo */)
-                                 : "<error>");
-        AssertStmt(pszUser != NULL, rc = VERR_NO_MEMORY);
-
-        char *pszGroup = RTStrDup(  RT_SUCCESS(rc)
-                                  ? VGSvcIdCacheGetGidName(&pSession->IdCache, pObjInfo->Attr.u.Unix.gid, szPath, NULL /* pszRelativeTo */)
-                                  : "<error>");
-        AssertStmt(pszGroup != NULL, rc = VERR_NO_MEMORY);
+        const char *pszUser  = VGSvcIdCacheGetUidName(&pSession->UidCache, pObjInfo->Attr.u.Unix.uid, szPath, NULL /* pszRelativeTo */);
+        const char *pszGroup = VGSvcIdCacheGetGidName(&pSession->GidCache, pObjInfo->Attr.u.Unix.gid, szPath, NULL /* pszRelativeTo */);
 
         int rc2 = VbglR3GuestCtrlFsCbQueryInfoEx(pHostCtx, rc, pObjInfo, pszUser, pszGroup);
-        RTStrFree(pszUser);
-        RTStrFree(pszGroup);
-
         if (RT_FAILURE(rc2))
         {
@@ -2765 +2746 @@
     pSession->fFlags = fFlags;
 
-    RT_ZERO(pSession->IdCache);
+    RT_ZERO(pSession->UidCache);
+    RT_ZERO(pSession->GidCache);
 
     /* Init critical section for protecting the thread lists. */