Changeset 25930 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jan 20, 2010 12:59:47 PM (15 years ago)

Author:

vboxsync

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

56765

Message:

Main: remove separate snapshots tree lock, have snapshots list use machine lock instead

File:

• trunk/src/VBox/Main/include/MachineImpl.h (modified) (3 diffs)

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

@@ -188 +188 @@
         ComObjPtr<Snapshot> mFirstSnapshot;
         ComObjPtr<Snapshot> mCurrentSnapshot;
-
-        // protectes the snapshots tree of this machine
-        RWLockHandle mSnapshotsTreeLockHandle;
     };
 
@@ -800 +797 @@
     static const wchar_t *getComponentName() { return L"Machine"; }
 
-    /**
-     * Returns the handle of the snapshots tree lock. This lock is
-     * machine-specific because there is one snapshots tree per
-     * IMachine; the lock protects the "first snapshot" member in
-     * IMachine and all the children and parent links in snapshot
-     * objects pointed to therefrom.
-     *
-     * Locking order:
-     * a) object lock of the machine;
-     * b) snapshots tree lock of the machine;
-     * c) individual snapshot object locks in parent->child order,
-     *    if needed; they are _not_ needed for the tree itself
-     *    (as defined above).
-     */
-    RWLockHandle* snapshotsTreeLockHandle() const
-    {
-        return &mData->mSnapshotsTreeLockHandle;
-    }
-
 protected:
 
@@ -932 +910 @@
     // so they cannot be a part of HWData
 
-    const ComObjPtr<VRDPServer> mVRDPServer;
-    const ComObjPtr<SerialPort>
-        mSerialPorts [SchemaDefs::SerialPortCount];
-    const ComObjPtr<ParallelPort>
-        mParallelPorts [SchemaDefs::ParallelPortCount];
-    const ComObjPtr<AudioAdapter> mAudioAdapter;
-    const ComObjPtr<USBController> mUSBController;
-    const ComObjPtr<BIOSSettings> mBIOSSettings;
-    const ComObjPtr<NetworkAdapter>
-        mNetworkAdapters [SchemaDefs::NetworkAdapterCount];
+    const ComObjPtr<VRDPServer>     mVRDPServer;
+    const ComObjPtr<SerialPort>     mSerialPorts[SchemaDefs::SerialPortCount];
+    const ComObjPtr<ParallelPort>   mParallelPorts[SchemaDefs::ParallelPortCount];
+    const ComObjPtr<AudioAdapter>   mAudioAdapter;
+    const ComObjPtr<USBController>  mUSBController;
+    const ComObjPtr<BIOSSettings>   mBIOSSettings;
+    const ComObjPtr<NetworkAdapter> mNetworkAdapters[SchemaDefs::NetworkAdapterCount];
 
     typedef std::list< ComObjPtr<StorageController> > StorageControllerList;