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

Timestamp:

Aug 22, 2014 5:27:48 PM (11 years ago)

Author:

vboxsync

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

95701

Message:

6813 - MachineImpl.cpp - IInternalMachineControl changes.

File:

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

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

@@ -1394 +1394 @@
  * @return
  */
-STDMETHODIMP SessionMachine::BeginTakingSnapshot(IConsole *aInitiator,
-                                                 IN_BSTR aName,
-                                                 IN_BSTR aDescription,
-                                                 IProgress *aConsoleProgress,
-                                                 BOOL fTakingSnapshotOnline,
-                                                 BSTR *aStateFilePath)
+HRESULT SessionMachine::beginTakingSnapshot(const ComPtr<IConsole> &aInitiator,
+                                            const com::Utf8Str &aName,
+                                            const com::Utf8Str &aDescription,
+                                            const ComPtr<IProgress> &aConsoleProgress,
+                                            BOOL  aFTakingSnapshotOnline,
+                                            com::Utf8Str &aStateFilePath)
 {
     LogFlowThisFuncEnter();
 
-    AssertReturn(aInitiator && aName, E_INVALIDARG);
-    AssertReturn(aStateFilePath, E_POINTER);
-
-    LogFlowThisFunc(("aName='%ls' fTakingSnapshotOnline=%RTbool\n", aName, fTakingSnapshotOnline));
-
-    AutoCaller autoCaller(this);
-    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
+    LogFlowThisFunc(("aName='%s' aFTakingSnapshotOnline=%RTbool\n", aName.c_str(), aFTakingSnapshotOnline));
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1428 +1422 @@
     }
 
-    if (    !fTakingSnapshotOnline
+    if (    !aFTakingSnapshotOnline
          && mData->mMachineState != MachineState_Saved
        )
@@ -1444 +1438 @@
     snapshotId.create();
 
-    Utf8Str strStateFilePath;
     /* stateFilePath is null when the machine is not online nor saved */
-    if (fTakingSnapshotOnline)
+    if (aFTakingSnapshotOnline)
     {
         Bstr value;
@@ -1452 +1445 @@
                                   value.asOutParam());
         if (FAILED(rc) || value != "1")
-        {
             // creating a new online snapshot: we need a fresh saved state file
-            i_composeSavedStateFilename(strStateFilePath);
-        }
+            i_composeSavedStateFilename(aStateFilePath);
     }
     else if (mData->mMachineState == MachineState_Saved)
         // taking an online snapshot from machine in "saved" state: then use existing state file
-        strStateFilePath = mSSData->strStateFilePath;
-
-    if (strStateFilePath.isNotEmpty())
+        aStateFilePath = mSSData->strStateFilePath;
+
+    if (aStateFilePath.isNotEmpty())
     {
         // ensure the directory for the saved state file exists
-        HRESULT rc = VirtualBox::i_ensureFilePathExists(strStateFilePath, true /* fCreate */);
+        HRESULT rc = VirtualBox::i_ensureFilePathExists(aStateFilePath, true /* fCreate */);
         if (FAILED(rc)) return rc;
     }
@@ -1471 +1462 @@
     ComObjPtr<SnapshotMachine> snapshotMachine;
     snapshotMachine.createObject();
-    HRESULT rc = snapshotMachine->init(this, snapshotId.ref(), strStateFilePath);
+    HRESULT rc = snapshotMachine->init(this, snapshotId.ref(), aStateFilePath);
     AssertComRCReturn(rc, rc);
 
@@ -1490 +1481 @@
     mConsoleTaskData.mLastState = mData->mMachineState;
     mConsoleTaskData.mSnapshot = pSnapshot;
+
     /// @todo in the long run the progress object should be moved to
     // VBoxSVC to avoid trouble with monitoring the progress object state
@@ -1498 +1490 @@
     {
         LogFlowThisFunc(("Creating differencing hard disks (online=%d)...\n",
-                         fTakingSnapshotOnline));
+                         aFTakingSnapshotOnline));
 
         // backup the media data so we can recover if things goes wrong along the day;
@@ -1515 +1507 @@
         rc = i_createImplicitDiffs(aConsoleProgress,
                                    1,            // operation weight; must be the same as in Console::TakeSnapshot()
-                                   !!fTakingSnapshotOnline);
+                                   !!aFTakingSnapshotOnline);
         if (FAILED(rc))
             throw rc;
@@ -1543 +1535 @@
     }
 
-    if (fTakingSnapshotOnline && SUCCEEDED(rc))
-        strStateFilePath.cloneTo(aStateFilePath);
-    else
-        *aStateFilePath = NULL;
+    if (!(aFTakingSnapshotOnline && SUCCEEDED(rc)))
+        aStateFilePath = "";
 
     LogFlowThisFunc(("LEAVE - %Rhrc [%s]\n", rc, Global::stringifyMachineState(mData->mMachineState) ));
