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

Timestamp:

Jan 22, 2008 1:35:10 PM (17 years ago)

Author:

vboxsync

Message:

Main: Better ComPtrBase::equalsTo() specialization for IUnknown (allows to avoid unnecessary QueryInterface calls which is sensitive for IPC).

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• MachineImpl.cpp (modified) (5 diffs)
• include/MachineImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -883 +883 @@
         AssertRC (vrc);
 
-        vrc = SSMR3PutBool (pSSM, folder->writable());
+        vrc = SSMR3PutBool (pSSM, !!folder->writable());
         AssertRC (vrc);
     }

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2959 +2959 @@
     if (SUCCEEDED (rc))
     {
-        /* memorize the direct session control */
+        /* memorize the direct session control and cache IUnknown for it */
         mData->mSession.mDirectControl = aControl;
+        mData->mSession.mDirectControlUnk = aControl;
         mData->mSession.mState = SessionState_SessionOpen;
         /* associate the SessionMachine with this Machine */
@@ -5663 +5664 @@
             folderNode.setValue <Bstr> ("name", folder->name());
             folderNode.setValue <Bstr> ("hostPath", folder->hostPath());
-            folderNode.setValue <bool> ("writable", folder->writable());
+            folderNode.setValue <bool> ("writable", !!folder->writable());
         }
     }
@@ -7305 +7306 @@
 
     if (aReason != Uninit::Normal)
+    {
         mData->mSession.mDirectControl.setNull();
+        mData->mSession.mDirectControlUnk.setNull();
+    }
     else
     {
@@ -7531 +7535 @@
     AutoMultiLock <2> alock (mParent->wlock(), this->wlock());
 
-    if (control.equalsTo (mData->mSession.mDirectControl))
+    if (control.equalsTo (mData->mSession.mDirectControlUnk))
     {
         ComAssertRet (aProgress, E_POINTER);
@@ -7545 +7549 @@
         /* set direct control to NULL to release the remote instance */
         mData->mSession.mDirectControl.setNull();
+        mData->mSession.mDirectControlUnk.setNull();
         LogFlowThisFunc (("Direct control is set to NULL\n"));
 

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

@@ -103 +103 @@
             /** Control of the direct session opened by openSession() */
             ComPtr <IInternalSessionControl> mDirectControl;
+            /** Cached IUnknown of mDirectControl (IPC) for fast comparison */
+            ComPtr <IUnknown> mDirectControlUnk;
 
             typedef std::list <ComPtr <IInternalSessionControl> > RemoteControlList;