Changeset 98999 in vbox

Timestamp:

Mar 16, 2023 10:40:45 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156349

Message:

FE/Qt: bugref:10396: X11: Adding Desktop Watchdog policy controlled by corresponding environment variable allowing to partially/fully disable synthetic test for available geometry calculation.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackend.h (modified) (2 diffs)
• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• globals/UIDefs.cpp (modified) (1 diff)
• globals/UIDefs.h (modified) (2 diffs)
• globals/UIDesktopWidgetWatchdog.cpp (modified) (6 diffs)
• globals/UIDesktopWidgetWatchdog.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -92 +92 @@
 template<> SHARED_LIBRARY_STUFF bool canConvert<SizeSuffix>();
 template<> SHARED_LIBRARY_STUFF bool canConvert<StorageSlot>();
+template<> SHARED_LIBRARY_STUFF bool canConvert<DesktopWatchdogPolicy_SynthTest>();
 template<> SHARED_LIBRARY_STUFF bool canConvert<UIExtraDataMetaDefs::DialogType>();
 template<> SHARED_LIBRARY_STUFF bool canConvert<UIExtraDataMetaDefs::MenuType>();
@@ -183 +184 @@
 template<> SHARED_LIBRARY_STUFF QString toString(const StorageSlot &storageSlot);
 template<> SHARED_LIBRARY_STUFF StorageSlot fromString<StorageSlot>(const QString &strStorageSlot);
+template<> SHARED_LIBRARY_STUFF DesktopWatchdogPolicy_SynthTest fromInternalString<DesktopWatchdogPolicy_SynthTest>(const QString &strPolicyType);
 template<> SHARED_LIBRARY_STUFF QString toInternalString(const UIExtraDataMetaDefs::DialogType &enmDialogType);
 template<> SHARED_LIBRARY_STUFF UIExtraDataMetaDefs::DialogType fromInternalString<UIExtraDataMetaDefs::DialogType>(const QString &strDialogType);

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -47 +47 @@
 template<> bool canConvert<SizeSuffix>() { return true; }
 template<> bool canConvert<StorageSlot>() { return true; }
+template<> bool canConvert<DesktopWatchdogPolicy_SynthTest>() { return true; }
 template<> bool canConvert<UIExtraDataMetaDefs::DialogType>() { return true; }
 template<> bool canConvert<UIExtraDataMetaDefs::MenuType>() { return true; }
@@ -453 +454 @@
 }
 
+/* DesktopWatchdogPolicy_SynthTest <= QString: */
+template<> DesktopWatchdogPolicy_SynthTest fromInternalString<DesktopWatchdogPolicy_SynthTest>(const QString &strPolicyType)
+{
+    if (strPolicyType.compare("Disabled", Qt::CaseInsensitive) == 0)
+        return DesktopWatchdogPolicy_SynthTest_Disabled;
+    if (strPolicyType.compare("ManagerOnly", Qt::CaseInsensitive) == 0)
+        return DesktopWatchdogPolicy_SynthTest_ManagerOnly;
+    if (strPolicyType.compare("MachineOnly", Qt::CaseInsensitive) == 0)
+        return DesktopWatchdogPolicy_SynthTest_MachineOnly;
+    if (strPolicyType.compare("Both", Qt::CaseInsensitive) == 0)
+        return DesktopWatchdogPolicy_SynthTest_Both;
+    return DesktopWatchdogPolicy_SynthTest_Both;
+}
+
 /* QString <= UIExtraDataMetaDefs::DialogType: */
 template<> QString toInternalString(const UIExtraDataMetaDefs::DialogType &enmDialogType)

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

@@ -38 +38 @@
 QStringList UIDefs::VBoxExtPackFileExts = QStringList() << "vbox-extpack";
 QStringList UIDefs::OVFFileExts = QStringList() << "ovf" << "ova";
+
+/** Environment variable names: */
+const char *UIDefs::VBox_DesktopWatchdogPolicy_SynthTest = "VBOX_DESKTOPWATCHDOGPOLICY_SYNTHTEST";

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

@@ -94 +94 @@
     /** Allowed OVF file extensions. */
     SHARED_LIBRARY_STUFF extern QStringList OVFFileExts;
