Changeset 80494 in vbox

Timestamp:

Aug 29, 2019 10:18:34 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9510: Replacing qulonglong with quint64 for consistency.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information

Files:

• UIInformationRuntime.cpp (modified) (27 diffs)
• UIInformationRuntime.h (modified) (5 diffs)

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

@@ -69 +69 @@
 
 
-QString formatNumber(qulonglong number)
+QString formatNumber(quint64 number)
 {
     if (number <= 0)
         return QString();
+    /* See https://en.wikipedia.org/wiki/Metric_prefix for metric suffices:*/
     char suffices[] = {'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'};
     int zeroCount = (int)log10(number);
@@ -80 +81 @@
     char result[128];
     sprintf(result, "%.2f", number / (float)pow(10, h));
-    return QString("%1 %2").arg(result).arg(suffices[h / 3 - 1]);
+    return QString("%1%2").arg(result).arg(suffices[h / 3 - 1]);
 }
 
@@ -182 +183 @@
      * @{ */
        void drawXAxisLabels(QPainter &painter, int iXSubAxisCount);
-       void drawPieChart(QPainter &painter, qulonglong iMaximum, int iDataIndex, const QRectF &chartRect, int iAlpha);
-       void drawCombinedPieCharts(QPainter &painter, qulonglong iMaximum);
-       void drawDoughnutChart(QPainter &painter, qulonglong iMaximum, int iDataIndex,
+       void drawPieChart(QPainter &painter, quint64 iMaximum, int iDataIndex, const QRectF &chartRect, int iAlpha);
+       void drawCombinedPieCharts(QPainter &painter, quint64 iMaximum);
+       void drawDoughnutChart(QPainter &painter, quint64 iMaximum, int iDataIndex,
                               const QRectF &chartRect, const QRectF &innerRect, int iAlpha);
 
@@ -621 +622 @@
     }
 
-    qulonglong iMaximum = m_pMetric->maximum();
+    quint64 iMaximum = m_pMetric->maximum();
     if (iMaximum == 0)
         return;
@@ -637 +638 @@
         }
 
-        const QQueue<qulonglong> *data = m_pMetric->data(k);
+        const QQueue<quint64> *data = m_pMetric->data(k);
         if (!m_fUseGradientLineColor)
             painter.setPen(QPen(m_dataSeriesColor[k], 2.5));
@@ -661 +662 @@
         int iTextY = 0.5 * iFontHeight + m_iMarginTop + i * m_lineChartRect.height() / (float) (iYSubAxisCount + 1);
         QString strValue;
-        qulonglong iValue = (iYSubAxisCount + 1 - i) * (iMaximum / (float) (iYSubAxisCount + 1));
+        quint64 iValue = (iYSubAxisCount + 1 - i) * (iMaximum / (float) (iYSubAxisCount + 1));
         if (m_pMetric->unit().compare("%", Qt::CaseInsensitive) == 0)
             strValue = QString::number(iValue);
         else if (m_pMetric->unit().compare("kb", Qt::CaseInsensitive) == 0)
-            strValue = uiCommon().formatSize(_1K * (qulonglong)iValue, iDecimalCount);
+            strValue = uiCommon().formatSize(_1K * (quint64)iValue, iDecimalCount);
         else if (m_pMetric->unit().compare("b", Qt::CaseInsensitive) == 0 ||
                  m_pMetric->unit().compare("b/s", Qt::CaseInsensitive) == 0)
@@ -700 +701 @@
 }
 
-void UIChart::drawPieChart(QPainter &painter, qulonglong iMaximum, int iDataIndex, const QRectF &chartRect, int iAlpha)
+void UIChart::drawPieChart(QPainter &painter, quint64 iMaximum, int iDataIndex, const QRectF &chartRect, int iAlpha)
 {
     if (!m_pMetric)
         return;
     /* First draw a doughnut shaped chart for the 1st data series */
-    const QQueue<qulonglong> *data = m_pMetric->data(iDataIndex);
+    const QQueue<quint64> *data = m_pMetric->data(iDataIndex);
     if (!data || data->isEmpty())
         return;
@@ -732 +733 @@
 }
 
