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

Timestamp:

Mar 12, 2012 4:04:28 PM (13 years ago)

Author:

vboxsync

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

76772

Message:

Main/VirtualBox+Machine+Medium: redesign the medium registry save logic, as the local lists in the threads caused inconsistencies with concurrent operations and the return of spurious errors

Location:

trunk/src/VBox/Main/include

Files:

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

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

@@ -841 +841 @@
     HRESULT saveStateSettings(int aFlags);
 
-    void addMediumToRegistry(ComObjPtr<Medium> &pMedium,
-                             GuidList &llRegistriesThatNeedSaving,
-                             Guid *puuid);
+    void addMediumToRegistry(ComObjPtr<Medium> &pMedium);
 
     HRESULT createImplicitDiffs(IProgress *aProgress,
                                 ULONG aWeight,
-                                bool aOnline,
-                                GuidList *pllRegistriesThatNeedSaving);
-    HRESULT deleteImplicitDiffs(GuidList *pllRegistriesThatNeedSaving);
+                                bool aOnline);
+    HRESULT deleteImplicitDiffs();
 
     MediumAttachment* findAttachment(const MediaData::AttachmentList &ll,
@@ -862 +859 @@
     HRESULT detachDevice(MediumAttachment *pAttach,
                          AutoWriteLock &writeLock,
-                         Snapshot *pSnapshot,
-                         GuidList *pllRegistriesThatNeedSaving);
+                         Snapshot *pSnapshot);
 
     HRESULT detachAllMedia(AutoWriteLock &writeLock,
@@ -937 +933 @@
     typedef std::list<ComObjPtr<StorageController> > StorageControllerList;
     Backupable<StorageControllerList> mStorageControllers;
+
+    uint64_t                        uRegistryNeedsSaving;
 
     friend class SessionMachine;

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -70 +70 @@
                  const Utf8Str &aFormat,
                  const Utf8Str &aLocation,
-                 const Guid &uuidMachineRegistry,
-                 GuidList *pllRegistriesThatNeedSaving);
+                 const Guid &uuidMachineRegistry);
 
     // initializer for opening existing media
@@ -183 +182 @@
     bool isInRegistry(const Guid& id);
     bool getFirstRegistryMachineId(Guid &uuid) const;
-    HRESULT addToRegistryIDList(GuidList &llRegistryIDs);
 
     HRESULT addBackReference(const Guid &aMachineId,
@@ -218 +216 @@
                               MediumLockList *pMediumLockList,
                               ComObjPtr<Progress> *aProgress,
-                              bool aWait,
-                              GuidList *pllRegistriesThatNeedSaving);
+                              bool aWait);
     Utf8Str getPreferredDiffFormat();
 
-    HRESULT close(GuidList *pllRegistriesThatNeedSaving, AutoCaller &autoCaller);
-    HRESULT deleteStorage(ComObjPtr<Progress> *aProgress, bool aWait, GuidList *pllRegistriesThatNeedSaving);
+    HRESULT close(AutoCaller &autoCaller);
+    HRESULT deleteStorage(ComObjPtr<Progress> *aProgress, bool aWait);
     HRESULT markForDeletion();
     HRESULT unmarkForDeletion();
@@ -243 +240 @@
                     MediumLockList *aMediumLockList,
                     ComObjPtr<Progress> *aProgress,
-                    bool aWait,
-                    GuidList *pllRegistriesThatNeedSaving);
+                    bool aWait);
     void cancelMergeTo(const MediaList &aChildrenToReparent,
                        MediumLockList *aMediumLockList);
@@ -273 +269 @@
 
     HRESULT canClose();
-    HRESULT unregisterWithVirtualBox(GuidList *pllRegistriesThatNeedSaving);
+    HRESULT unregisterWithVirtualBox();
+    void markRegistriesModified();
 
     HRESULT setStateError();
@@ -333 +330 @@
 
     HRESULT startThread(Medium::Task *pTask);
-    HRESULT runNow(Medium::Task *pTask, GuidList *pllRegistriesThatNeedSaving);
+    HRESULT runNow(Medium::Task *pTask);
 
     HRESULT taskCreateBaseHandler(Medium::CreateBaseTask &task);

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

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -53 +53 @@
 class Host;
 typedef std::list< ComObjPtr<Medium> > MediaList;
-typedef std::list<Guid> GuidList;
 
 ////////////////////////////////////////////////////////////////////////////////

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

@@ -260 +260 @@
     void copyPathRelativeToConfig(const Utf8Str &strSource, Utf8Str &strTarget);
 
-    HRESULT registerMedium(const ComObjPtr<Medium> &pMedium, ComObjPtr<Medium> *ppMedium, DeviceType_T argType, GuidList *pllRegistriesThatNeedSaving);
-    HRESULT unregisterMedium(Medium *pMedium, GuidList *pllRegistriesThatNeedSaving);
+    HRESULT registerMedium(const ComObjPtr<Medium> &pMedium, ComObjPtr<Medium> *ppMedium, DeviceType_T argType);
+    HRESULT unregisterMedium(Medium *pMedium);
 
     void pushMediumToListWithChildren(MediaList &llMedia, Medium *pMedium);
@@ -276 +276 @@
     HRESULT saveSettings();
 
-    static void addGuidToListUniquely(GuidList &llRegistriesThatNeedSaving, const Guid &uuid);
-    HRESULT saveRegistries(const GuidList &llRegistriesThatNeedSaving);
+    void markRegistryModified(const Guid &uuid);
+    void saveModifiedRegistries();
 
     static HRESULT ensureFilePathExists(const Utf8Str &strFileName, bool fCreate);