Changeset 80926 in vbox for trunk

Timestamp:

Sep 20, 2019 1:24:33 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8472: Merge startMediumEnumeration & enumerateAdditionalMedia into one consolidated mechanism which can enumerate all media at once or selected media only.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (4 diffs)
• globals/UICommon.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• medium/UIMediumEnumerator.cpp (modified) (3 diffs)
• medium/UIMediumEnumerator.h (modified) (1 diff)
• medium/UIMediumManager.cpp (modified) (2 diffs)
• medium/UIMediumSelector.cpp (modified) (2 diffs)
• runtime/UIMachine.cpp (modified) (1 diff)
• runtime/information/UIVMInformationDialog.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (1 diff)
• widgets/UIMediaComboBox.cpp (modified) (1 diff)

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

@@ -2537 +2537 @@
 }
 
-void UICommon::startMediumEnumeration(const CMediumVector &comMedia /* = CMediumVector() */)
+void UICommon::enumerateMedia(const CMediumVector &comMedia /* = CMediumVector() */)
 {
     /* Make sure UICommon is already valid: */
@@ -2551 +2551 @@
     if (!m_pMediumEnumerator)
         return;
-    /* Make sure enumeration is not already started: */
-    if (m_pMediumEnumerator->isMediumEnumerationInProgress())
-        return;
 
     /* Redirect request to medium-enumerator under proper lock: */
@@ -2559 +2556 @@
     {
         if (m_pMediumEnumerator)
-            m_pMediumEnumerator->startMediumEnumeration(comMedia);
-        m_meCleanupProtectionToken.unlock();
-    }
-}
-
-void UICommon::enumerateAdditionalMedia(const CMediumVector &comMedia)
-{
-    /* Make sure UICommon is already valid: */
-    AssertReturnVoid(m_fValid);
-    /* Ignore the request during UICommon 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->enumerateAdditionalMedia(comMedia);
+            m_pMediumEnumerator->enumerateMedia(comMedia);
         m_meCleanupProtectionToken.unlock();
     }
@@ -3348 +3321 @@
     {
         /* UI medium may be new and not among our media, request enumeration: */
-        enumerateAdditionalMedia(CMediumVector() << comMedium);
+        enumerateMedia(CMediumVector() << comMedium);
 
         /* Search for corresponding UI medium again: */

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

@@ -482 +482 @@
     /** @name COM: Virtual Media stuff.
      * @{ */
-        /** Starts medium-enumeration. */
-        void startMediumEnumeration(const CMediumVector &comMedia = CMediumVector());
-        /** Enumerates additional media. */
-        void enumerateAdditionalMedia(const CMediumVector &comMedia);
+        /** Enumerates passed @a comMedia. */
+        void enumerateMedia(const CMediumVector &comMedia = CMediumVector());
         /** Calls refresh for each medium which has been already enumerated. */
         void refreshMedia();

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -1272 +1272 @@
     /* Cache medium data early if necessary: */
     if (uiCommon().agressiveCaching())
-        uiCommon().startMediumEnumeration();
+        uiCommon().enumerateMedia();
 
     /* Prepare: */

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

@@ -158 +158 @@
 }
 