-void UIChart::drawDoughnutChart(QPainter &painter, qulonglong iMaximum, int iDataIndex,
+void UIChart::drawDoughnutChart(QPainter &painter, quint64 iMaximum, int iDataIndex,
                                 const QRectF &chartRect, const QRectF &innerRect, int iAlpha)
 {
-    const QQueue<qulonglong> *data = m_pMetric->data(iDataIndex);
+    const QQueue<quint64> *data = m_pMetric->data(iDataIndex);
     if (!data || data->isEmpty())
         return;
@@ -785 +786 @@
 }
 
-void UIChart::drawCombinedPieCharts(QPainter &painter, qulonglong iMaximum)
+void UIChart::drawCombinedPieCharts(QPainter &painter, quint64 iMaximum)
 {
     if (!m_pMetric)
@@ -797 +798 @@
     /* First draw a doughnut shaped chart for the 1st data series */
     // int iDataIndex = 0;
-    // const QQueue<qulonglong> *data = m_pMetric->data(iDataIndex);
+    // const QQueue<quint64> *data = m_pMetric->data(iDataIndex);
     // if (!data || data->isEmpty())
     //     return;
@@ -874 +875 @@
 }
 
-void UIMetric::setMaximum(qulonglong iMaximum)
+void UIMetric::setMaximum(quint64 iMaximum)
 {
     m_iMaximum = iMaximum;
 }
 
-qulonglong UIMetric::maximum() const
+quint64 UIMetric::maximum() const
 {
     return m_iMaximum;
@@ -894 +895 @@
 }
 
-void UIMetric::addData(int iDataSeriesIndex, qulonglong fData)
+void UIMetric::addData(int iDataSeriesIndex, quint64 fData)
 {
     if (iDataSeriesIndex >= DATA_SERIES_SIZE)
@@ -903 +904 @@
 }
 
-const QQueue<qulonglong> *UIMetric::data(int iDataSeriesIndex) const
+const QQueue<quint64> *UIMetric::data(int iDataSeriesIndex) const
 {
     if (iDataSeriesIndex >= DATA_SERIES_SIZE)
@@ -910 +911 @@
 }
 
-void UIMetric::setTotal(int iDataSeriesIndex, qulonglong iTotal)
+void UIMetric::setTotal(int iDataSeriesIndex, quint64 iTotal)
 {
     if (iDataSeriesIndex >= DATA_SERIES_SIZE)
@@ -917 +918 @@
 }
 
-qulonglong UIMetric::total(int iDataSeriesIndex) const
+quint64 UIMetric::total(int iDataSeriesIndex) const
 {
     if (iDataSeriesIndex >= DATA_SERIES_SIZE)
@@ -1199 +1200 @@
                                                                      aReturnDataIndices,
                                                                      aReturnDataLengths);
-    qulonglong iTotalRAM = 0;
-    qulonglong iFreeRAM = 0;
+    quint64 iTotalRAM = 0;
+    quint64 iFreeRAM = 0;
 
     for (int i = 0; i < aReturnNames.size(); ++i)
@@ -1230 +1231 @@
 
     /* Collect the data from IMachineDebugger::getStats(..): */
-    qulonglong uNetworkTotalReceive = 0;
-    qulonglong uNetworkTotalTransmit = 0;
-
-    qulonglong uDiskIOTotalWritten = 0;
-    qulonglong uDiskIOTotalRead = 0;
-
-   qulonglong uTotalVMExits = 0;
+    quint64 uNetworkTotalReceive = 0;
+    quint64 uNetworkTotalTransmit = 0;
+
+    quint64 uDiskIOTotalWritten = 0;
+    quint64 uDiskIOTotalRead = 0;
+
+   quint64 uTotalVMExits = 0;
 
     QVector<DebuggerMetricData> xmlData = getTotalCounterFromDegugger(m_strQueryString);
@@ -1452 +1453 @@
 }
 
