Changeset 24937 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 25, 2009 10:58:13 AM (15 years ago)

Author:

vboxsync

Message:

ConsoleImpl.cpp: Made live snapshots cancellable (missing and it simplifies testing).

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2620 +2620 @@
     rc = pProgress->init(static_cast<IConsole*>(this),
                          Bstr(tr("Taking a snapshot of the virtual machine")),
-                         FALSE /* aCancelable */,
+                         mMachineState == MachineState_Running /* aCancelable */,
                          cOperations,
                          ulTotalOperationsWeight,
@@ -5847 +5847 @@
                     break;
 
-                /* Change the machine state from Starting, Restoring or Paused
-                 * to Running */
                 Assert(   (   (   that->mMachineState == MachineState_Starting
                                || that->mMachineState == MachineState_Paused)
@@ -5854 +5852 @@
                        || (   (   that->mMachineState == MachineState_Restoring
                                || that->mMachineState == MachineState_TeleportingIn
-                               || that->mMachineState == MachineState_Paused)
+                               || that->mMachineState == MachineState_Paused
+                               || that->mMachineState == MachineState_Saving
+                              )
                            && aOldState == VMSTATE_RESUMING));
-
                 that->setMachineState(MachineState_Running);
             }
@@ -7330 +7329 @@
 
 /**
+ * Progress cancelation callback employed by Console::fntTakeSnapshotWorker.
+ */
+static void takesnapshotProgressCancelCallback(void *pvUser)
+{
+    PVM pVM = (PVM)pvUser;
+    SSMR3Cancel(pVM);
+}
+
+/**
  * Worker thread created by Console::TakeSnapshot.
  * @param Thread The current thread (ignored).
@@ -7399 +7407 @@
             pTask->mProgress->SetNextOperation(Bstr(tr("Saving the machine state")),
                                                pTask->ulMemSize);       // operation weight, same as computed when setting up progress object
+            pTask->mProgress->setCancelCallback(takesnapshotProgressCancelCallback, that->mpVM);
 
             alock.leave();
@@ -7414 +7423 @@
                                strSavedStateFile.c_str(), vrc);
 
+            pTask->mProgress->setCancelCallback(NULL, NULL);
+            if (!pTask->mProgress->notifyPointOfNoReturn())
+                throw setError(E_FAIL, tr("Cancelled"));
 
             // STEP 4: reattach hard disks