Changeset 75863 in vbox for trunk

Timestamp:

Dec 2, 2018 12:43:41 AM (6 years ago)

Author:

vboxsync

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

127067

Message:

Main/Guest: Added a few codereview comments, mainly in the guest base class area. Replaced the object ID management in GuestSession with a classic allocation bitmap approach as that's much less memory intensive than 16 byte structs in a insert-only std::map and an additional map tracking free 32-bit IDs after we run out. bugref:9313 [build fix]

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImpl.h (modified) (1 diff)
• src-client/GuestCtrlImpl.cpp (modified) (3 diffs)
• src-client/GuestCtrlPrivate.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/GuestSessionImpl.h

@@ -257 +257 @@
      *  The key specifies the (global) context ID. */
     typedef std::map <uint32_t, SessionObject> SessionObjects;
-    /** Queue containing context IDs which are no longer in use.
-     *  Useful for quickly retrieving a new, unused context ID. */
-    typedef std::deque <uint32_t>              SessionObjectsFree;
 
 public:

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

@@ -169 +169 @@
          */
         bool fDispatch = true;
+        rc = VERR_INVALID_FUNCTION;
         if (   pCtxCb->uFunction == GUEST_EXEC_STATUS
             && pSvcCb->mParms    >= 5)
@@ -185 +186 @@
                 Assert(dataCb.uPID == 0);
                 fDispatch = false;
-                rc = VINF_SUCCESS;
             }
         }
@@ -220 +220 @@
             }
         }
-        else
-            rc = VERR_INVALID_FUNCTION;
     }
     else

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

@@ -1262 +1262 @@
  *                                  for this event. Optional.
  */
-int GuestBase::waitForEvent(GuestWaitEvent *pEvent, uint32_t msTimeout, VBoxEventType_T *pType, IEvent **ppEvent)
-{
-    AssertPtrReturn(pEvent, VERR_INVALID_POINTER);
+int GuestBase::waitForEvent(GuestWaitEvent *pWaitEvt, uint32_t msTimeout, VBoxEventType_T *pType, IEvent **ppEvent)
+{
+    AssertPtrReturn(pWaitEvt, VERR_INVALID_POINTER);
     /* pType is optional. */
     /* ppEvent is optional. */
 
-    int vrc = pEvent->Wait(msTimeout);
+    int vrc = pWaitEvt->Wait(msTimeout);
     if (RT_SUCCESS(vrc))
     {
-        const ComPtr<IEvent> pThisEvent = pEvent->Event();
+        const ComPtr<IEvent> pThisEvent = pWaitEvt->Event();
         if (pThisEvent.isNotNull()) /* Having a VBoxEventType_ event is optional. */ /** @todo r=bird: misplaced comment? */
         {