Changeset 104967 in vbox

Timestamp:

Jun 19, 2024 6:43:01 PM (3 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: Reworking singleton stuff a bit for Extra-data Manager; It's necessary for more predictable place of extra-data manager init; Lazy-init is evil.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (4 diffs)
• extradata/UIExtraDataManager.h (modified) (3 diffs)
• globals/UICommon.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2010-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -54 +54 @@
 /* GUI includes: */
 #include "UICommon.h"
-#include "UIActionPool.h"
 #include "UIConverter.h"
 #include "UIDesktopWidgetWatchdog.h"
@@ -2018 +2017 @@
 
 /* static */
-UIExtraDataManager* UIExtraDataManager::instance()
-{
-    /* Create/prepare instance if not yet exists: */
-    if (!s_pInstance)
-    {
-        new UIExtraDataManager;
-        s_pInstance->prepare();
-    }
-    /* Return instance: */
-    return s_pInstance;
+void UIExtraDataManager::create()
+{
+    AssertReturnVoid(!s_pInstance);
+    new UIExtraDataManager;
+    s_pInstance->prepare();
 }
 
@@ -2033 +2027 @@
 void UIExtraDataManager::destroy()
 {
-    /* Destroy/cleanup instance if still exists: */
-    if (s_pInstance)
-    {
-        s_pInstance->cleanup();
-        delete s_pInstance;
-    }
+    AssertPtrReturnVoid(s_pInstance);
+    s_pInstance->cleanup();
+    delete s_pInstance;
+}
+
+/* static */
+UIExtraDataManager *UIExtraDataManager::instance()
+{
+    /* This is the fallback behavior, we need the lazy-init here
+     * only to make sure gEDataManager is never NULL. */
+    AssertPtr(s_pInstance);
+    if (!s_pInstance)
+        create();
+    return s_pInstance;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2010-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -63 +63 @@
     Q_OBJECT;
 
-    /** Extra-data Manager constructor. */
+    /** Constructs Extra-data Manager. */
     UIExtraDataManager();
-    /** Extra-data Manager destructor. */
-    ~UIExtraDataManager();
+    /** Destructs Extra-data Manager. */
+    virtual ~UIExtraDataManager();
 
 signals:
@@ -147 +147 @@
     static const QUuid GlobalID;
 
+    /** Singleton object contructor. */
+    static void create();
+    /** Singleton object destructor. */
+    static void destroy();
     /** Static Extra-data Manager instance/constructor. */
     static UIExtraDataManager* instance();
-    /** Static Extra-data Manager destructor. */
-    static void destroy();
 
 #ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI

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

@@ -251 +251 @@
     connect(gpGlobalSession, &UIGlobalSession::sigVBoxSVCAvailabilityChange,
             this, &UICommon::sltHandleVBoxSVCAvailabilityChange);
+
+    /* Create extra-data manager right after COM init: */
+    UIExtraDataManager::create();
 
     /* Prepare thread-pool instances: */