Changeset 80251 in vbox for trunk/src/VBox/ValidationKit/utils

Timestamp:

Aug 13, 2019 12:53:12 PM (5 years ago)

Author:

vboxsync

Message:

ValidationKit/IoPerf: Collapse the tests into a single test when running to avoid running into to deep sub test depth errors when running the storage benchmark testcase which is already hitting the limit of 10 nested tests configured

File:

• trunk/src/VBox/ValidationKit/utils/storage/IoPerf.cpp (modified) (4 diffs)

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

@@ -619 +619 @@
     }
 
-    RTTestISub(ioPerfJobTestStringify(pJob->enmTest));
     pJob->tsStart = RTTimeNanoTS();
     return rc;
@@ -802 +801 @@
 static void ioPerfJobStats(PIOPERFJOB pJob)
 {
+    const char *pszTest = ioPerfJobTestStringify(pJob->enmTest);
     uint64_t nsJobRuntime = pJob->tsFinish - pJob->tsStart;
-    RTTestIValueF(nsJobRuntime, RTTESTUNIT_NS, "Job/%RU32/Runtime", pJob->idJob);
+    RTTestIValueF(nsJobRuntime, RTTESTUNIT_NS, "%s/Job/%RU32/Runtime", pszTest, pJob->idJob);
 
     uint64_t *paReqRuntimeNs = (uint64_t *)RTMemAllocZ(pJob->cReqStats * sizeof(uint64_t));
@@ -817 +817 @@
         /* Get average bandwidth for the job. */
         RTTestIValueF((uint64_t)(pJob->cbTestSet / ((double)nsJobRuntime / RT_NS_1SEC)),
-                       RTTESTUNIT_BYTES_PER_SEC, "Job/%RU32/AvgBandwidth", pJob->idJob);
+                       RTTESTUNIT_BYTES_PER_SEC, "%s/Job/%RU32/AvgBandwidth", pszTest, pJob->idJob);
 
         RTTestIValueF((uint64_t)(pJob->cReqStats / ((double)nsJobRuntime / RT_NS_1SEC)),
-                       RTTESTUNIT_OCCURRENCES_PER_SEC, "Job/%RU32/AvgIops", pJob->idJob);
+                       RTTESTUNIT_OCCURRENCES_PER_SEC, "%s/Job/%RU32/AvgIops", pszTest, pJob->idJob);
 
         /* Calculate the average latency for the requests. */
@@ -826 +826 @@
         for (uint32_t i = 0; i < pJob->cReqStats; i++)
             uLatency += paReqRuntimeNs[i];
-        RTTestIValueF(uLatency / pJob->cReqStats, RTTESTUNIT_NS, "Job/%RU32/AvgLatency", pJob->idJob);
+        RTTestIValueF(uLatency / pJob->cReqStats, RTTESTUNIT_NS, "%s/Job/%RU32/AvgLatency", pszTest, pJob->idJob);
 
         RTMemFree(paReqRuntimeNs);