@@ -1566 +1556 @@
  * @return
  */
-STDMETHODIMP SessionMachine::EndTakingSnapshot(BOOL aSuccess)
+HRESULT SessionMachine::endTakingSnapshot(BOOL aSuccess)
 {
     LogFlowThisFunc(("\n"));
-
-    AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
 
     AutoWriteLock machineLock(this COMMA_LOCKVAL_SRC_POS);
@@ -1693 +1680 @@
  * @return
  */
-STDMETHODIMP SessionMachine::RestoreSnapshot(IConsole *aInitiator,
-                                             ISnapshot *aSnapshot,
-                                             MachineState_T *aMachineState,
-                                             IProgress **aProgress)
+HRESULT SessionMachine::restoreSnapshot(const ComPtr<IConsole> &aInitiator,
+                                        const ComPtr<ISnapshot> &aSnapshot,
+                                        MachineState_T *aMachineState,
+                                        ComPtr<IProgress> &aProgress)
 {
     LogFlowThisFuncEnter();
-
-    AssertReturn(aInitiator, E_INVALIDARG);
-    AssertReturn(aSnapshot && aMachineState && aProgress, E_POINTER);
-
-    AutoCaller autoCaller(this);
-    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1712 +1693 @@
                  E_FAIL);
 
-    ComObjPtr<Snapshot> pSnapshot(static_cast<Snapshot*>(aSnapshot));
+    ISnapshot* iSnapshot = aSnapshot;
+    ComObjPtr<Snapshot>pSnapshot(static_cast<Snapshot*>(iSnapshot));
     ComObjPtr<SnapshotMachine> pSnapMachine = pSnapshot->i_getSnapshotMachine();
 
@@ -1769 +1751 @@
 
     /* return the progress to the caller */
-    pProgress.queryInterfaceTo(aProgress);
+    pProgress.queryInterfaceTo(aProgress.asOutParam());
 
     /* return the new state to the caller */
@@ -2055 +2037 @@
 
 /**
- * Implementation for IInternalMachineControl::DeleteSnapshot().
+ * Implementation for IInternalMachineControl::deleteSnapshot().
  *
  * Gets called from Console::DeleteSnapshot(), and that's basically the
@@ -2070 +2052 @@
  * @note Locks mParent + this + children objects for writing!
  */
-STDMETHODIMP SessionMachine::DeleteSnapshot(IConsole *aInitiator,
-                                            IN_BSTR aStartId,
-                                            IN_BSTR aEndId,
-                                            BOOL fDeleteAllChildren,
-                                            MachineState_T *aMachineState,
-                                            IProgress **aProgress)
+HRESULT SessionMachine::deleteSnapshot(const ComPtr<IConsole> &aInitiator,
+                                       const com::Guid &aStartId,
+                                       const com::Guid &aEndId,
+                                       BOOL aDeleteAllChildren,
+                                       MachineState_T *aMachineState,
+                                       ComPtr<IProgress> &aProgress)
 {
     LogFlowThisFuncEnter();
 
-    Guid startId(aStartId);
-    Guid endId(aEndId);
-
-    AssertReturn(aInitiator && !startId.isZero() && !endId.isZero() && startId.isValid() && endId.isValid(), E_INVALIDARG);
+    AssertReturn(aInitiator && !aStartId.isZero() && !aEndId.isZero() && aStartId.isValid() && aEndId.isValid(), E_INVALIDARG);
 
     AssertReturn(aMachineState && aProgress, E_POINTER);
 
     /** @todo implement the "and all children" and "range" variants */
-    if (fDeleteAllChildren || startId != endId)
+    if (aDeleteAllChildren || aStartId != aEndId)
         ReturnComNotImplemented();
-
-    AutoCaller autoCaller(this);
-    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -2108 +2084 @@
 
     ComObjPtr<Snapshot> pSnapshot;
-    HRESULT rc = i_findSnapshotById(startId, pSnapshot, true /* aSetError */);
+    HRESULT rc = i_findSnapshotById(aStartId, pSnapshot, true /* aSetError */);
     if (FAILED(rc)) return rc;
 
@@ -2226 +2202 @@
 
     /* return the progress to the caller */
-    pProgress.queryInterfaceTo(aProgress);
+    pProgress.queryInterfaceTo(aProgress.asOutParam());
 
     /* return the new state to the caller */
@@ -3428 +3404 @@
 
 /**
- * Implementation for IInternalMachineControl::FinishOnlineMergeMedium().
+ * Implementation for IInternalMachineControl::finishOnlineMergeMedium().
  *
  * Gets called after the successful completion of an online merge from
@@ -3437 +3413 @@
  * can continue with the updated state of the medium chain.
  */
-STDMETHODIMP SessionMachine::FinishOnlineMergeMedium()
+HRESULT SessionMachine::finishOnlineMergeMedium()
 {
     HRESULT rc = S_OK;