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

Timestamp:

Feb 24, 2011 3:38:25 PM (14 years ago)

Author:

vboxsync

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

70196

Message:

Main: implement sharing saved state files between snapshots and machines in 'saved' state; this dramatically speeds up restoring snapshots as well as taking snapshots of 'saved' machines

Location:

trunk/src/VBox/Main/include

Files:

• MachineImpl.h (modified) (5 diffs)
• SnapshotImpl.h (modified) (2 diffs)

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

@@ -200 +200 @@
     struct SSData
     {
-        Utf8Str mStateFilePath;
+        Utf8Str strStateFilePath;
     };
 
@@ -645 +645 @@
     Utf8Str queryLogFilename(ULONG idx);
 
+    void composeSavedStateFilename(Utf8Str &strStateFilePath);
+
     HRESULT openRemoteSession(IInternalSessionControl *aControl,
                               IN_BSTR aType, IN_BSTR aEnvironment,
@@ -1007 +1009 @@
     struct ConsoleTaskData
     {
-        ConsoleTaskData() : mLastState(MachineState_Null) {}
+        ConsoleTaskData()
+            : mLastState(MachineState_Null)
+        { }
 
         MachineState_T mLastState;
@@ -1016 +1020 @@
 
         // used when saving state (either as part of a snapshot or separate)
-        Utf8Str mStateFilePath;
+        Utf8Str strStateFilePath;
     };
 
@@ -1034 +1038 @@
 
     HRESULT endSavingState(HRESULT aRC, const Utf8Str &aErrMsg);
+    void releaseSavedStateFile(const Utf8Str &strSavedStateFile, Snapshot *pSnapshotToIgnore);
 
     void deleteSnapshotHandler(DeleteSnapshotTask &aTask);

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

@@ -98 +98 @@
     const ComObjPtr<Snapshot> getFirstChild() const;
 
-    const Utf8Str& stateFilePath() const;
-    HRESULT deleteStateFile();
+    const Utf8Str& getStateFilePath() const;
 
     ULONG getChildrenCount();
@@ -119 +118 @@
                                    const Utf8Str &strNewPath);
 
+    bool sharesSavedStateFile(const Utf8Str &strPath,
+                              Snapshot *pSnapshotToIgnore);
+
     HRESULT saveSnapshot(settings::Snapshot &data, bool aAttrsOnly);
     HRESULT saveSnapshotImpl(settings::Snapshot &data, bool aAttrsOnly);