Changeset 83353 in vbox for trunk

Timestamp:

Mar 20, 2020 4:01:35 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9623: UIMediumEnumerator: Make sure each medium being registered (and that way enumerated) and unregistered just once; This allows to filter out repetitive registration messages coming from Main.

Location:

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

Files:

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

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

@@ -314 +314 @@
         if (!medium(uMediumId).isNull())
         {
-            /* This medium can be known because of async event nature. Currently medium registration event
-             * comes very late and other even unrealted events can come before it and request for this
-             * particular medium enumeration, so we just ignore that and enumerate this UIMedium again. */
-            LogRel2(("GUI: UIMediumEnumerator:  Medium {%s} is cached already and will be enumerated..\n",
-                     uMediumId.toString().toUtf8().constData()));
-            createMediumEnumerationTask(m_media.value(uMediumId));
+            /* This medium can be known because of async event nature. Currently medium registration event comes
+             * very late and other even unrelated events can come before it and request for this particular medium
+             * enumeration, so we just ignore repetitive events but enumerate this UIMedium at least once if it
+             * wasn't registered before. */
+            if (!m_registeredMediaIds.contains(uMediumId))
+            {
+                LogRel2(("GUI: UIMediumEnumerator:  Medium {%s} is cached but not registered already, so will be enumerated..\n",
+                         uMediumId.toString().toUtf8().constData()));
+                createMediumEnumerationTask(m_media.value(uMediumId));
+
+                /* Mark medium registered: */
+                m_registeredMediaIds << uMediumId;
+            }
         }
         else
@@ -347 +354 @@
                 /* Enumerate corresponding UIMedium: */
                 createMediumEnumerationTask(m_media.value(uMediumId));
+
+                /* Mark medium registered: */
+                m_registeredMediaIds << uMediumId;
             }
         }
@@ -379 +389 @@
             enumerateAllMediaOfMediumWithId(uMediumId, result);
         }
+
+        /* Mark medium unregistered: */
+        m_registeredMediaIds.remove(uMediumId);
     }
 }

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

@@ -161 +161 @@
     QSet<UITask*>  m_tasks;
 
-    /** Holds a map of current cached (enumerated) media. */
+    /** Holds a map of currently cached (enumerated) media. */
     UIMediumMap  m_media;
+    /** Holds a set of currently registered media IDs. */
+    QSet<QUuid>  m_registeredMediaIds;
 };