Changeset 42889 in vbox for trunk/src/VBox

Timestamp:

Aug 20, 2012 5:44:10 PM (12 years ago)

Author:

vboxsync

Message:

Main/Snapshot: stop abusing the mPeer field, because this triggers various settings related problems when loading settings and the like. A SnapshotMachine is not a SessionMachine, and this they shouldn't be treated the same.

Location:

trunk/src/VBox/Main

Files:

• include/MachineImpl.h (modified) (2 diffs)
• src-server/SnapshotImpl.cpp (modified) (9 diffs)

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

@@ -948 +948 @@
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
-    Machine* const          mPeer;
+    Machine * const         mPeer;
 
     VirtualBox * const      mParent;
@@ -1274 +1274 @@
 
     Guid mSnapshotId;
+    /** This field replaces mPeer for SessionMachine instances, as having
+     * a peer reference is plain meaningless and causes many subtle problems
+     * with saving settings and the like. */
+    Machine * const mMachine;
 
     friend class Snapshot;

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

@@ -915 +915 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR(SnapshotMachine)
+SnapshotMachine::SnapshotMachine()
+    : mMachine(NULL)
+{}
+
+SnapshotMachine::~SnapshotMachine()
+{}
 
 HRESULT SnapshotMachine::FinalConstruct()
@@ -959 +964 @@
 
     mSnapshotId = aSnapshotId;
-
+    ComObjPtr<Machine> pMachine = aSessionMachine->mPeer;
+
+    /* mPeer stays NULL */
     /* memorize the primary Machine instance (i.e. not SessionMachine!) */
-    unconst(mPeer) = aSessionMachine->mPeer;
+    unconst(mMachine) = pMachine;
     /* share the parent pointer */
-    unconst(mParent) = mPeer->mParent;
+    unconst(mParent) = pMachine->mParent;
 
     /* take the pointer to Data to share */
-    mData.share(mPeer->mData);
+    mData.share(pMachine->mData);
 
     /* take the pointer to UserData to share (our UserData must always be the
      * same as Machine's data) */
-    mUserData.share(mPeer->mUserData);
+    mUserData.share(pMachine->mUserData);
     /* make a private copy of all other data (recent changes from SessionMachine) */
     mHWData.attachCopy(aSessionMachine->mHWData);
@@ -1026 +1033 @@
 
     unconst(mBIOSSettings).createObject();
-    mBIOSSettings->initCopy(this, mPeer->mBIOSSettings);
+    mBIOSSettings->initCopy(this, pMachine->mBIOSSettings);
 
     unconst(mVRDEServer).createObject();
-    mVRDEServer->initCopy(this, mPeer->mVRDEServer);
+    mVRDEServer->initCopy(this, pMachine->mVRDEServer);
 
     unconst(mAudioAdapter).createObject();
-    mAudioAdapter->initCopy(this, mPeer->mAudioAdapter);
+    mAudioAdapter->initCopy(this, pMachine->mAudioAdapter);
 
     unconst(mUSBController).createObject();
-    mUSBController->initCopy(this, mPeer->mUSBController);
-
-    mNetworkAdapters.resize(mPeer->mNetworkAdapters.size());
+    mUSBController->initCopy(this, pMachine->mUSBController);
+
+    mNetworkAdapters.resize(pMachine->mNetworkAdapters.size());
     for (ULONG slot = 0; slot < mNetworkAdapters.size(); slot++)
     {
         unconst(mNetworkAdapters[slot]).createObject();
-        mNetworkAdapters[slot]->initCopy(this, mPeer->mNetworkAdapters[slot]);
+        mNetworkAdapters[slot]->initCopy(this, pMachine->mNetworkAdapters[slot]);
     }
 
@@ -1047 +1054 @@
     {
         unconst(mSerialPorts[slot]).createObject();
-        mSerialPorts[slot]->initCopy(this, mPeer->mSerialPorts[slot]);
+        mSerialPorts[slot]->initCopy(this, pMachine->mSerialPorts[slot]);
     }
 
@@ -1053 +1060 @@
     {
         unconst(mParallelPorts[slot]).createObject();
-        mParallelPorts[slot]->initCopy(this, mPeer->mParallelPorts[slot]);
+        mParallelPorts[slot]->initCopy(this, pMachine->mParallelPorts[slot]);
     }
 
     unconst(mBandwidthControl).createObject();
-    mBandwidthControl->initCopy(this, mPeer->mBandwidthControl);
+    mBandwidthControl->initCopy(this, pMachine->mBandwidthControl);
 
     /* Confirm a successful initialization when it's the case */
@@ -1099 +1106 @@
     mSnapshotId = aSnapshotId;
 
-    /* memorize the primary Machine instance */
-    unconst(mPeer) = aMachine;
+    /* mPeer stays NULL */
+    /* memorize the primary Machine instance (i.e. not SessionMachine!) */
+    unconst(mMachine) = aMachine;
     /* share the parent pointer */
-    unconst(mParent) = mPeer->mParent;
+    unconst(mParent) = aMachine->mParent;
 
     /* take the pointer to Data to share */
-    mData.share(mPeer->mData);
+    mData.share(aMachine->mData);
     /*
      *  take the pointer to UserData to share
      *  (our UserData must always be the same as Machine's data)
      */
-    mUserData.share(mPeer->mUserData);
+    mUserData.share(aMachine->mUserData);
     /* allocate private copies of all other data (will be loaded from settings) */
     mHWData.allocate();
@@ -1195 +1203 @@
     mData.free();
 
+    unconst(mMachine) = NULL;
     unconst(mParent) = NULL;
     unconst(mPeer) = NULL;
@@ -1203 +1212 @@
 /**
  *  Overrides VirtualBoxBase::lockHandle() in order to share the lock handle
- *  with the primary Machine instance (mPeer).
+ *  with the primary Machine instance (mMachine) if it exists.
  */
 RWLockHandle *SnapshotMachine::lockHandle() const
 {
-    AssertReturn(mPeer != NULL, NULL);
-    return mPeer->lockHandle();
+    AssertReturn(mMachine != NULL, NULL);
+    return mMachine->lockHandle();
 }
 
@@ -1233 +1242 @@
      * modification of the current state flag, cause this snapshot data isn't
      * related to the current state. */
-    mPeer->setModified(Machine::IsModified_Snapshots, false /* fAllowStateModification */);
-    HRESULT rc = mPeer->saveSettings(&fNeedsGlobalSaveSettings,
-                                     SaveS_Force);        // we know we need saving, no need to check
+    mMachine->setModified(Machine::IsModified_Snapshots, false /* fAllowStateModification */);
+    HRESULT rc = mMachine->saveSettings(&fNeedsGlobalSaveSettings,
+                                        SaveS_Force);        // we know we need saving, no need to check
     mlock.release();