vbox的更動 56529 路徑 trunk/src/VBox/Storage

時間撮記:

2015-6-18 下午03:15:17 (9 年 以前)

作者:

vboxsync

訊息:

tstVDIo: Change the implementation to calculate the throughput in KB/s. Before it would return ~(uint64_t)0 on at least one testbox causing Out of Range errors with the SQL database when inserting that value and returning stale data in the web interface. The current approach while still not very sophisticated should avoid that and the error margin introduced is far below the normal fluctuations during the tests

檔案:

• trunk/src/VBox/Storage/testcase/tstVDIo.cpp (修改) (2 筆差異)

trunk/src/VBox/Storage/testcase/tstVDIo.cpp

@@ -668 +668 @@
 }
 
+/**
+ * Returns the speed in KB/s from the amount of and the time in nanoseconds it
+ * took to complete the test.
+ *
+ * @returns Speed in KB/s
+ * @param   cbIo     Size of the I/O test
+ * @param   tsNano   Time in nanoseconds it took to complete the test.
+ */
+static uint64_t tstVDIoGetSpeedKBs(uint64_t cbIo, uint64_t tsNano)
+{
+    /*
+     * Blow up the value until we can do the calculation without getting 0 as
+     * a result.
+     */
+    uint64_t cbIoTemp = cbIo;
+    uint64_t uSpeedKBs;
+    unsigned cRounds = 0;
+    while (cbIoTemp < tsNano)
+    {
+        cbIoTemp *= 1000;
+        cRounds++;
+    }
+
+    uSpeedKBs = ((cbIoTemp / tsNano) * RT_NS_1SEC) / 1024;
+
+    while (cRounds-- > 0)
+        uSpeedKBs /= 1000;
+
+    return uSpeedKBs;
+}
+
 static DECLCALLBACK(int) vdScriptHandlerIo(PVDSCRIPTARG paScriptArgs, void *pvUser)
 {
@@ -955 +986 @@
 
                 NanoTS = RTTimeNanoTS() - NanoTS;
-                uint64_t SpeedKBs = (uint64_t)(cbIo / (NanoTS / 1000000000.0) / 1024);
+                uint64_t SpeedKBs = tstVDIoGetSpeedKBs(cbIo, NanoTS);
                 RTTestValue(pGlob->hTest, "Throughput", SpeedKBs, RTTESTUNIT_KILOBYTES_PER_SEC);