Changeset 77093 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 1, 2019 8:53:18 AM (6 years ago)

Author:

vboxsync

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

128549

Message:

Guest Control/Main: Added VERR_GSTCTL_MAX_CID_COUNT_REACHED and use it in registerWaitEvent[Ex]; renamed VERR_GSTCTL_MAX_OBJECTS_REACHED to VERR_GSTCTL_MAX_CID_OBJECTS_REACHED.

Location:

trunk/src/VBox/Main

Files:

• src-all/GlobalStatusConversion.cpp (modified) (1 diff)
• src-client/GuestCtrlPrivate.cpp (modified) (3 diffs)
• src-client/GuestProcessImpl.cpp (modified) (1 diff)
• src-client/GuestSessionImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-all/GlobalStatusConversion.cpp

@@ -110 +110 @@
 
         /* Guest Control errors. */
-        case VERR_GSTCTL_MAX_OBJECTS_REACHED:   return VBOX_E_MAXIMUM_REACHED;
-        case VERR_GSTCTL_GUEST_ERROR:           return VBOX_E_GSTCTL_GUEST_ERROR;
+        case VERR_GSTCTL_MAX_CID_OBJECTS_REACHED: return VBOX_E_MAXIMUM_REACHED;
+        case VERR_GSTCTL_GUEST_ERROR:             return VBOX_E_GSTCTL_GUEST_ERROR;
 
         default:

trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp

@@ -891 +891 @@
  *
  * @returns IPRT status code.
- * @retval  VERR_ALREADY_EXISTS if an event with the given session and object ID
- *          already has been registered.  r=bird: Incorrect, see explanation in
- *          registerWaitEventEx().
- *
+ * @retval  VERR_GSTCTL_MAX_CID_COUNT_REACHED if unable to generate a free context ID (CID, the count part (bits 15:0)).
  * @param   uSessionID              Session ID to register wait event for.
  * @param   uObjectID               Object ID to register wait event for.
@@ -918 +915 @@
  *
  * @returns VBox status code.
- * @retval  VERR_ALREADY_EXISTS if an event with the given session and object ID
- *          already has been registered.  r=bird: No, this isn't when this is
- *          returned, it is returned when generateContextID() generates a
- *          duplicate.  The duplicate being in the count part (bits 15:0) of the
- *          session ID.  So, VERR_DUPLICATE would be more appropraite.
- *
+ * @retval  VERR_GSTCTL_MAX_CID_COUNT_REACHED if unable to generate a free context ID (CID, the count part (bits 15:0)).
  * @param   uSessionID              Session ID to register wait event for.
  * @param   uObjectID               Object ID to register wait event for.
@@ -963 +955 @@
                 rc = generateContextID(uSessionID, uObjectID, &idContext);
                 AssertRCBreak(rc);
-                Log(("Duplicate! Trying a different context ID: %#x\n", idContext));
+                LogFunc(("Found context ID duplicate; trying a different context ID: %#x\n", idContext));
                 if (mWaitEvents.find(idContext) != mWaitEvents.end())
-                    rc = VERR_ALREADY_EXISTS;
+                    rc = VERR_GSTCTL_MAX_CID_COUNT_REACHED;
             } while (RT_FAILURE_NP(rc) && cTries++ < 10);
         }

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -535 +535 @@
             break;
 
-        case VERR_GSTCTL_MAX_OBJECTS_REACHED:
+        case VERR_GSTCTL_MAX_CID_OBJECTS_REACHED:
             strError += Utf8StrFmt(tr("Maximum number of concurrent guest processes has been reached"));
             break;

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -1716 +1716 @@
             break;
 
-        case VERR_GSTCTL_MAX_OBJECTS_REACHED:
+        case VERR_GSTCTL_MAX_CID_OBJECTS_REACHED:
             strError += Utf8StrFmt(tr("Maximum number of concurrent guest processes has been reached"));
             break;
@@ -2070 +2070 @@
         if (iHit < 0)
             iHit = ASMBitFirstClear(&mData.bmObjectIds[0], VBOX_GUESTCTRL_MAX_OBJECTS);
-        AssertLogRelMsgReturn(iHit >= 0, ("object count: %#zu\n", mData.mObjects.size()), VERR_GSTCTL_MAX_OBJECTS_REACHED);
+        AssertLogRelMsgReturn(iHit >= 0, ("object count: %#zu\n", mData.mObjects.size()), VERR_GSTCTL_MAX_CID_OBJECTS_REACHED);
         idObject = iHit;
         AssertLogRelMsgReturn(!ASMBitTestAndSet(&mData.bmObjectIds[0], idObject), ("idObject=%#x\n", idObject), VERR_INTERNAL_ERROR_2);
@@ -2076 +2076 @@
     else
     {
-        LogFunc(("enmType=%RU32 -> VERR_GSTCTL_MAX_OBJECTS_REACHED!! (%zu objects)\n", enmType, mData.mObjects.size()));
-        return VERR_GSTCTL_MAX_OBJECTS_REACHED;
+        LogFunc(("Maximum number of objects reached (enmType=%RU32, %zu objects)\n", enmType, mData.mObjects.size()));
+        return VERR_GSTCTL_MAX_CID_OBJECTS_REACHED;
     }
 
@@ -4098 +4098 @@
             }
         }
-        else if (vrc == VERR_GSTCTL_MAX_OBJECTS_REACHED)
+        else if (vrc == VERR_GSTCTL_MAX_CID_OBJECTS_REACHED)
             hr = setErrorVrc(vrc, tr("Maximum number of concurrent guest processes per session (%u) reached"),
                              VBOX_GUESTCTRL_MAX_OBJECTS);