Changeset 86086 in vbox for trunk/src/VBox

Timestamp:

Sep 10, 2020 2:31:20 PM (5 years ago)

Author:

vboxsync

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

140315

Message:

FE/Qt: bugref:9827: Merge UIBaseMemorySlider to UIBaseMemoryEditor, it's not used separately.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/settings/editors/UIBaseMemoryEditor.cpp (modified) (2 diffs)
• src/settings/editors/UIBaseMemorySlider.cpp (deleted)
• src/settings/editors/UIBaseMemorySlider.h (deleted)
• src/wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -838 +838 @@
         src/settings/editors/UIAudioHostDriverEditor.h \
         src/settings/editors/UIBaseMemoryEditor.h \
-        src/settings/editors/UIBaseMemorySlider.h \
         src/settings/editors/UIBootOrderEditor.h \
         src/settings/editors/UIGraphicsControllerEditor.h \
@@ -989 +988 @@
         src/medium/viso/UIVisoHostBrowser.cpp \
         src/medium/viso/UIVisoBrowserBase.cpp \
+        src/settings/editors/UIBaseMemoryEditor.cpp \
         src/settings/editors/UIBootOrderEditor.cpp \
         src/settings/editors/UIHotKeyEditor.cpp \
@@ -1351 +1351 @@
         src/settings/editors/UIAudioHostDriverEditor.cpp \
         src/settings/editors/UIBaseMemoryEditor.cpp \
-        src/settings/editors/UIBaseMemorySlider.cpp \
         src/settings/editors/UIBootOrderEditor.cpp \
         src/settings/editors/UIGraphicsControllerEditor.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBaseMemoryEditor.cpp

@@ -24 +24 @@
 
 /* GUI includes: */
+#include "QIAdvancedSlider.h"
 #include "UIBaseMemoryEditor.h"
