Changeset 21826 in vbox

Timestamp:

Jul 27, 2009 8:00:42 PM (16 years ago)

Author:

vboxsync

Message:

Main: fix wrong snapshot counts introduced by r50442 (erroneous error message when discarding snapshots)

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (3 diffs)
• SnapshotImpl.cpp (modified) (3 diffs)
• include/SnapshotImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -1730 +1730 @@
     *aSnapshotCount = !mData->mFirstSnapshot
                           ? 0
-                          : mData->mFirstSnapshot->getGrandChildrenCount() + 1;
+                          : mData->mFirstSnapshot->getAllChildrenCount() + 1;
 
     return S_OK;
@@ -4331 +4331 @@
         size_t snapshotCount = 0;
         if (mData->mFirstSnapshot)
-            snapshotCount = mData->mFirstSnapshot->getGrandChildrenCount() + 1;
+            snapshotCount = mData->mFirstSnapshot->getAllChildrenCount() + 1;
         if (snapshotCount)
             return setError (VBOX_E_INVALID_OBJECT_STATE,
@@ -9214 +9214 @@
     AutoWriteLock snapshotLock(snapshot);
 
-    size_t childrenCount = snapshot->getGrandChildrenCount();
+    size_t childrenCount = snapshot->getChildrenCount();
     if (childrenCount > 1)
         return setError(VBOX_E_INVALID_OBJECT_STATE,

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -406 +406 @@
 }
 
-ULONG Snapshot::getGrandChildrenCount()
+ULONG Snapshot::getChildrenCount()
 {
     AutoCaller autoCaller(this);
@@ -414 +414 @@
     AutoReadLock alock(this);
 
+    return (ULONG)m->llChildren.size();
+}
+
+ULONG Snapshot::getAllChildrenCountImpl()
+{
+    AutoCaller autoCaller(this);
+    AssertComRC(autoCaller.rc());
+
+    AutoReadLock alock(this);
     ULONG count = (ULONG)m->llChildren.size();
     for (SnapshotsList::const_iterator it = m->llChildren.begin();
@@ -419 +428 @@
          ++it)
     {
-        count += (*it)->getGrandChildrenCount();
+        count += (*it)->getAllChildrenCountImpl();
     }
 
     return count;
+}
+
+ULONG Snapshot::getAllChildrenCount()
+{
+    AutoCaller autoCaller(this);
+    AssertComRC(autoCaller.rc());
+
+    AutoReadLock chLock(m->pMachine->snapshotsTreeLockHandle());
+    return getAllChildrenCountImpl();
 }
 

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

@@ -100 +100 @@
     }
 
-    ULONG getGrandChildrenCount();
+    ULONG getChildrenCount();
+    ULONG getAllChildrenCount();
+    ULONG getAllChildrenCountImpl();
 
     ComPtr<SnapshotMachine> getSnapshotMachine();