Changeset 82620 in vbox for trunk/src

Timestamp:

Dec 18, 2019 5:33:56 PM (5 years ago)

Author:

vboxsync

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

135507

Message:

FE/Qt: bugref:9510. Cleaning up some code as follow up of r134941.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/information/UIInformationPerformanceMonitor.cpp (modified) (5 diffs)
• runtime/information/UIInformationPerformanceMonitor.h (modified) (3 diffs)
• wizards/newvd/UIWizardNewVDPageExpert.cpp (modified) (2 diffs)

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

@@ -773 +773 @@
 }
 
-const QStringList &UIMetric::deviceTypeList() const
-{
-    return m_deviceTypeList;
-}
-
-void UIMetric::setDeviceTypeList(const QStringList &list)
-{
-    m_deviceTypeList = list;
-    composeQueryString();
-}
-
-const QStringList &UIMetric::metricDataSubString() const
-{
-    return m_metricDataSubString;
-}
-
-void UIMetric::setQueryPrefix(const QString &strPrefix)
-{
-    m_strQueryPrefix = strPrefix;
-    composeQueryString();
-
-}
-
-void UIMetric::setMetricDataSubString(const QStringList &list)
-{
-    m_metricDataSubString = list;
-    composeQueryString();
-}
-
-const QString &UIMetric::queryString() const
-{
-    return m_strQueryString;
-}
-
 bool UIMetric::isInitialized() const
 {
@@ -826 +792 @@
     }
     m_iMaximum = 0;
-}
-
-void UIMetric::composeQueryString()
-{
-    /* Compose of if both m_metricDataSubString and m_deviceTypeList are not empty: */
-    if (m_deviceTypeList.isEmpty() || m_metricDataSubString.isEmpty())
-        return;
-    m_strQueryString.clear();
-    foreach (const QString &strDeviceName, m_deviceTypeList)
-    {
-        foreach (const QString &strSubString, m_metricDataSubString)
-        {
-            /** @todo r=bird: It is much more efficient to (1) start a query with '/' and
-             *        (2) not use multiple expressions.  If you don't start with '/',
-             *        STAM must search all the statistics.  If you have multiple
-             *        expressions it is not yet clever enough to optimize the search and
-             *        will search all the statistics.  There are several thousand in a
-             *        debug builds, some 400-600 in a typical release build (config dep). */
-            m_strQueryString += QString("*%1*%2*%3*|").arg(m_strQueryPrefix).arg(strDeviceName).arg(strSubString);
-        }
-    }
 }
 
@@ -1159 +1104 @@
 
     m_metrics.insert(m_strCPUMetricName, UIMetric(m_strCPUMetricName, "%", iMaximumQueueSize));
-/** @todo r=bird: This way of constructing queries is inefficient, see
- *        comment in query composer.  Also, both the network and disk bits
- *        have moved now.  The update timer method has been updated and no
- *        longer makes use of this for the statistics querying. */
     {
         /* Network metric: */
         UIMetric networkMetric(m_strNetworkMetricName, "B", iMaximumQueueSize);
-        networkMetric.setQueryPrefix("Public");
-        QStringList networkDeviceList;
-        networkDeviceList << "E1k" << "VNet" << "PCNet";
-        networkMetric.setDeviceTypeList(networkDeviceList);
-        QStringList networkMetricDataSubStringList;
-        networkMetricDataSubStringList << "BytesReceived" << "BytesTransmitted";
-        networkMetric.setMetricDataSubString(networkMetricDataSubStringList);
         m_metrics.insert(m_strNetworkMetricName, networkMetric);
     }
@@ -1179 +1113 @@
     {
         UIMetric diskIOMetric(m_strDiskIOMetricName, "B", iMaximumQueueSize);
-        diskIOMetric.setQueryPrefix("Devices");
-        QStringList diskTypeList;
-        diskTypeList << "LSILOGICSCSI" << "BUSLOGIC"
-                     << "AHCI" <<  "PIIX3IDE" << "I82078" << "LSILOGICSAS" << "MSD" << "NVME";
-        diskIOMetric.setDeviceTypeList(diskTypeList);
-        QStringList diskIODataSubStringList;
-        diskIODataSubStringList << "WrittenBytes" << "ReadBytes";
-        diskIOMetric.setMetricDataSubString(diskIODataSubStringList);
         m_metrics.insert(m_strDiskIOMetricName, diskIOMetric);
     }
