Changeset 75992 in vbox

Timestamp:

Dec 5, 2018 8:15:41 PM (6 years ago)

Author:

vboxsync

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

127213

Message:

GuestProperty: Limit the number of pending waits per session and look for cancelled ones.

Location:

trunk

Files:

• include/VBox/HostServices/GuestPropertySvc.h (modified) (1 diff)
• src/VBox/HostServices/GuestProperties/service.cpp (modified) (3 diffs)

trunk/include/VBox/HostServices/GuestPropertySvc.h

@@ -35 +35 @@
 
 
-/** Maximum length for property names */
+/** Maximum length for property names. */
 #define GUEST_PROP_MAX_NAME_LEN             64
-/** Maximum length for property values */
+/** Maximum length for property values. */
 #define GUEST_PROP_MAX_VALUE_LEN            128
-/** Maximum number of properties per guest */
+/** Maximum number of properties per guest. */
 #define GUEST_PROP_MAX_PROPS                256
-/** Maximum size for enumeration patterns */
+/** Maximum size for enumeration patterns. */
 #define GUEST_PROP_MAX_PATTERN_LEN          1024
-/** Maximum number of changes we remember for guest notifications */
+/** Maximum number of changes we remember for guest notifications. */
 #define GUEST_PROP_MAX_GUEST_NOTIFICATIONS  256
+/** Maximum number of current pending waits per client. */
+#define GUEST_PROP_MAX_GUEST_CONCURRENT_WAITS 16
 
 

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

@@ -1190 +1190 @@
                             it = mGuestWaiters.erase(it);
                         }
-                        //else if (mpHelpers->pfnIsCallCancelled(it->mHandle))
-                        //{
-                        //    /* Cleanup cancelled request. */
-                        //    mpHelpers->pfnCallComplete(it->mHandle, VERR_INTERRUPTED);
-                        //    it = mGuestWaiters.erase(it);
-                        //}
+                        else if (mpHelpers->pfnIsCallCancelled(it->mHandle))
+                        {
+                            /* Cleanup cancelled request. */
+                            mpHelpers->pfnCallComplete(it->mHandle, VERR_INTERRUPTED);
+                            it = mGuestWaiters.erase(it);
+                        }
                         else
                         {
@@ -1207 +1207 @@
                 }
 
-                //if (cPendingWaits < 16)
+                if (cPendingWaits < GUEST_PROP_MAX_GUEST_CONCURRENT_WAITS)
                 {
                     try
@@ -1220 +1220 @@
                     }
                 }
-                //else
-                //{
-                //    LogFunc(("Too many pending waits already!\n"));
-                //    rc = VERR_OUT_OF_RESOURCES;
-                //}
+                else
+                {
+                    LogFunc(("Too many pending waits already!\n"));
+                    rc = VERR_OUT_OF_RESOURCES;
+                }
             }
             /*