-#include "UIBaseMemorySlider.h"
-
+#include "UICommon.h"
+
+/* COM includes: */
+#include "CSystemProperties.h"
+
+
+/** QIAdvancedSlider subclass used as a base memory slider. */
+class SHARED_LIBRARY_STUFF UIBaseMemorySlider : public QIAdvancedSlider
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs guest RAM slider passing @a pParent to the base-class. */
+    UIBaseMemorySlider(QWidget *pParent = 0);
+    /** Constructs guest RAM slider passing @a pParent and @a enmOrientation to the base-class. */
+    UIBaseMemorySlider(Qt::Orientation enmOrientation, QWidget *pParent = 0);
+
+    /** Returns the minimum RAM. */
+    uint minRAM() const;
+    /** Returns the maximum optimal RAM. */
+    uint maxRAMOpt() const;
+    /** Returns the maximum allowed RAM. */
+    uint maxRAMAlw() const;
+    /** Returns the maximum possible RAM. */
+    uint maxRAM() const;
+
+private:
+
+    /** Prepares all. */
+    void prepare();
+
+    /** Calculates page step for passed @a iMaximum value. */
+    int calcPageStep(int iMaximum) const;
+
+    /** Holds the minimum RAM. */
+    uint m_uMinRAM;
+    /** Holds the maximum optimal RAM. */
+    uint m_uMaxRAMOpt;
+    /** Holds the maximum allowed RAM. */
+    uint m_uMaxRAMAlw;
+    /** Holds the maximum possible RAM. */
+    uint m_uMaxRAM;
+};
+
+
+/*********************************************************************************************************************************
+*   Class UIBaseMemorySlider implementation.                                                                                     *
+*********************************************************************************************************************************/
+
+UIBaseMemorySlider::UIBaseMemorySlider(QWidget *pParent /* = 0 */)
+  : QIAdvancedSlider(pParent)
+  , m_uMinRAM(0)
+  , m_uMaxRAMOpt(0)
+  , m_uMaxRAMAlw(0)
+  , m_uMaxRAM(0)
+{
+    /* Prepare: */
+    prepare();
+}
+
+UIBaseMemorySlider::UIBaseMemorySlider(Qt::Orientation enmOrientation, QWidget *pParent /* = 0 */)
+  : QIAdvancedSlider(enmOrientation, pParent)
+  , m_uMinRAM(0)
+  , m_uMaxRAMOpt(0)
+  , m_uMaxRAMAlw(0)
+  , m_uMaxRAM(0)
+{
+    /* Prepare: */
+    prepare();
+}
+
+uint UIBaseMemorySlider::minRAM() const
+{
+    return m_uMinRAM;
+}
+
+uint UIBaseMemorySlider::maxRAMOpt() const
+{
+    return m_uMaxRAMOpt;
+}
+
+uint UIBaseMemorySlider::maxRAMAlw() const
+{
+    return m_uMaxRAMAlw;
+}
+
+uint UIBaseMemorySlider::maxRAM() const
+{
+    return m_uMaxRAM;
+}
+
+void UIBaseMemorySlider::prepare()
+{
+    ulong uFullSize = uiCommon().host().GetMemorySize();
+    CSystemProperties sys = uiCommon().virtualBox().GetSystemProperties();
+    m_uMinRAM = sys.GetMinGuestRAM();
+    m_uMaxRAM = RT_MIN(RT_ALIGN(uFullSize, _1G / _1M), sys.GetMaxGuestRAM());
+
+    /* Come up with some nice round percent boundaries relative to
+     * the system memory. A max of 75% on a 256GB config is ridiculous,
+     * even on an 8GB rig reserving 2GB for the OS is way to conservative.
+     * The max numbers can be estimated using the following program:
+     *
+     *      double calcMaxPct(uint64_t cbRam)
+     *      {
+     *          double cbRamOverhead = cbRam * 0.0390625; // 160 bytes per page.
+     *          double cbRamForTheOS = RT_MAX(RT_MIN(_512M, cbRam * 0.25), _64M);
+     *          double OSPct  = (cbRamOverhead + cbRamForTheOS) * 100.0 / cbRam;
+     *          double MaxPct = 100 - OSPct;
+     *          return MaxPct;
+     *      }
+     *
+     *      int main()
+     *      {
+     *          uint64_t cbRam = _1G;
+     *          for (; !(cbRam >> 33); cbRam += _1G)
+     *              printf("%8lluGB %.1f%% %8lluKB\n", cbRam >> 30, calcMaxPct(cbRam),
+     *                     (uint64_t)(cbRam * calcMaxPct(cbRam) / 100.0) >> 20);
+     *          for (; !(cbRam >> 51); cbRam <<= 1)
+     *              printf("%8lluGB %.1f%% %8lluKB\n", cbRam >> 30, calcMaxPct(cbRam),
+     *                     (uint64_t)(cbRam * calcMaxPct(cbRam) / 100.0) >> 20);
+     *          return 0;
+     *      }
+     *
+     * Note. We might wanna put these calculations somewhere global later. */
+
+    /* System RAM amount test: */
+    m_uMaxRAMAlw = (uint)(0.75 * uFullSize);
+    m_uMaxRAMOpt = (uint)(0.50 * uFullSize);
+    if (uFullSize < 3072)
+        /* done */;
+    else if (uFullSize < 4096)   /* 3GB */
+        m_uMaxRAMAlw = (uint)(0.80 * uFullSize);
+    else if (uFullSize < 6144)   /* 4-5GB */
+    {
+        m_uMaxRAMAlw = (uint)(0.84 * uFullSize);
+        m_uMaxRAMOpt = (uint)(0.60 * uFullSize);
+    }
+    else if (uFullSize < 8192)   /* 6-7GB */
+    {
+        m_uMaxRAMAlw = (uint)(0.88 * uFullSize);
+        m_uMaxRAMOpt = (uint)(0.65 * uFullSize);
+    }
+    else if (uFullSize < 16384)  /* 8-15GB */
+    {
+        m_uMaxRAMAlw = (uint)(0.90 * uFullSize);
+        m_uMaxRAMOpt = (uint)(0.70 * uFullSize);
+    }
+    else if (uFullSize < 32768)  /* 16-31GB */
+    {
+        m_uMaxRAMAlw = (uint)(0.93 * uFullSize);
+        m_uMaxRAMOpt = (uint)(0.75 * uFullSize);
+    }
+    else if (uFullSize < 65536)  /* 32-63GB */
+    {
+        m_uMaxRAMAlw = (uint)(0.94 * uFullSize);
+        m_uMaxRAMOpt = (uint)(0.80 * uFullSize);
+    }
+    else if (uFullSize < 131072) /* 64-127GB */
+    {
+        m_uMaxRAMAlw = (uint)(0.95 * uFullSize);
+        m_uMaxRAMOpt = (uint)(0.85 * uFullSize);
+    }
+    else                        /* 128GB- */
+    {
+        m_uMaxRAMAlw = (uint)(0.96 * uFullSize);
+        m_uMaxRAMOpt = (uint)(0.90 * uFullSize);
+    }
+    /* Now check the calculated maximums are out of the range for the guest
+     * RAM. If so change it accordingly. */
+    m_uMaxRAMAlw = RT_MIN(m_uMaxRAMAlw, m_uMaxRAM);
+    m_uMaxRAMOpt = RT_MIN(m_uMaxRAMOpt, m_uMaxRAM);
+
+    setPageStep(calcPageStep(m_uMaxRAM));
+    setSingleStep(pageStep() / 4);
+    setTickInterval(pageStep());
+    /* Setup the scale so that ticks are at page step boundaries */
+    if (m_uMinRAM >= static_cast<uint>(pageStep()))
+        setMinimum((m_uMinRAM / pageStep()) * pageStep());
+    else
+        setMinimum(m_uMinRAM);
+
+    setMaximum(m_uMaxRAM);
+    setSnappingEnabled(true);
+    setOptimalHint(m_uMinRAM, m_uMaxRAMOpt);
+    setWarningHint(m_uMaxRAMOpt, m_uMaxRAMAlw);
+    setErrorHint(m_uMaxRAMAlw, m_uMaxRAM);
+}
+
+int UIBaseMemorySlider::calcPageStep(int iMaximum) const
+{
+    /* Calculate a suitable page step size for the given max value.
+     * The returned size is so that there will be no more than 32
+     * pages. The minimum returned page size is 4. */
+
+    /* Reasonable max. number of page steps is 32: */
+    uint uPage = ((uint)iMaximum + 31) / 32;
+    /* Make it a power of 2: */
+    uint p = uPage, p2 = 0x1;
+    while ((p >>= 1))
+        p2 <<= 1;
+    if (uPage != p2)
+        p2 <<= 1;
+    if (p2 < 4)
+        p2 = 4;
+    return (int) p2;
+}
+
+
+/*********************************************************************************************************************************
+*   Class UIBaseMemoryEditor implementation.                                                                                     *
+*********************************************************************************************************************************/
 
 UIBaseMemoryEditor::UIBaseMemoryEditor(QWidget *pParent /* = 0 */, bool fWithLabel /* = false */)
@@ -183 +395 @@
         emit sigValidChanged(m_pSlider->value() < (int)m_pSlider->maxRAMAlw());
 }
+
+
+#include "UIBaseMemoryEditor.moc"

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp

@@ -31 +31 @@
 #include "QIRichTextLabel.h"
 #include "QIToolButton.h"
-#include "UIBaseMemorySlider.h"
 #include "UIBaseMemoryEditor.h"
 #include "UIFilePathSelector.h"