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

Timestamp:

Aug 3, 2010 1:00:54 PM (15 years ago)

Author:

vboxsync

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

64371

Message:

Main: rework new implementation of Machine::Unregister() and Machine::Delete() to be more flexible and still easy to use

Location:

trunk/src/VBox/Main/include

Files:

• MachineImpl.h (modified) (4 diffs)
• SnapshotImpl.h (modified) (1 diff)

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

@@ -181 +181 @@
         ComObjPtr<Snapshot> mFirstSnapshot;
         ComObjPtr<Snapshot> mCurrentSnapshot;
+
+        // list of files to delete in Delete(); this list is filled by Unregister()
+        std::list<Utf8Str>  llFilesToDelete;
     };
 
@@ -484 +487 @@
     STDMETHOD(SaveSettings)();
     STDMETHOD(DiscardSettings)();
-    STDMETHOD(Unregister) (BOOL fAutoCleanup, ComSafeArrayOut(BSTR, aFiles));
-    STDMETHOD(Delete)();
+    STDMETHOD(Unregister)(CleanupMode_T cleanupMode, ComSafeArrayOut(IMedium*, aMedia));
+    STDMETHOD(Delete)(ComSafeArrayIn(IMedium*, aMedia), IProgress **aProgress);
     STDMETHOD(Export)(IAppliance *aAppliance, IVirtualSystemDescription **aDescription);
     STDMETHOD(GetSnapshot)(IN_BSTR aId, ISnapshot **aSnapshot);
@@ -782 +785 @@
     HRESULT detachAllMedia(AutoWriteLock &writeLock,
                            Snapshot *pSnapshot,
+                           CleanupMode_T cleanupMode,
                            MediaList &llMedia);
 
@@ -792 +796 @@
     void commit();
     void copyFrom(Machine *aThat);
+
+    struct DeleteTask;
+    static DECLCALLBACK(int) deleteThread(RTTHREAD Thread, void *pvUser);
+    HRESULT deleteTaskWorker(DeleteTask &task);
 
 #ifdef VBOX_WITH_GUEST_PROPS

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

@@ -125 +125 @@
 
     HRESULT uninitRecursively(AutoWriteLock &writeLock,
+                              CleanupMode_T cleanupMode,
                               MediaList &llMedia,
                               std::list<Utf8Str> &llFilenames);