Changeset 84732 in vbox

Timestamp:

Jun 9, 2020 7:15:54 AM (4 years ago)

Author:

vboxsync

Message:

Guest Control/VbglR3: Made initial session startup information a bit more lightweight by using the default values as initial size instead of maximum ones. bugref:9320

Location:

trunk

Files:

• include/VBox/GuestHost/GuestControl.h (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (5 diffs)

trunk/include/VBox/GuestHost/GuestControl.h

@@ -142 +142 @@
 #define GUESTPROCESS_DEFAULT_CMD_LEN        _1K
 #define GUESTPROCESS_DEFAULT_ARGS_LEN       _1K
-#define GUESTPROCESS_DEFAULT_ENV_LEN        _64K
+#define GUESTPROCESS_DEFAULT_ENV_LEN        _1K
+#define GUESTPROCESS_DEFAULT_USER_LEN       128
+#define GUESTPROCESS_DEFAULT_PASSWORD_LEN   128
+#define GUESTPROCESS_DEFAULT_DOMAIN_LEN     256
 /** @} */
 
@@ -151 +154 @@
 #define GUESTPROCESS_MAX_ARGS_LEN           _2M
 #define GUESTPROCESS_MAX_ENV_LEN            _4M
-/** Deprecated; only used for < VBox 4.3 hosts. */
-#define GUESTPROCESS_MAX_USER_LEN           128
-/** Deprecated; only used for < VBox 4.3 hosts. */
-#define GUESTPROCESS_MAX_PASSWORD_LEN       128
-/** Deprecated; only used for < VBox 4.3 hosts. */
-#define GUESTPROCESS_MAX_DOMAIN_LEN         256
+#define GUESTPROCESS_MAX_USER_LEN           _64K
+#define GUESTPROCESS_MAX_PASSWORD_LEN       _64K
+#define GUESTPROCESS_MAX_DOMAIN_LEN         _64K
 /** @} */
 

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

@@ -768 +768 @@
 {
     return VbglR3GuestCtrlSessionStartupInfoInitEx(pStartupInfo,
-                                                   GUESTPROCESS_MAX_USER_LEN, GUESTPROCESS_MAX_PASSWORD_LEN,
-                                                   GUESTPROCESS_MAX_DOMAIN_LEN);
+                                                   GUESTPROCESS_DEFAULT_USER_LEN, GUESTPROCESS_DEFAULT_PASSWORD_LEN,
+                                                   GUESTPROCESS_DEFAULT_DOMAIN_LEN);
 }
 
@@ -1118 +1118 @@
 {
     return VbglR3GuestCtrlProcStartupInfoInitEx(pStartupInfo,
-                                                GUESTPROCESS_MAX_CMD_LEN,
-                                                GUESTPROCESS_MAX_USER_LEN,  GUESTPROCESS_MAX_PASSWORD_LEN,
-                                                GUESTPROCESS_MAX_DOMAIN_LEN,
-                                                GUESTPROCESS_MAX_ARGS_LEN, GUESTPROCESS_MAX_ENV_LEN);
+                                                GUESTPROCESS_DEFAULT_CMD_LEN,
+                                                GUESTPROCESS_DEFAULT_USER_LEN     /* Deprecated, now handled via session creation. */,
+                                                GUESTPROCESS_DEFAULT_PASSWORD_LEN /* Ditto. */,
+                                                GUESTPROCESS_DEFAULT_DOMAIN_LEN   /* Ditto. */,
+                                                GUESTPROCESS_DEFAULT_ARGS_LEN, GUESTPROCESS_DEFAULT_ENV_LEN);
 }
 
@@ -1245 +1246 @@
     }
 
-    unsigned cRetries = 0;
-    unsigned cGrowthFactor = 2;
+    unsigned       cRetries      = 0;
+    const unsigned cMaxRetries   = 32; /* Should be enough for now. */
+    const unsigned cGrowthFactor = 2;  /* By how much the buffers will grow if they're too small yet. */
 
     do
@@ -1278 +1280 @@
         {
             if (   rc == VERR_BUFFER_OVERFLOW
-                && cRetries++ < 4)
+                && cRetries++ < cMaxRetries)
             {
 #define GROW_STR(a_Str, a_cbMax) \
@@ -1291 +1293 @@
 
 #undef GROW_STR
-                cGrowthFactor *= cGrowthFactor;
             }
             else