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

Timestamp:

Jan 18, 2010 6:15:43 PM (15 years ago)

Author:

vboxsync

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

56719

Message:

Main: make restoreSnapshot() work with the lock validator; take saveSettings() out of a lot of functions and instead return a flag to the caller so the caller can make that call; as a side effect, this no longer calls saveSettings multiple times in several code paths (e.g. restoreSnapshot()) and cleans up locking in medium tasks

Location:

trunk/src/VBox/Main/include

Files:

• MachineImpl.h (modified) (3 diffs)
• MediumImpl.h (modified) (9 diffs)
• VirtualBoxImpl.h (modified) (2 diffs)

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

@@ -889 +889 @@
                                 IProgress *aProgress,
                                 ULONG aWeight,
-                                bool aOnline);
-    HRESULT deleteImplicitDiffs();
+                                bool aOnline,
+                                bool *pfNeedsSaveSettings);
+    HRESULT deleteImplicitDiffs(bool *pfNeedsSaveSettings);
 
     MediumAttachment* findAttachment(const MediaData::AttachmentList &ll,
@@ -901 +902 @@
                                      Guid &id);
 
-    void fixupMedia(bool aCommit, bool aOnline = false);
+    void commitMedia(bool aOnline = false);
+    void rollbackMedia();
 
     bool isInOwnDir(Utf8Str *aSettingsDir = NULL);
@@ -1088 +1090 @@
 
     HRESULT endSavingState(BOOL aSuccess);
-    HRESULT endTakingSnapshot(BOOL aSuccess);
 
     typedef std::map<ComObjPtr<Machine>, MachineState_T> AffectedMachines;

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

@@ -78 +78 @@
     HRESULT init(VirtualBox *aVirtualBox,
                  CBSTR aFormat,
-                 CBSTR aLocation);
+                 CBSTR aLocation,
+                 bool *pfNeedsSaveSettings);
     HRESULT init(VirtualBox *aVirtualBox,
                  CBSTR aLocation,
@@ -193 +194 @@
      */
     HRESULT deleteStorageNoWait(ComObjPtr<Progress> &aProgress)
-    { return deleteStorage(&aProgress, false /* aWait */); }
+    { return deleteStorage(&aProgress, false /* aWait */, NULL /* pfNeedsSaveSettings */); }
 
     /**
@@ -199 +200 @@
      * blocking the current thread.
      */
-    HRESULT deleteStorageAndWait(ComObjPtr<Progress> *aProgress = NULL)
-    { return deleteStorage(aProgress, true /* aWait */); }
+    HRESULT deleteStorageAndWait(ComObjPtr<Progress> *aProgress, bool *pfNeedsSaveSettings)
+    { return deleteStorage(aProgress, true /* aWait */, pfNeedsSaveSettings); }
 
     /**
@@ -209 +210 @@
                                     MediumVariant_T aVariant,
                                     ComObjPtr<Progress> &aProgress)
-    { return createDiffStorage(aTarget, aVariant, &aProgress, false /* aWait */); }
+    { return createDiffStorage(aTarget, aVariant, &aProgress, false /* aWait */, NULL /* pfNeedsSaveSettings*/ ); }
 
     /**
@@ -217 +218 @@
     HRESULT createDiffStorageAndWait(ComObjPtr<Medium> &aTarget,
                                      MediumVariant_T aVariant,
-                                     ComObjPtr<Progress> *aProgress = NULL)
-    { return createDiffStorage(aTarget, aVariant, aProgress, true /* aWait */); }
+                                     bool *pfNeedsSaveSettings)
+    { return createDiffStorage(aTarget, aVariant, NULL /*aProgress*/, true /* aWait */, pfNeedsSaveSettings); }
 
     HRESULT prepareMergeTo(Medium *aTarget, MergeChain * &aChain,
@@ -229 +230 @@
     HRESULT mergeToNoWait(MergeChain *aChain,
                           ComObjPtr<Progress> &aProgress)
-    { return mergeTo(aChain, &aProgress, false /* aWait */); }
+    { return mergeTo(aChain, &aProgress, false /* aWait */, NULL /*pfNeedsSaveSettings*/); }
 
     /**
@@ -236 +237 @@
      */
     HRESULT mergeToAndWait(MergeChain *aChain,
-                           ComObjPtr<Progress> *aProgress = NULL)
-    { return mergeTo(aChain, aProgress, true /* aWait */); }
+                           ComObjPtr<Progress> *aProgress,
+                           bool *pfNeedsSaveSettings)
+    { return mergeTo(aChain, aProgress, true /* aWait */, pfNeedsSaveSettings); }
 
     void cancelMergeTo(MergeChain *aChain);
@@ -244 +246 @@
 
     HRESULT prepareDiscard(MergeChain * &aChain);
-    HRESULT discard(ComObjPtr<Progress> &aProgress, ULONG ulWeight, MergeChain *aChain);
+    HRESULT discard(ComObjPtr<Progress> &aProgress, ULONG ulWeight, MergeChain *aChain, bool *pfNeedsSaveSettings);
     void cancelDiscard(MergeChain *aChain);
 
@@ -273 +275 @@
      * this object's AutoMayUninitSpan and from under mVirtualBox write lock.
      */
-    HRESULT unregisterWithVirtualBox();
+    HRESULT unregisterWithVirtualBox(bool *pfNeedsSaveSettings);
 
     HRESULT setStateError();
 
-    HRESULT deleteStorage(ComObjPtr<Progress> *aProgress, bool aWait);
+    HRESULT deleteStorage(ComObjPtr<Progress> *aProgress, bool aWait, bool *pfNeedsSaveSettings);
 
     HRESULT createDiffStorage(ComObjPtr<Medium> &aTarget,
                               MediumVariant_T aVariant,
                               ComObjPtr<Progress> *aProgress,
-                              bool aWait);
+                              bool aWait,
+                              bool *pfNeedsSaveSettings);
 
     HRESULT mergeTo(MergeChain *aChain,
                     ComObjPtr<Progress> *aProgress,
-                    bool aWait);
+                    bool aWait,
+                    bool *pfNeedsSaveSettings);
 
     HRESULT setLocation(const Utf8Str &aLocation, const Utf8Str &aFormat = Utf8Str());

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

@@ -274 +274 @@
     void calculateRelativePath(const Utf8Str &strPath, Utf8Str &aResult);
 
-    HRESULT registerHardDisk(Medium *aHardDisk, bool aSaveRegistry = true);
-    HRESULT unregisterHardDisk(Medium *aHardDisk, bool aSaveRegistry = true);
-
-    HRESULT registerImage(Medium *aImage, DeviceType_T argType, bool aSaveRegistry = true);
-    HRESULT unregisterImage(Medium *aImage, DeviceType_T argType, bool aSaveRegistry = true);
+    HRESULT registerHardDisk(Medium *aHardDisk, bool *pfNeedsSaveSettings);
+    HRESULT unregisterHardDisk(Medium *aHardDisk, bool *pfNeedsSaveSettings);
+
+    HRESULT registerImage(Medium *aImage, DeviceType_T argType, bool *pfNeedsSaveSettings);
+    HRESULT unregisterImage(Medium *aImage, DeviceType_T argType, bool *pfNeedsSaveSettings);
 
     HRESULT saveSettings();
@@ -289 +289 @@
     const Utf8Str& settingsFilePath();
 
-    RWLockHandle& hardDiskTreeLockHandle();
+    RWLockHandle& getMediaTreeLockHandle();
 
     /* for VirtualBoxSupportErrorInfoImpl */