Changeset 78723 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 24, 2019 12:26:23 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7127: Do not perform whole medium-enumeration if one medium was not found in the tree, just enumerate it and it's children; This speedups VM details processing but is a dangerous one, needs to be carefully tested.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• medium/UIMediumEnumerator.cpp (modified) (1 diff)
• medium/UIMediumEnumerator.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -2520 +2520 @@
 }
 
+void VBoxGlobal::enumerateAdditionalMedium(const CMedium &comMedium)
+{
+    /* Make sure VBoxGlobal is already valid: */
+    AssertReturnVoid(m_fValid);
+    /* Ignore the request during VBoxGlobal cleanup: */
+    if (s_fCleaningUp)
+        return;
+    /* Ignore the request during startup snapshot restoring: */
+    if (shouldRestoreCurrentSnapshot())
+        return;
+
+    /* Make sure medium-enumerator is already created: */
+    if (!m_pMediumEnumerator)
+        return;
+
+    /* Redirect request to medium-enumerator under proper lock: */
+    if (m_meCleanupProtectionToken.tryLockForRead())
+    {
+        if (m_pMediumEnumerator)
+            m_pMediumEnumerator->enumerateAdditionalMedium(comMedium);
+        m_meCleanupProtectionToken.unlock();
+    }
+}
+
 void VBoxGlobal::refreshMedia()
 {
@@ -3307 +3331 @@
     {
         /* UI medium may be new and not among our media, request enumeration: */
-        startMediumEnumeration();
+        enumerateAdditionalMedium(comMedium);
 
         /* Search for corresponding UI medium again: */

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -478 +478 @@
         /** Starts medium-enumeration. */
         void startMediumEnumeration(const CMediumVector &mediaList = CMediumVector());
+        /** Enumerates additional medium. */
+        void enumerateAdditionalMedium(const CMedium &comMedium);
         /** Calls refresh for each medium which has been already enumerated. */
         void refreshMedia();

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

@@ -231 +231 @@
 }
 
+void UIMediumEnumerator::enumerateAdditionalMedium(const CMedium &comMedium)
+{
+    /* Put the medium to vector for convenience: */
+    CMediumVector inputMedia;
+    inputMedia << comMedium;
+
+    /* Compose new map of passed medium & it's children.
+     * While composing we are using data from already cached media. */
+    UIMediumMap media;
+    addMediaToMap(inputMedia, media);
+
+    /* VBoxGlobal is cleaning up, abort immediately: */
+    if (VBoxGlobal::isCleaningUp())
+        return;
+
+    /* Throw the media to existing map: */
+    foreach (const QUuid &uMediumId, media.keys())
+        m_media[uMediumId] = media.value(uMediumId);
+
+    /* Start enumeration for media with non-NULL ID: */
+    foreach (const QUuid &uMediumID, media.keys())
+        if (!uMediumID.isNull())
+            createMediumEnumerationTask(media[uMediumID]);
+}
+
 void UIMediumEnumerator::refreshMedia()
 {

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

@@ -89 +89 @@
       * @note  Empty passed map means that full/overall medium-enumeration is requested. */
     void startMediumEnumeration(const CMediumVector &comMedia = CMediumVector());
+    /** Makes a request to enumerate additionally specified @a comMedium.
+      * @note  Previous map will be extended with the new one, composed of passed
+      *        medium and it's children, values present in both maps will be merged
+      *        from the previous to new one, keep that all in mind. */
+    void enumerateAdditionalMedium(const CMedium &comMedium);
     /** Refresh all the lightweight UIMedium information for all the cached UIMedium(s).
       * @note  Please note that this is a lightweight version, which doesn't perform