Changeset 63584 in vbox for trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

Timestamp:

Aug 18, 2016 11:48:04 AM (9 years ago)

Author:

vboxsync

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

110276

Message:

bugref:8482. The redundant async task implementations was eliminated in the classes MachineImpl, GuestSessionImpl, SnapshotImpl, VirtualBoxImpl.

File:

• trunk/src/VBox/Main/src-server/SnapshotImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

@@ -1300 +1300 @@
  * SessionMachine::RestoreSnapshotTask and SessionMachine::DeleteSnapshotTask.
  */
-struct SessionMachine::SnapshotTask
+class SessionMachine::SnapshotTask
     : public SessionMachine::Task
 {
+public:
     SnapshotTask(SessionMachine *m,
                  Progress *p,
@@ -1315 +1316 @@
 
 /** Take snapshot task */
-struct SessionMachine::TakeSnapshotTask
+class SessionMachine::TakeSnapshotTask
     : public SessionMachine::SnapshotTask
 {
+public:
     TakeSnapshotTask(SessionMachine *m,
                      Progress *p,
@@ -1344 +1346 @@
     }
 
+private:
     void handler()
     {
-        ((SessionMachine *)(Machine *)m_pMachine)->i_takeSnapshotHandler(*this);
+        try
+        {
+            ((SessionMachine *)(Machine *)m_pMachine)->i_takeSnapshotHandler(*this);
+        }
+        catch(...)
+        {
+            LogRel(("Some exception in the function i_takeSnapshotHandler()\n"));
+        }
     }
 
@@ -1357 +1367 @@
     uint32_t m_uMemSize;
     bool m_fTakingSnapshotOnline;
+
+    friend HRESULT SessionMachine::i_finishTakingSnapshot(TakeSnapshotTask &task, AutoWriteLock &alock, bool aSuccess);
+    friend void SessionMachine::i_takeSnapshotHandler(TakeSnapshotTask &task);
+    friend void SessionMachine::i_takeSnapshotProgressCancelCallback(void *pvUser);
 };
 
 /** Restore snapshot task */
-struct SessionMachine::RestoreSnapshotTask
+class SessionMachine::RestoreSnapshotTask
     : public SessionMachine::SnapshotTask
 {
+public:
     RestoreSnapshotTask(SessionMachine *m,
                         Progress *p,
@@ -1370 +1385 @@
     {}
 
+private:
     void handler()
     {
-        ((SessionMachine *)(Machine *)m_pMachine)->i_restoreSnapshotHandler(*this);
+        try
+        {
+            ((SessionMachine *)(Machine *)m_pMachine)->i_restoreSnapshotHandler(*this);
+        }
+        catch(...)
+        {
+            LogRel(("Some exception in the function i_restoreSnapshotHandler()\n"));
+        }
     }
 };
 
 /** Delete snapshot task */
-struct SessionMachine::DeleteSnapshotTask
+class SessionMachine::DeleteSnapshotTask
     : public SessionMachine::SnapshotTask
 {
+public:
     DeleteSnapshotTask(SessionMachine *m,
                        Progress *p,
@@ -1389 +1413 @@
     {}
 
+private:
     void handler()
     {
-        ((SessionMachine *)(Machine *)m_pMachine)->i_deleteSnapshotHandler(*this);
+        try
+        {
+            ((SessionMachine *)(Machine *)m_pMachine)->i_deleteSnapshotHandler(*this);
+        }
+        catch(...)
+        {
+            LogRel(("Some exception in the function i_deleteSnapshotHandler()\n"));
+        }
     }
 
     bool m_fDeleteOnline;
+    friend void SessionMachine::i_deleteSnapshotHandler(DeleteSnapshotTask &task);
 };