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

Timestamp:

Apr 3, 2018 5:45:44 PM (7 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Use the session ID for Guest::i_sessionRemove() and avoid searching for it (as the primary key in the session map is the ID anyway).

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -105 +105 @@
 #ifdef VBOX_WITH_GUEST_CONTROL
     int         i_dispatchToSession(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
-    int         i_sessionRemove(GuestSession *pSession);
+    int         i_sessionRemove(uint32_t uSessionID);
     int         i_sessionCreate(const GuestSessionStartupInfo &ssInfo, const GuestCredentials &guestCreds,
                                 ComObjPtr<GuestSession> &pGuestSession);

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

@@ -224 +224 @@
 }
 
-int Guest::i_sessionRemove(GuestSession *pSession)
-{
-    AssertPtrReturn(pSession, VERR_INVALID_POINTER);
-
+int Guest::i_sessionRemove(uint32_t uSessionID)
+{
     LogFlowThisFuncEnter();
 
@@ -234 +232 @@
     int rc = VERR_NOT_FOUND;
 
-    LogFlowThisFunc(("Removing session (ID=%RU32) ...\n", pSession->i_getId()));
-
-    GuestSessions::iterator itSessions = mData.mGuestSessions.begin();
-    while (itSessions != mData.mGuestSessions.end())
-    {
-        if (pSession == itSessions->second)
-        {
-#ifdef DEBUG_andy
-            ULONG cRefs = pSession->AddRef();
-            Assert(cRefs >= 2);
-            LogFlowThisFunc(("pCurSession=%p, cRefs=%RU32\n", pSession, cRefs - 2));
-            pSession->Release();
-#endif
-            /* Make sure to consume the pointer before the one of the
-             * iterator gets released. */
-            ComObjPtr<GuestSession> pCurSession = pSession;
-
-            LogFlowThisFunc(("Removing session (pSession=%p, ID=%RU32) (now total %ld sessions)\n",
-                             pSession, pSession->i_getId(), mData.mGuestSessions.size() - 1));
-
-            rc = pSession->i_onRemove();
-            mData.mGuestSessions.erase(itSessions);
-
-            alock.release(); /* Release lock before firing off event. */
-
-            fireGuestSessionRegisteredEvent(mEventSource, pCurSession,
-                                            false /* Unregistered */);
-            pCurSession.setNull();
-            break;
-        }
-
-        ++itSessions;
-    }
+    LogFlowThisFunc(("Removing session (ID=%RU32) ...\n", uSessionID));
+
+    GuestSessions::const_iterator itSessions = mData.mGuestSessions.find(uSessionID);
+    if (itSessions == mData.mGuestSessions.end())
+        return VERR_NOT_FOUND;
+
+    /* Make sure to consume the pointer before the one of the
+     * iterator gets released. */
+    ComObjPtr<GuestSession> pSession = itSessions->second;
+
+    LogFlowThisFunc(("Removing session %RU32 (now total %ld sessions)\n",
+                     pSession, uSessionID, mData.mGuestSessions.size() ? mData.mGuestSessions.size() - 1 : 0));
+
+    rc = pSession->i_onRemove();
+    mData.mGuestSessions.erase(itSessions);
+
+    alock.release(); /* Release lock before firing off event. */
+
+    fireGuestSessionRegisteredEvent(mEventSource, pSession, false /* Unregistered */);
+    pSession.setNull();
 
     LogFlowFuncLeaveRC(rc);

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

@@ -2534 +2534 @@
 
     /* Remove ourselves from the session list. */
-    int rc2 = mParent->i_sessionRemove(this);
+    AssertPtr(mParent);
+    int rc2 = mParent->i_sessionRemove(mData.mSession.mID);
     if (rc2 == VERR_NOT_FOUND) /* Not finding the session anymore isn't critical. */
         rc2 = VINF_SUCCESS;