-void UIMediumEnumerator::startMediumEnumeration(const CMediumVector &comMedia /* = CMediumVector() */)
-{
-    /* Make sure we are not already in progress: */
-    AssertReturnVoid(!m_fMediumEnumerationInProgress);
-
+void UIMediumEnumerator::enumerateMedia(const CMediumVector &comMedia /* = CMediumVector() */)
+{
     /* Compose new map of currently cached media & their children.
      * While composing we are using data from already cached media. */
     UIMediumMap guiMedia;
     addNullMediumToMap(guiMedia);
-    /* If @p comMedia is empty we start the medium-enumeration with all
-     * known hard disk media. Otherwise only passed comMedia will be
-     * enumerated. But be aware we will enumerate all the optical media
-     * in any case to make them listed within the first run wizard for
-     * now. But I think later we can add proper enumeration call to the
-     * wizard instead and enumerate only comMedia in 'else' case. */
     if (comMedia.isEmpty())
     {
-        m_fFullMediumEnumerationRequested = true;
+        /* Compose new map of all known media & their children: */
         addMediaToMap(uiCommon().virtualBox().GetHardDisks(), guiMedia);
         addMediaToMap(uiCommon().host().GetDVDDrives(), guiMedia);
@@ -184 +175 @@
     else
     {
-        m_fFullMediumEnumerationRequested = false;
+        /* Compose new map of passed media & their children: */
         addMediaToMap(comMedia, guiMedia);
     }
@@ -192 +183 @@
         return;
 
-    /* Replace existing media map: */
-    m_media = guiMedia;
-
-    /* If enumeration hasn't yet started: */
-    if (!m_fMediumEnumerationInProgress)
-    {
-        /* Notify listener about enumeration started: */
-        LogRel(("GUI: UIMediumEnumerator: Medium-enumeration started...\n"));
-        m_fMediumEnumerationInProgress = true;
-        emit sigMediumEnumerationStarted();
-
-        /* Make sure we really have more than one UIMedium (which is NULL): */
-        if (   guiMedia.size() == 1
-            && guiMedia.first().id() == UIMedium::nullID())
-        {
-            /* Notify listener about enumeration finished instantly: */
-            LogRel(("GUI: UIMediumEnumerator: Medium-enumeration finished!\n"));
-            m_fMediumEnumerationInProgress = false;
-            emit sigMediumEnumerationFinished();
-        }
-    }
-
-    /* Start enumeration for media with non-NULL ID: */
-    foreach (const QUuid &uMediumID, guiMedia.keys())
-        if (!uMediumID.isNull())
-            createMediumEnumerationTask(guiMedia[uMediumID]);
-}
-
-void UIMediumEnumerator::enumerateAdditionalMedia(const CMediumVector &comMedia)
-{
-    /* Compose new map of passed medium & it's children.
-     * While composing we are using data from already cached media. */
-    UIMediumMap guiMedia;
-    addMediaToMap(comMedia, guiMedia);
-
-    /* UICommon is cleaning up, abort immediately: */
-    if (UICommon::isCleaningUp())
-        return;
-
-    /* Throw the media to existing map: */
-    foreach (const QUuid &uMediumId, guiMedia.keys())
-        m_media[uMediumId] = guiMedia.value(uMediumId);
+    if (comMedia.isEmpty())
+    {
+        /* Replace existing media map since
+         * we have full medium enumeration: */
+        m_fFullMediumEnumerationRequested = true;
+        m_media = guiMedia;
+    }
+    else
+    {
+        /* Throw the media to existing map: */
+        foreach (const QUuid &uMediumId, guiMedia.keys())
+            m_media[uMediumId] = guiMedia.value(uMediumId);
+    }
 
     /* If enumeration hasn't yet started: */

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

@@ -81 +81 @@
     bool isMediumEnumerationInProgress() const { return m_fMediumEnumerationInProgress; }
     /** Makes a request to enumerate specified @a comMedia.
-      * @note  Previous map will be replaced with the new one, values present in both
-      *        maps will be merged from the previous to new one, keep that all in mind.
-      * @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 comMedia.
-      * @note  Previous map will be extended with the new one, composed of passed
-      *        media and their children, values present in both maps will be merged
-      *        from the previous to new one, keep that all in mind. */
-    void enumerateAdditionalMedia(const CMediumVector &comMedia);
+      * @note  Empty passed map means that full/overall medium-enumeration is requested.
+      *        In that case previous map will be replaced with the new one, values
+      *        present in both maps will be merged from the previous to new one.
+      * @note  Non-empty passed map means that additional medium-enumeration is requested.
+      *        In that case previous map will be extended with the new one, values
+      *        present in both maps will be merged from the previous to new one. */
+    void enumerateMedia(const CMediumVector &comMedia = CMediumVector());
     /** 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

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

@@ -580 +580 @@
 {
     /* Start medium-enumeration: */
-    uiCommon().startMediumEnumeration();
+    uiCommon().enumerateMedia();
 }
 
@@ -696 +696 @@
     /* Start medium-enumeration (if necessary): */
     if (!uiCommon().isFullMediumEnumerationRequested())
-        uiCommon().startMediumEnumeration();
+        uiCommon().enumerateMedia();
     /* Emulate medium-enumeration otherwise: */
     else

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

@@ -82 +82 @@
     /* Start medium-enumeration (if necessary): */
     if (!uiCommon().isFullMediumEnumerationRequested())
-        uiCommon().startMediumEnumeration();
+        uiCommon().enumerateMedia();
     configure();
     finalize();
@@ -497 +497 @@
 {
     /* Initialize media enumation: */
-    uiCommon().startMediumEnumeration();
+    uiCommon().enumerateMedia();
     /* Update the search: */
     m_pSearchWidget->search(m_pTreeWidget);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -210 +210 @@
     {
         AssertReturn(m_pSession, false);
-        uiCommon().startMediumEnumeration(m_pSession->machineMedia());
+        uiCommon().enumerateMedia(m_pSession->machineMedia());
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -170 +170 @@
     /* This is needed at least for some VM to show correct storage info. */
     if (!uiCommon().isFullMediumEnumerationRequested())
-        uiCommon().startMediumEnumeration();
+        uiCommon().enumerateMedia();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -3710 +3710 @@
     /* Start medium-enumeration (only if necessary): */
     if (!uiCommon().isFullMediumEnumerationRequested())
-        uiCommon().startMediumEnumeration();
+        uiCommon().enumerateMedia();
 
     /* Layout created in the .ui file. */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediaComboBox.cpp

@@ -66 +66 @@
         comMedia << uiCommon().host().GetDVDDrives();
         comMedia << uiCommon().virtualBox().GetDVDImages();
-        uiCommon().enumerateAdditionalMedia(comMedia);
+        uiCommon().enumerateMedia(comMedia);
     }
     refresh();