Changeset 49659 in vbox for trunk/src

Timestamp:

Nov 26, 2013 2:33:07 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Medium enumeration mechanism: Full snapshot-tree update for every medium related to particular VM on machine registration event.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumEnumerator.cpp (modified) (5 diffs)
• UIMediumEnumerator.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

@@ -28 +28 @@
 #include "COMEnums.h"
 #include "CMachine.h"
+#include "CSnapshot.h"
 #include "CMediumAttachment.h"
 
@@ -184 +185 @@
     CMediumMap currentCMediums;
     QStringList currentCMediumIDs;
-    calculateActualUsage(strMachineID, currentCMediums, currentCMediumIDs);
+    calculateActualUsage(strMachineID, currentCMediums, currentCMediumIDs, true /* take into account current state only */);
     LogRel(("UIMediumEnumerator:  New usage: %s\n",
             currentCMediumIDs.isEmpty() ? "<empty>" : currentCMediumIDs.join(", ").toAscii().constData()));
@@ -222 +223 @@
         CMediumMap currentCMediums;
         QStringList currentCMediumIDs;
-        calculateActualUsage(strMachineID, currentCMediums, currentCMediumIDs);
+        calculateActualUsage(strMachineID, currentCMediums, currentCMediumIDs, false /* take into account current state only */);
         LogRel(("UIMediumEnumerator:  New usage: %s\n",
                 currentCMediumIDs.isEmpty() ? "<empty>" : currentCMediumIDs.join(", ").toAscii().constData()));
@@ -259 +260 @@
     CMediumMap currentCMediums;
     QStringList currentCMediumIDs;
-    calculateActualUsage(strMachineID, currentCMediums, currentCMediumIDs);
+    calculateActualUsage(strMachineID, currentCMediums, currentCMediumIDs, true /* take into account current state only */);
     LogRel(("UIMediumEnumerator:  New usage: %s\n",
             currentCMediumIDs.isEmpty() ? "<empty>" : currentCMediumIDs.join(", ").toAscii().constData()));
@@ -424 +425 @@
  * @param currentCMediums receives CMedium used in actual data.
  * @param currentCMediumIDs receives CMedium IDs used in actual data.
- */
-void UIMediumEnumerator::calculateActualUsage(const QString &strMachineID, CMediumMap &currentCMediums, QStringList &currentCMediumIDs) const
+ * @param fTakeIntoAccountCurrentStateOnly defines whether we should take into accound current VM state only.
+ */
+void UIMediumEnumerator::calculateActualUsage(const QString &strMachineID, CMediumMap &currentCMediums, QStringList &currentCMediumIDs, bool fTakeIntoAccountCurrentStateOnly) const
 {
     /* Search for corresponding machine: */
     CMachine machine = vboxGlobal().virtualBox().FindMachine(strMachineID);
+    AssertReturnVoid(!machine.isNull());
+
+    /* Calculate actual usage starting from root-snapshot if necessary: */
+    if (!fTakeIntoAccountCurrentStateOnly)
+        calculateActualUsage(machine.FindSnapshot(QString()), currentCMediums, currentCMediumIDs);
+    /* Calculate actual usage for current machine state: */
+    calculateActualUsage(machine, currentCMediums, currentCMediumIDs);
+}
+
+/**
+ * Calculates new CMedium <i>usage</i> based on actual data.
+ * @param snapshot is reference we are calculating <i>usage</i> for.
+ * @param currentCMediums receives CMedium used in actual data.
+ * @param currentCMediumIDs receives CMedium IDs used in actual data.
+ */
+void UIMediumEnumerator::calculateActualUsage(const CSnapshot &snapshot, CMediumMap &currentCMediums, QStringList &currentCMediumIDs) const
+{
+    /* Check passed snapshot: */
+    AssertReturnVoid(!snapshot.isNull());
+
+    /* Calculate actual usage for passed snapshot machine: */
+    calculateActualUsage(snapshot.GetMachine(), currentCMediums, currentCMediumIDs);
+
+    /* Iterate through passed snapshot children: */
+    foreach (const CSnapshot &childSnapshot, snapshot.GetChildren())
+        calculateActualUsage(childSnapshot, currentCMediums, currentCMediumIDs);
+}
+
+/**
+ * Calculates new CMedium <i>usage</i> based on actual data.
+ * @param machine is reference we are calculating <i>usage</i> for.
+ * @param currentCMediums receives CMedium used in actual data.
+ * @param currentCMediumIDs receives CMedium IDs used in actual data.
+ */
+void UIMediumEnumerator::calculateActualUsage(const CMachine &machine, CMediumMap &currentCMediums, QStringList &currentCMediumIDs) const
+{
+    /* Check passed machine: */
     AssertReturnVoid(!machine.isNull());
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.h

@@ -86 +86 @@
     /* Helpers: Medium re-caching stuff: */
     void calculateCachedUsage(const QString &strMachineID, QStringList &previousUIMediumIDs, bool fTakeIntoAccountCurrentStateOnly) const;
-    void calculateActualUsage(const QString &strMachineID, CMediumMap &currentCMediums, QStringList &currentCMediumIDs) const;
+    void calculateActualUsage(const QString &strMachineID, CMediumMap &currentCMediums, QStringList &currentCMediumIDs, bool fTakeIntoAccountCurrentStateOnly) const;
+    void calculateActualUsage(const CSnapshot &snapshot, CMediumMap &currentCMediums, QStringList &currentCMediumIDs) const;
+    void calculateActualUsage(const CMachine &machine, CMediumMap &currentCMediums, QStringList &currentCMediumIDs) const;
     void recacheFromCachedUsage(const QStringList &previousUIMediumIDs);
     void recacheFromActualUsage(const CMediumMap &currentCMediums, const QStringList &currentCMediumIDs);