-void UIInformationRuntime::updateNetworkGraphsAndMetric(qulonglong iReceiveTotal, qulonglong iTransmitTotal)
+void UIInformationRuntime::updateNetworkGraphsAndMetric(quint64 iReceiveTotal, quint64 iTransmitTotal)
 {
     UIMetric &NetMetric = m_subMetrics[m_strNetworkMetricName];
 
-    qulonglong iReceiveRate = iReceiveTotal - NetMetric.total(0);
-    qulonglong iTransmitRate = iTransmitTotal - NetMetric.total(1);
+    quint64 iReceiveRate = iReceiveTotal - NetMetric.total(0);
+    quint64 iTransmitRate = iTransmitTotal - NetMetric.total(1);
 
     NetMetric.setTotal(0, iReceiveTotal);
@@ -1471 +1472 @@
     NetMetric.addData(0, iReceiveRate);
     NetMetric.addData(1, iTransmitRate);
-    qulonglong iMaximum = qMax(NetMetric.maximum(), qMax(iReceiveRate, iTransmitRate));
+    quint64 iMaximum = qMax(NetMetric.maximum(), qMax(iReceiveRate, iTransmitRate));
     NetMetric.setMaximum(iMaximum);
 
@@ -1496 +1497 @@
 }
 
-void UIInformationRuntime::updateDiskIOGraphsAndMetric(qulonglong uDiskIOTotalWritten, qulonglong uDiskIOTotalRead)
+void UIInformationRuntime::updateDiskIOGraphsAndMetric(quint64 uDiskIOTotalWritten, quint64 uDiskIOTotalRead)
 {
     UIMetric &diskMetric = m_subMetrics[m_strDiskIOMetricName];
 
-    qulonglong iWriteRate = uDiskIOTotalWritten - diskMetric.total(0);
-    qulonglong iReadRate = uDiskIOTotalRead - diskMetric.total(1);
+    quint64 iWriteRate = uDiskIOTotalWritten - diskMetric.total(0);
+    quint64 iReadRate = uDiskIOTotalRead - diskMetric.total(1);
 
     diskMetric.setTotal(0, uDiskIOTotalWritten);
@@ -1514 +1515 @@
     diskMetric.addData(0, iWriteRate);
     diskMetric.addData(1, iReadRate);
-    qulonglong iMaximum = qMax(diskMetric.maximum(), qMax(iWriteRate, iReadRate));
+    quint64 iMaximum = qMax(diskMetric.maximum(), qMax(iWriteRate, iReadRate));
     diskMetric.setMaximum(iMaximum);
 
@@ -1541 +1542 @@
 
 
-void UIInformationRuntime::updateVMExitMetric(qulonglong uTotalVMExits)
+void UIInformationRuntime::updateVMExitMetric(quint64 uTotalVMExits)
 {
     if (uTotalVMExits <= 0)
@@ -1548 +1549 @@
     UIMetric &VMExitMetric = m_subMetrics[m_strVMExitMetricName];
 
-    qulonglong iRate = uTotalVMExits - VMExitMetric.total(0);
+    quint64 iRate = uTotalVMExits - VMExitMetric.total(0);
 
     VMExitMetric.setTotal(0, uTotalVMExits);
@@ -1560 +1561 @@
 
     VMExitMetric.addData(0, iRate);
-    qulonglong iMaximum = qMax(VMExitMetric.maximum(), iRate);
+    quint64 iMaximum = qMax(VMExitMetric.maximum(), iRate);
     VMExitMetric.setMaximum(iMaximum);
 
@@ -1599 +1600 @@
     QXmlStreamReader xmlReader;
     xmlReader.addData(strStats);
-    qulonglong iTotal = 0;
+    quint64 iTotal = 0;
     if (xmlReader.readNextStartElement())
     {
@@ -1607 +1608 @@
             {
                 QXmlStreamAttributes attributes = xmlReader.attributes();
-                qulonglong iCounter = attributes.value("c").toULongLong();
+                quint64 iCounter = attributes.value("c").toULongLong();
                 iTotal += iCounter;
                 xmlReader.skipCurrentElement();
@@ -1615 +1616 @@
             {
                 QXmlStreamAttributes attributes = xmlReader.attributes();
-                qulonglong iCounter = attributes.value("val").toULongLong();
+                quint64 iCounter = attributes.value("val").toULongLong();
                 iTotal += iCounter;
                 xmlReader.skipCurrentElement();

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

@@ -54 +54 @@
     DebuggerMetricData()
         : m_counter(0){}
-    DebuggerMetricData(const QString & strName, qulonglong counter)
+    DebuggerMetricData(const QString & strName, quint64 counter)
         :m_strName(strName)
         , m_counter(counter){}
     QString m_strName;
-    qulonglong m_counter;
+    quint64 m_counter;
 };
 
@@ -69 +69 @@
     const QString &name() const;
 
-    void setMaximum(qulonglong iMaximum);
-    qulonglong maximum() const;
+    void setMaximum(quint64 iMaximum);
+    quint64 maximum() const;
 
     void setUnit(QString strUnit);
     const QString &unit() const;
 
-    void addData(int iDataSeriesIndex, qulonglong fData);
-    const QQueue<qulonglong> *data(int iDataSeriesIndex) const;
-
-    void setTotal(int iDataSeriesIndex, qulonglong iTotal);
-    qulonglong total(int iDataSeriesIndex) const;
+    void addData(int iDataSeriesIndex, quint64 fData);
+    const QQueue<quint64> *data(int iDataSeriesIndex) const;
+
+    void setTotal(int iDataSeriesIndex, quint64 iTotal);
+    quint64 total(int iDataSeriesIndex) const;
 
     bool requiresGuestAdditions() const;
@@ -119 +119 @@
     QString m_strName;
     QString m_strUnit;
-    qulonglong m_iMaximum;
-    QQueue<qulonglong> m_data[DATA_SERIES_SIZE];
+    quint64 m_iMaximum;
+    QQueue<quint64> m_data[DATA_SERIES_SIZE];
     /** The total data (the counter value we get from IMachineDebugger API). For the metrics
       * we get from IMachineDebugger m_data values are computed as deltas of total values t - (t-1) */
-    qulonglong m_iTotal[DATA_SERIES_SIZE];
+    quint64 m_iTotal[DATA_SERIES_SIZE];
     int m_iMaximumQueueSize;
     bool m_fRequiresGuestAdditions;
@@ -164 +164 @@
     void updateCPUGraphsAndMetric(ULONG iLoadPercentage, ULONG iOtherPercentage);
     void updateRAMGraphsAndMetric(quint64 iTotalRAM, quint64 iFreeRAM);
-    void updateNetworkGraphsAndMetric(qulonglong iReceiveTotal, qulonglong iTransmitTotal);
-    void updateDiskIOGraphsAndMetric(qulonglong uDiskIOTotalWritten, qulonglong uDiskIOTotalRead);
-    void updateVMExitMetric(qulonglong uTotalVMExits);
+    void updateNetworkGraphsAndMetric(quint64 iReceiveTotal, quint64 iTransmitTotal);
+    void updateDiskIOGraphsAndMetric(quint64 uDiskIOTotalWritten, quint64 uDiskIOTotalRead);
+    void updateVMExitMetric(quint64 uTotalVMExits);
 
     QString dataColorString(const QString &strChartName, int iDataIndex);
@@ -232 +232 @@
     /** The following string is used while querrying CMachineDebugger. */
     QString m_strQueryString;
-    qulonglong m_iTimeStep;
+    quint64 m_iTimeStep;
 };