Changeset 102625 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 16, 2023 8:21:41 AM (14 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10501. Caching disk write (read) until disk read (write) arrives.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity

Files:

• UIVMActivityMonitor.cpp (modified) (8 diffs)
• UIVMActivityMonitor.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp

@@ -1196 +1196 @@
 
         UIChart *pChart = new UIChart(this, &(m_metrics[strMetricName]), m_iMaximumQueueSize);
-        //pChart->installEventFilter(this);
         connect(pChart, &UIChart::sigExportMetricsToFile,
                 this, &UIVMActivityMonitor::sltExportMetricsToFile);
@@ -1251 +1250 @@
 void UIVMActivityMonitor::sltChatDataIndexUnderCursorChanged(int iIndex)
 {
+    Q_UNUSED(iIndex);
+#if 0
     foreach (UIChart *chart, m_charts)
     {
@@ -1259 +1260 @@
 
     }
+#endif
 }
 
@@ -1864 +1866 @@
     m_availableMetricTypes.clear();
     foreach (const QString &strName, metricNameList)
-    {
-        ///printf("%s\n", qPrintable(strName));
         m_availableMetricTypes << gpConverter->fromInternalString<KMetricType>(strName);
-    }
 
     if (!m_availableMetricTypes.isEmpty())
@@ -1892 +1891 @@
         else if (enmMetricType == KMetricType_DiskBytesRead)
         {
-            //printf("diskread %s %s\n", qPrintable(data[i]), qPrintable(timeStamps[i]));
+            cacheDiskRead(timeStamps[i], data[i].toULongLong());
         }
         else if (enmMetricType == KMetricType_DiskBytesWritten)
         {
-            //printf("diskwrite %s %s\n", qPrintable(data[i]), qPrintable(timeStamps[i]));
+            //printf("write %s %f\n", qPrintable(data[i]), data[i].toFloat());
+            cacheDiskWrite(timeStamps[i], (int)data[i].toFloat());
         }
 
@@ -1931 +1931 @@
     foreach (const KMetricType &enmMetricType, m_availableMetricTypes)
     {
-        printf("enm %d\n", enmMetricType);
         UIMetric metric;
         int iDataSeriesIndex = 0;
@@ -1989 +1988 @@
 void UIVMActivityMonitorCloud::updateRAMGraphsAndMetric(quint64 /*iTotalRAM*/, quint64 /*iFreeRAM*/){}
 void UIVMActivityMonitorCloud::updateNetworkGraphsAndMetric(quint64 /*iReceiveTotal*/, quint64 /*iTransmitTotal*/){}
-void UIVMActivityMonitorCloud::updateDiskIOGraphsAndMetric(quint64 /*uDiskIOTotalWritten*/, quint64 /*uDiskIOTotalRead*/){}
+
+void UIVMActivityMonitorCloud::updateDiskIOGraphsAndMetric(quint64 uWriteRate, quint64 uReadRate)
+{
+    //printf("%lld %lld\n", uWriteRate, uReadRate);
+    UIMetric &diskMetric = m_metrics[m_strDiskIOMetricName];
+
+    // quint64 iWriteRate = uDiskIOTotalWritten - diskMetric.total(0);
+    // quint64 iReadRate = uDiskIOTotalRead - diskMetric.total(1);
+
+    // diskMetric.setTotal(0, uDiskIOTotalWritten);
+    // diskMetric.setTotal(1, uDiskIOTotalRead);
+
+    // /* Do not set data and maximum if the metric has not been initialized  since we need to initialize totals "(t-1)" first: */
+    // if (!diskMetric.isInitialized()){
+    //     diskMetric.setIsInitialized(true);
+    //     return;
+    // }
+    diskMetric.addData(0, uWriteRate);
+    diskMetric.addData(1, uReadRate);
+
+    // if (m_infoLabels.contains(m_strDiskIOMetricName)  && m_infoLabels[m_strDiskIOMetricName])
+    // {
+    //     QString strInfo = QString("<b>%1</b></b><br/><font color=\"%2\">%3: %4<br/>%5 %6</font><br/><font color=\"%7\">%8: %9<br/>%10 %11</font>")
+    //         .arg(m_strDiskIOInfoLabelTitle)
+    //         .arg(dataColorString(m_strDiskIOMetricName, 0)).arg(m_strDiskIOInfoLabelWritten).arg(UITranslator::formatSize((quint64)iWriteRate, g_iDecimalCount))
+    //         .arg(m_strDiskIOInfoLabelWrittenTotal).arg(UITranslator::formatSize((quint64)uDiskIOTotalWritten, g_iDecimalCount))
+    //         .arg(dataColorString(m_strDiskIOMetricName, 1)).arg(m_strDiskIOInfoLabelRead).arg(UITranslator::formatSize((quint64)iReadRate, g_iDecimalCount))
+    //         .arg(m_strDiskIOInfoLabelReadTotal).arg(UITranslator::formatSize((quint64)uDiskIOTotalRead, g_iDecimalCount));
+    //     m_infoLabels[m_strDiskIOMetricName]->setText(strInfo);
+    // }
+    if (m_charts.contains(m_strDiskIOMetricName))
+        m_charts[m_strDiskIOMetricName]->update();
+}
 
 bool UIVMActivityMonitorCloud::findMetric(KMetricType enmMetricType, UIMetric &metric, int &iDataSeriesIndex) const
@@ -2083 +2114 @@
 }
 
+void UIVMActivityMonitorCloud::cacheDiskWrite(const QString &strTimeStamp, int iValue)
+{
+    /* Make sure this is the first time we receieve write for this time stap: */
+    AssertReturnVoid(!m_diskWriteCache.contains(strTimeStamp));
+    /* If we have read rate for this time stamp just update the chart and remove related data from the cache: */
+    if (m_diskReadCache.contains(strTimeStamp))
+    {
+        updateDiskIOGraphsAndMetric((quint64) iValue, (quint64) m_diskReadCache[strTimeStamp]);
+        m_diskReadCache[strTimeStamp];
+    }
+    else
+        m_diskWriteCache[strTimeStamp] = iValue;
+}
+
+void UIVMActivityMonitorCloud::cacheDiskRead(const QString &strTimeStamp, int iValue)
+{
+    /* Make sure this is the first time we receieve read for this time stap: */
+    AssertReturnVoid(!m_diskReadCache.contains(strTimeStamp));
+    /* If we have write rate for this time stamp just update the chart and remove related data from the cache: */
+    if (m_diskWriteCache.contains(strTimeStamp))
+    {
+        updateDiskIOGraphsAndMetric((quint64) m_diskWriteCache[strTimeStamp], (quint64) iValue);
+        m_diskWriteCache.remove(strTimeStamp);
+    }
+    else
+        m_diskReadCache[strTimeStamp] = iValue;
+}
+
+
 #include "UIVMActivityMonitor.moc"

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.h

@@ -335 +335 @@
         virtual void updateRAMGraphsAndMetric(quint64 iTotalRAM, quint64 iFreeRAM) RT_OVERRIDE;
         virtual void updateNetworkGraphsAndMetric(quint64 iReceiveTotal, quint64 iTransmitTotal) RT_OVERRIDE;
-        virtual void updateDiskIOGraphsAndMetric(quint64 uDiskIOTotalWritten, quint64 uDiskIOTotalRead) RT_OVERRIDE;
+        virtual void updateDiskIOGraphsAndMetric(quint64 uWriteRate, quint64 uReadRate) RT_OVERRIDE;
     /** @} */
     virtual void resetCPUInfoLabel();
     virtual void resetNetworkInfoLabel();
     virtual void resetDiskIOInfoLabel();
+
+    /* Since we have a single UIMetric instance for disk IO we cache write and/or read until the other value arrives. Then update
+     * the corresponding chart. */
+    void cacheDiskWrite(const QString &strTimeStamp, int iValue);
+    void cacheDiskRead(const QString &strTimeStamp, int iValue);
 
     bool findMetric(KMetricType enmMetricType, UIMetric &metric, int &iDataSeriesIndex) const;
@@ -349 +354 @@
     /** Mapping from API enums to internal metric names. Necessary also since we don't hace a 1-to-1 mapping. */
     QHash<KMetricType, QString> m_metricTypeNames;
+
+    /* Key is time stamp we get from our Main API, value is disk write or read values. */
+    QMap<QString, quint64> m_diskWriteCache;
+    QMap<QString, quint64> m_diskReadCache;
 };
 #endif /* !FEQT_INCLUDED_SRC_activity_vmactivity_UIVMActivityMonitor_h */