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

Timestamp:

Jul 18, 2016 8:57:06 AM (9 years ago)

Author:

vboxsync

Message:

Main/Machine: Eliminate unneeded taking of the Host object lock in SessionMachine::uninit and additionally release the lock during IPC to be on the safe side (currently there is no problem).

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -12589 +12589 @@
     // we need to lock this object in uninit() because the lock is shared
     // with mPeer (as well as data we modify below). mParent lock is needed
-    // by several calls to it, and USB needs host lock.
-    AutoMultiWriteLock3 multilock(mParent, mParent->i_host(), this COMMA_LOCKVAL_SRC_POS);
+    // by several calls to it.
+    AutoMultiWriteLock2 multilock(mParent, this COMMA_LOCKVAL_SRC_POS);
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
@@ -12645 +12645 @@
         while (it != mData->mSession.mRemoteControls.end())
         {
+            ComPtr<IInternalSessionControl> pControl = *it;
+            mData->mSession.mRemoteControls.erase(it);
             LogFlowThisFunc(("  Calling remoteControl->Uninitialize()...\n"));
-            HRESULT rc = (*it)->Uninitialize();
+            HRESULT rc = pControl->Uninitialize();
             LogFlowThisFunc(("  remoteControl->Uninitialize() returned %08X\n", rc));
             if (FAILED(rc))
                 Log1WarningThisFunc(("Forgot to close the remote session?\n"));
-            ++it;
+            multilock.acquire();
+            it = mData->mSession.mRemoteControls.begin();
         }
         mData->mSession.mRemoteControls.clear();