+
+    /** Holds environment variable name for Desktop Watchdog / Synthetic Test policy type. */
+    SHARED_LIBRARY_STUFF extern const char *VBox_DesktopWatchdogPolicy_SynthTest;
 }
 using namespace UIDefs /* if header included */;
@@ -154 +157 @@
 
 
+/** Desktop Watchdog / Synthetic Test policy type. */
+enum DesktopWatchdogPolicy_SynthTest
+{
+    DesktopWatchdogPolicy_SynthTest_Disabled,
+    DesktopWatchdogPolicy_SynthTest_ManagerOnly,
+    DesktopWatchdogPolicy_SynthTest_MachineOnly,
+    DesktopWatchdogPolicy_SynthTest_Both
+};
+Q_DECLARE_METATYPE(DesktopWatchdogPolicy_SynthTest);
+
+
 #endif /* !FEQT_INCLUDED_SRC_globals_UIDefs_h */

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

@@ -51 +51 @@
 # include "UICommon.h"
 # include "VBoxUtils-x11.h"
+# ifndef VBOX_GUI_WITH_CUSTOMIZATIONS1
+#  include "UIConverter.h" 
+# endif
 #endif
 
@@ -284 +287 @@
 
 UIDesktopWidgetWatchdog::UIDesktopWidgetWatchdog()
+#if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
+    : m_enmSynthTestPolicy(DesktopWatchdogPolicy_SynthTest_Both)
+#endif
 {
     /* Initialize instance: */
@@ -996 +1002 @@
 
 #if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
+    /* Load Synthetic Test policy: */
+    const QString strSynthTestPolicy = qEnvironmentVariable(VBox_DesktopWatchdogPolicy_SynthTest);
+    m_enmSynthTestPolicy = gpConverter->fromInternalString<DesktopWatchdogPolicy_SynthTest>(strSynthTestPolicy);
+
     /* Update host-screen configuration: */
     updateHostScreenConfiguration();
@@ -1051 +1061 @@
 
 #if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
+bool UIDesktopWidgetWatchdog::isSynchTestRestricted() const
+{
+    return    m_enmSynthTestPolicy == DesktopWatchdogPolicy_SynthTest_Disabled
+           || (   m_enmSynthTestPolicy == DesktopWatchdogPolicy_SynthTest_ManagerOnly
+               && uiCommon().uiType() == UICommon::UIType_RuntimeUI)
+           || (   m_enmSynthTestPolicy == DesktopWatchdogPolicy_SynthTest_MachineOnly
+               && uiCommon().uiType() == UICommon::UIType_SelectorUI);
+}
+
 void UIDesktopWidgetWatchdog::updateHostScreenConfiguration(int cHostScreenCount /* = -1 */)
 {
+    /* Check the policy: */
+    if (isSynchTestRestricted())
+        return;
+
     /* Acquire new host-screen count: */
     if (cHostScreenCount == -1)
@@ -1071 +1094 @@
 void UIDesktopWidgetWatchdog::updateHostScreenAvailableGeometry(int iHostScreenIndex)
 {
+    /* Check the policy: */
+    if (isSynchTestRestricted())
+        return;
+
     /* Make sure index is valid: */
     if (iHostScreenIndex < 0 || iHostScreenIndex >= screenCount())
@@ -1103 +1130 @@
 void UIDesktopWidgetWatchdog::cleanupExistingWorkers()
 {
+    /* Check the policy: */
+    if (isSynchTestRestricted())
+        return;
+
     /* Destroy existing workers: */
     qDeleteAll(m_availableGeometryWorkers);

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

@@ -42 +42 @@
 /* GUI includes: */
 #include "UILibraryDefs.h"
+#if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
+# include "UIDefs.h"
+#endif
 
 /* Forward declarations: */
@@ -194 +197 @@
 
 #if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
+    /** Returns whether Synthetic Test is restricted according to cached policy. */
+    bool isSynchTestRestricted() const;
+
     /** Updates host-screen configuration according to new @a cHostScreenCount.
       * @note If cHostScreenCount is equal to -1 we have to acquire it ourselves. */
@@ -203 +209 @@
     /** Cleanups existing workers. */
     void cleanupExistingWorkers();
+
+    /** Holds the cached Synthetic Test policy. */
+    DesktopWatchdogPolicy_SynthTest  m_enmSynthTestPolicy;
 
     /** Holds current host-screen available-geometries. */