Changeset 93302 in vbox for trunk

Timestamp:

Jan 18, 2022 11:25:24 AM (3 years ago)

Author:

vboxsync

Message:

ValKit: VC++ 19.2 update 11 build adjustments (uint64_t -> double conversions). bugref:8489

Location:

trunk/src/VBox/ValidationKit

Files:

• testboxscript/TestBoxHelper.cpp (modified) (2 diffs)
• utils/cpu/cpu-alloc-all-mem.cpp (modified) (2 diffs)
• utils/fs/FsPerf.cpp (modified) (2 diffs)
• utils/network/NetPerf.cpp (modified) (3 diffs)
• utils/nt/nttimesources.cpp (modified) (1 diff)
• utils/storage/IoPerf.cpp (modified) (1 diff)

trunk/src/VBox/ValidationKit/testboxscript/TestBoxHelper.cpp

@@ -146 +146 @@
                         uint64_t cNsInterval = nsNow - nsStat;
                         uint64_t cbInterval  = cbWritten - cbStatWritten;
-                        uint64_t cbIntervalPerSec = cbInterval ? (uint64_t)(cbInterval / (cNsInterval / (double)RT_NS_1SEC)) : 0;
+                        uint64_t cbIntervalPerSec = !cbInterval ? 0
+                                                  : (uint64_t)((double)cbInterval / ((double)cNsInterval / (double)RT_NS_1SEC));
 
                         RTPrintf("%s: %'9RTfoff MiB out of %'9RTfoff are free after writing %'9RU64 MiB (%'5RU64 MiB/s)\n",
@@ -173 +174 @@
             /* Issue a summary statements. */
             uint64_t cNsElapsed = RTTimeNanoTS() - nsStart;
-            uint64_t cbPerSec   = cbWritten ? (uint64_t)(cbWritten / (cNsElapsed / (double)RT_NS_1SEC)) : 0;
+            uint64_t cbPerSec   = cbWritten ? (uint64_t)((double)cbWritten / ((double)cNsElapsed / (double)RT_NS_1SEC)) : 0;
             RTPrintf("%s: Wrote %'RU64 MiB in %'RU64 s, avg %'RU64 MiB/s.\n",
                      pszFilename, cbWritten / _1M, cNsElapsed / RT_NS_1SEC, cbPerSec / _1M);

trunk/src/VBox/ValidationKit/utils/cpu/cpu-alloc-all-mem.cpp

@@ -153 +153 @@
                 uPrintTS = uEndTS;
 
-                uint32_t cMBPerSec = (uint32_t)(cbTotal / ((double)cNsElapsed / RT_NS_1SEC) / _1M);
+                uint32_t cMBPerSec = (uint32_t)((long double)cbTotal / ((long double)cNsElapsed / RT_NS_1SEC) / _1M);
                 RTTestPrintf(hTest, RTTESTLVL_ALWAYS, "%'zu bytes in %'llu ns - %'u MB/s\n",
                              cbTotal, cNsElapsed, cMBPerSec);
@@ -189 +189 @@
     RTTestValue(hTest, "amount", cbTotal, RTTESTUNIT_BYTES);
     RTTestValue(hTest, "time",   cNsElapsed, RTTESTUNIT_NS);
-    uint32_t cMBPerSec = (uint32_t)(cbTotal / ((double)cNsElapsed / RT_NS_1SEC) / _1M);
+    uint32_t cMBPerSec = (uint32_t)((long double)cbTotal / ((long double)cNsElapsed / RT_NS_1SEC) / _1M);
     RTTestValue(hTest, "speed",  cMBPerSec, RTTESTUNIT_MEGABYTES_PER_SEC);
     RTTestSubDone(hTest);

trunk/src/VBox/ValidationKit/utils/fs/FsPerf.cpp

@@ -4508 +4508 @@
         RTTestIValueF(ns / iIteration, \
                       RTTESTUNIT_NS_PER_OCCURRENCE, a_szOperation "/seq/%RU32 latency", cbBlock); \
-        RTTestIValueF((uint64_t)((uint64_t)iIteration * cbBlock / ((double)ns / RT_NS_1SEC)), \
+        RTTestIValueF((uint64_t)((double)(iIteration * cbBlock) / ((double)ns / RT_NS_1SEC)), \
                       RTTESTUNIT_BYTES_PER_SEC,     a_szOperation "/seq/%RU32 throughput", cbBlock); \
         RTTestIValueF(iIteration, \
@@ -6106 +6106 @@
                 RTTestIValueF(ns / iIteration, \
                               RTTESTUNIT_NS_PER_OCCURRENCE, a_szOperation " latency"); \
-                RTTestIValueF((uint64_t)((uint64_t)iIteration * cbFile / ((double)ns / RT_NS_1SEC)), \
+                RTTestIValueF((uint64_t)((double)(iIteration * cbFile) / ((double)ns / RT_NS_1SEC)), \
                               RTTESTUNIT_BYTES_PER_SEC,     a_szOperation " throughput"); \
                 RTTestIValueF((uint64_t)iIteration * cbFile, \

trunk/src/VBox/ValidationKit/utils/network/NetPerf.cpp

@@ -489 +489 @@
         RTTestIValue("Sends",               pSendStats->cTx,              RTTESTUNIT_PACKETS);
         RTTestIValue("Send Interval",       pSendStats->cNsElapsed,       RTTESTUNIT_NS);
-        RTTestIValue("Send Throughput",     (uint64_t)(cbPacket * pSendStats->cTx / rdSecElapsed), RTTESTUNIT_BYTES_PER_SEC);
-        RTTestIValue("Send Rate",           (uint64_t)(pSendStats->cTx / rdSecElapsed),  RTTESTUNIT_PACKETS_PER_SEC);
-        RTTestIValue("Send Latency",        (uint64_t)(rdSecElapsed / pSendStats->cTx * 1000000000.0), RTTESTUNIT_NS_PER_PACKET);
+        RTTestIValue("Send Throughput",     (uint64_t)((double)(cbPacket * pSendStats->cTx) / rdSecElapsed), RTTESTUNIT_BYTES_PER_SEC);
+        RTTestIValue("Send Rate",           (uint64_t)((double)pSendStats->cTx / rdSecElapsed),  RTTESTUNIT_PACKETS_PER_SEC);
+        RTTestIValue("Send Latency",        (uint64_t)(rdSecElapsed / (double)pSendStats->cTx * 1000000000.0), RTTESTUNIT_NS_PER_PACKET);
     }
 
@@ -499 +499 @@
         RTTestIValue("Receives",            pRecvStats->cRx,              RTTESTUNIT_PACKETS);
         RTTestIValue("Receive Interval",    pRecvStats->cNsElapsed,       RTTESTUNIT_NS);
-        RTTestIValue("Receive Throughput",  (uint64_t)(cbPacket * pRecvStats->cRx / rdSecElapsed), RTTESTUNIT_BYTES_PER_SEC);
-        RTTestIValue("Receive Rate",        (uint64_t)(pRecvStats->cRx / rdSecElapsed),  RTTESTUNIT_PACKETS_PER_SEC);
-        RTTestIValue("Receive Latency",     (uint64_t)(rdSecElapsed / pRecvStats->cRx * 1000000000.0), RTTESTUNIT_NS_PER_PACKET);
+        RTTestIValue("Receive Throughput",  (uint64_t)((double)(cbPacket * pRecvStats->cRx) / rdSecElapsed), RTTESTUNIT_BYTES_PER_SEC);
+        RTTestIValue("Receive Rate",        (uint64_t)((double)pRecvStats->cRx / rdSecElapsed),  RTTESTUNIT_PACKETS_PER_SEC);
+        RTTestIValue("Receive Latency",     (uint64_t)(rdSecElapsed / (double)pRecvStats->cRx * 1000000000.0), RTTESTUNIT_NS_PER_PACKET);
     }
 }
@@ -755 +755 @@
     RTTestIValue("Interval",            pStats->cNsElapsed,      RTTESTUNIT_NS);
     RTTestIValue("Packet size",         cbPacket,                RTTESTUNIT_BYTES);
-    RTTestIValue("Average rate",        (uint64_t)(pStats->cEchos / rdSecElapsed),  RTTESTUNIT_PACKETS_PER_SEC);
-    RTTestIValue("Average throughput",  (uint64_t)(cbPacket * pStats->cEchos / rdSecElapsed), RTTESTUNIT_BYTES_PER_SEC);
-    RTTestIValue("Average latency",     (uint64_t)(rdSecElapsed / pStats->cEchos * 1000000000.0), RTTESTUNIT_NS_PER_ROUND_TRIP);
+    RTTestIValue("Average rate",        (uint64_t)((double)pStats->cEchos / rdSecElapsed),  RTTESTUNIT_PACKETS_PER_SEC);
+    RTTestIValue("Average throughput",  (uint64_t)((double)(cbPacket * pStats->cEchos) / rdSecElapsed), RTTESTUNIT_BYTES_PER_SEC);
+    RTTestIValue("Average latency",     (uint64_t)(rdSecElapsed / (double)pStats->cEchos * 1000000000.0), RTTESTUNIT_NS_PER_ROUND_TRIP);
     RTTestISubDone();
 }

trunk/src/VBox/ValidationKit/utils/nt/nttimesources.cpp

@@ -212 +212 @@
         /* Recalc to micro seconds. */
         uint64_t u64MicroSecMs  = (uint64_t)cMsTicks * 1000;
-        uint64_t u64MicroSecTsc = u64TscHz ? (long double)cTscTicks /       u64TscHz * 1000000 : u64MicroSecMs;
+        uint64_t u64MicroSecTsc = u64TscHz ? (long double)cTscTicks / (long double)u64TscHz       * 1000000 : u64MicroSecMs;
+        uint64_t u64MicroSecPrf =   (long double)cPrfTicks.QuadPart / (long double)PrfHz.QuadPart * 1000000;
         uint64_t u64MicroSecInt = cIntTicks.QuadPart / 10; /* 100ns units*/
-        uint64_t u64MicroSecPrf =   (long double)cPrfTicks.QuadPart / PrfHz.QuadPart * 1000000;
 
         /* check how much they differ using the millisecond tick count as the standard candle. */

trunk/src/VBox/ValidationKit/utils/storage/IoPerf.cpp

@@ -816 +816 @@
 
         /* Get average bandwidth for the job. */
-        RTTestIValueF((uint64_t)(pJob->cbTestSet / ((double)nsJobRuntime / RT_NS_1SEC)),
+        RTTestIValueF((uint64_t)((double)pJob->cbTestSet / ((double)nsJobRuntime / RT_NS_1SEC)),
                        RTTESTUNIT_BYTES_PER_SEC, "%s/Job/%RU32/AvgBandwidth", pszTest, pJob->idJob);