@@ -1193 +1119 @@
     {
         UIMetric VMExitsMetric(m_strVMExitMetricName, "times", iMaximumQueueSize);
-        VMExitsMetric.setQueryPrefix("PROF");
-        QStringList typeList;
-        typeList << "CPU";
-        VMExitsMetric.setDeviceTypeList(typeList);
-        QStringList subStringList;
-        subStringList << "RecordedExits";
-        VMExitsMetric.setMetricDataSubString(subStringList);
         m_metrics.insert(m_strVMExitMetricName, VMExitsMetric);
     }
-
-    for (QMap<QString, UIMetric>::const_iterator iterator =  m_metrics.begin();
-         iterator != m_metrics.end(); ++iterator)
-    {
-        if (iterator.value().queryString().isEmpty())
-            continue;
-        m_strQueryString += iterator.value().queryString();
-    }
-}
-
+}
 
 bool UIInformationPerformanceMonitor::guestAdditionsAvailable(int iMinimumMajorVersion)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationPerformanceMonitor.h

@@ -85 +85 @@
     void setRequiresGuestAdditions(bool fRequiresGAs);
 
-    const QStringList &deviceTypeList() const;
-    void setDeviceTypeList(const QStringList &list);
-
-    void setQueryPrefix(const QString &strPrefix);
-
-    const QStringList &metricDataSubString() const;
-    void setMetricDataSubString(const QStringList &list);
-
-    const QString &queryString() const;
-
     void setIsInitialized(bool fIsInitialized);
     bool isInitialized() const;
@@ -101 +91 @@
 
 private:
-
-    void composeQueryString();
-
-    /** @name The following strings are string list are used while making IMachineDebugger::getStats calls and parsing the resultin
-      * xml stream.
-      * @{ */
-        /** This string is used while calling IMachineDebugger::getStats(..). It is composed of
-        * m_strQueryPrefix, m_deviceTypeList, and  m_metricDataSubString. */
-        QString m_strQueryString;
-        /** This list is used to differentiate xml data we get from the IMachineDebugger. */
-        QStringList m_deviceTypeList;
-        /** This is used to select data series of the metric. For example, for network metric
-         * it is ReceiveBytes/TransmitBytes */
-        QStringList m_metricDataSubString;
-        QString m_strQueryPrefix;
-    /** @} */
 
     QString m_strName;
@@ -243 +217 @@
         QString m_strVMExitLabelTotal;
     /** @} */
-    /** The following string is used while querrying CMachineDebugger. */
-    QString m_strQueryString;
     quint64 m_iTimeStep;
 };

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp

@@ -178 +178 @@
     m_strDefaultExtension = defaultExtension(mediumFormat());
     if (m_pLocationEditor)
+    {
         m_pLocationEditor->setText(absoluteFilePath(m_strDefaultName, m_strDefaultPath, m_strDefaultExtension));
+        printf("%s\n", qPrintable(absoluteFilePath(m_strDefaultName, m_strDefaultPath, m_strDefaultExtension)));
+    }
 }
 
@@ -213 +216 @@
         if (fileInfo.completeSuffix() != m_strDefaultExtension)
         {
-            QString strNewFilePath = QString("%1/%2.%3").arg(fileInfo.absoluteDir().absolutePath()).arg(fileInfo.baseName()).arg(m_strDefaultExtension);
+            QString strNewFilePath = QString("%1/%2.%3").arg(fileInfo.absoluteDir().absolutePath()).arg(fileInfo.fileName()).arg(m_strDefaultExtension);
             m_pLocationEditor->setText(strNewFilePath);
+            printf("%s %s\n", qPrintable(fileInfo.absoluteDir().absolutePath()), qPrintable(fileInfo.baseName()));
         }
     }