Changeset 80186 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Aug 7, 2019 2:14:00 PM (5 years ago)

Author:

vboxsync

Message:

ValidationKit/IoPerf: Statistics

File:

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

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

@@ -110 +110 @@
 
 /**
+ * Statistics values for a single request kept around until the
+ * test completed for statistics collection.
+ */
+typedef struct IOPERFREQSTAT
+{
+    /** Start timestamp for the request. */
+    uint64_t                    tsStart;
+    /** Completion timestamp for the request. */
+    uint64_t                    tsComplete;
+} IOPERFREQSTAT;
+/** Pointer to a request statistics record. */
+typedef IOPERFREQSTAT *PIOPERFREQSTAT;
+
+
+/**
  * I/O perf request.
  */
 typedef struct IOPERFREQ
 {
-    /** Start timestamp. */
-    uint64_t                    tsStart;
     /** Request operation code. */
     RTIOQUEUEOP                 enmOp;
@@ -128 +141 @@
     /** Size of the read buffer. */
     size_t                      cbXferRead;
+    /** Pointer to statistics record. */
+    PIOPERFREQSTAT              pStats;
 } IOPERFREQ;
 /** Pointer to an I/O perf request. */
@@ -178 +193 @@
     /** Start timestamp. */
     uint64_t                    tsStart;
+    /** End timestamp. for the job. */
+    uint64_t                    tsFinish;
+    /** Number of request statistic records. */
+    uint32_t                    cReqStats;
+    /** Index of the next free statistics record to use. */
+    uint32_t                    idxReqStatNext;
+    /** Array of request statisc records for the whole test. */
+    PIOPERFREQSTAT              paReqStats;
     /** Test dependent data. */
     union
@@ -498 +521 @@
         pIoReq->pvXfer = NULL;
 
-    pIoReq->tsStart = RTTimeNanoTS();
+    Assert(pJob->idxReqStatNext < pJob->cReqStats);
+    if (RT_LIKELY(pJob->idxReqStatNext < pJob->cReqStats))
+    {
+        pIoReq->pStats = &pJob->paReqStats[pJob->idxReqStatNext++];
+        pIoReq->pStats->tsStart = RTTimeNanoTS();
+    }
+    else
+        pIoReq->pStats = NULL;
 }
 
@@ -549 +579 @@
     int rc = VINF_SUCCESS;
 
+    pJob->idxReqStatNext = 0;
+
     switch (pJob->enmTest)
     {
@@ -595 +627 @@
 static void ioPerfJobTestFinish(PIOPERFJOB pJob)
 {
-    uint64_t nsRuntime = RTTimeNanoTS() - pJob->tsStart;
-    RTTestIValue("Runtime", nsRuntime, RTTESTUNIT_NS);
+    pJob->tsFinish = RTTimeNanoTS();
 
     switch (pJob->enmTest)
@@ -707 +738 @@
                             Assert(paIoQCEvt[i].cbXfered == pReq->cbXfer);
 
-                            /** @todo Statistics collection. */
+                            if (pReq->pStats)
+                                pReq->pStats->tsComplete = RTTimeNanoTS();
+
                             if (!ioPerfJobTestIsDone(pJob))
                             {
@@ -719 +752 @@
                                 cReqsQueued--;
                         }
+                        else
+                            RTTestIErrorInc();
                     }
 
@@ -740 +775 @@
 
 /**
+ * Calculates the statistic values for the given job after a
+ * test finished.
+ *
+ * @returns nothing.
+ * @param   pJob                The job data.
+ */
+static void ioPerfJobStats(PIOPERFJOB pJob)
+{
+    uint64_t nsJobRuntime = pJob->tsFinish - pJob->tsStart;
+    RTTestIValueF(nsJobRuntime, RTTESTUNIT_NS, "Job/%RU32/Runtime", pJob->idJob);
+
+    uint64_t *paReqRuntimeNs = (uint64_t *)RTMemAllocZ(pJob->cReqStats * sizeof(uint64_t));
+    if (RT_LIKELY(paReqRuntimeNs))
+    {
+        /* Calculate runtimes for each request first. */
+        for (uint32_t i = 0; i < pJob->cReqStats; i++)
+        {
+            PIOPERFREQSTAT pStat = &pJob->paReqStats[i];
+            paReqRuntimeNs[i] = pStat->tsComplete - pStat->tsStart;
+        }
+
+        /* 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);
+
+        RTTestIValueF((uint64_t)(pJob->cReqStats / ((double)nsJobRuntime / RT_NS_1SEC)),
+                       RTTESTUNIT_OCCURRENCES_PER_SEC, "Job/%RU32/AvgIops", pJob->idJob);
+
+        /* Calculate the average latency for the requests. */
+        uint64_t uLatency = 0;
+        for (uint32_t i = 0; i < pJob->cReqStats; i++)
+            uLatency += paReqRuntimeNs[i];
+        RTTestIValueF(uLatency / pJob->cReqStats, RTTESTUNIT_NS, "Job/%RU32/AvgLatency", pJob->idJob);
+
+        RTMemFree(paReqRuntimeNs);
+    }
+    else
+        RTTestIErrorInc();
+}
+
+
+/**
  * Synchronizes with the other jobs and waits for the current test to execute.
  *
@@ -785 +862 @@
         if (RT_FAILURE(rc))
             break;
+
+        /*
+         * Do the statistics here for a single job run,
+         * the master will do this for each job and combined statistics
+         * otherwise.
+         */
+        if (!pJob->pMaster)
+            ioPerfJobStats(pJob);
     }
 
@@ -883 +968 @@
     pJob->cbIoReqReadBuf = cReqsMax * cbIoBlock;
     pJob->uWriteChance   = uWriteChance;
+    pJob->cReqStats      = (uint32_t)(pJob->cbTestSet / pJob->cbIoBlock + ((pJob->cbTestSet % pJob->cbIoBlock) ? 1 : 0));
+    pJob->idxReqStatNext = 0;
 
     int rc = VINF_SUCCESS;
@@ -888 +975 @@
     if (RT_LIKELY(pJob->paIoReqs))
     {
-        pJob->pvIoReqReadBuf = RTMemPageAlloc(pJob->cbIoReqReadBuf);
-        if (RT_LIKELY(pJob->pvIoReqReadBuf))
+        pJob->paReqStats = (PIOPERFREQSTAT)RTMemAllocZ(pJob->cReqStats * sizeof(IOPERFREQSTAT));
+        if (RT_LIKELY(pJob->paReqStats))
         {
-            uint8_t *pbReadBuf = (uint8_t *)pJob->pvIoReqReadBuf;
-
-            for (uint32_t i = 0; i < cReqsMax; i++)
+            pJob->pvIoReqReadBuf = RTMemPageAlloc(pJob->cbIoReqReadBuf);
+            if (RT_LIKELY(pJob->pvIoReqReadBuf))
             {
-                pJob->paIoReqs[i].pvXferRead = pbReadBuf;
-                pJob->paIoReqs[i].cbXferRead = cbIoBlock;
-                pbReadBuf += cbIoBlock;
-            }
-
-            /* Create the file. */
-            pJob->pszFilename = RTStrAPrintf2("%sioperf-%u.file", pszTestDir, idJob);
-            if (RT_LIKELY(pJob->pszFilename))
-            {
-                uint32_t fOpen = RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_NONE | RTFILE_O_READWRITE | RTFILE_O_ASYNC_IO;
-                if (g_fNoCache)
-                    fOpen |= RTFILE_O_NO_CACHE;
-                rc = RTFileOpen(&pJob->Hnd.u.hFile, pJob->pszFilename, fOpen);
-                if (RT_SUCCESS(rc))
+                uint8_t *pbReadBuf = (uint8_t *)pJob->pvIoReqReadBuf;
+
+                for (uint32_t i = 0; i < cReqsMax; i++)
                 {
-                    switch (enmPrepMethod)
-                    {
-                        case IOPERFTESTSETPREP_JUST_CREATE:
-                            break;
-                        case IOPERFTESTSETPREP_SET_SZ:
-                            rc = RTFileSetSize(pJob->Hnd.u.hFile, pJob->cbTestSet);
-                            break;
-                        case IOPERFTESTSETPREP_SET_ALLOC_SZ:
-                            rc = RTFileSetAllocationSize(pJob->Hnd.u.hFile, pJob->cbTestSet, RTFILE_ALLOC_SIZE_F_DEFAULT);
-                            break;
-                        default:
-                            AssertMsgFailed(("Invalid file preparation method: %d\n", enmPrepMethod));
-                    }
-
+                    pJob->paIoReqs[i].pvXferRead = pbReadBuf;
+                    pJob->paIoReqs[i].cbXferRead = cbIoBlock;
+                    pbReadBuf += cbIoBlock;
+                }
+
+                /* Create the file. */
+                pJob->pszFilename = RTStrAPrintf2("%sioperf-%u.file", pszTestDir, idJob);
+                if (RT_LIKELY(pJob->pszFilename))
+                {
+                    uint32_t fOpen = RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_NONE | RTFILE_O_READWRITE | RTFILE_O_ASYNC_IO;
+                    if (g_fNoCache)
+                        fOpen |= RTFILE_O_NO_CACHE;
+                    rc = RTFileOpen(&pJob->Hnd.u.hFile, pJob->pszFilename, fOpen);
                     if (RT_SUCCESS(rc))
                     {
-                        rc = ioPerfJobTestSetPrep(pJob);
+                        switch (enmPrepMethod)
+                        {
+                            case IOPERFTESTSETPREP_JUST_CREATE:
+                                break;
+                            case IOPERFTESTSETPREP_SET_SZ:
+                                rc = RTFileSetSize(pJob->Hnd.u.hFile, pJob->cbTestSet);
+                                break;
+                            case IOPERFTESTSETPREP_SET_ALLOC_SZ:
+                                rc = RTFileSetAllocationSize(pJob->Hnd.u.hFile, pJob->cbTestSet, RTFILE_ALLOC_SIZE_F_DEFAULT);
+                                break;
+                            default:
+                                AssertMsgFailed(("Invalid file preparation method: %d\n", enmPrepMethod));
+                        }
+
                         if (RT_SUCCESS(rc))
                         {
-                            /* Create I/O queue. */
-                            PCRTIOQUEUEPROVVTABLE pIoQProv = NULL;
-                            if (!pszIoEngine)
-                                pIoQProv = RTIoQueueProviderGetBestForHndType(RTHANDLETYPE_FILE);
-                            else
-                                pIoQProv = RTIoQueueProviderGetById(pszIoEngine);
-
-                            if (RT_LIKELY(pIoQProv))
+                            rc = ioPerfJobTestSetPrep(pJob);
+                            if (RT_SUCCESS(rc))
                             {
-                                rc = RTIoQueueCreate(&pJob->hIoQueue, pIoQProv, 0 /*fFlags*/, cReqsMax, cReqsMax);
-                                if (RT_SUCCESS(rc))
+                                /* Create I/O queue. */
+                                PCRTIOQUEUEPROVVTABLE pIoQProv = NULL;
+                                if (!pszIoEngine)
+                                    pIoQProv = RTIoQueueProviderGetBestForHndType(RTHANDLETYPE_FILE);
+                                else
+                                    pIoQProv = RTIoQueueProviderGetById(pszIoEngine);
+
+                                if (RT_LIKELY(pIoQProv))
                                 {
-                                    rc = RTIoQueueHandleRegister(pJob->hIoQueue, &pJob->Hnd);
+                                    rc = RTIoQueueCreate(&pJob->hIoQueue, pIoQProv, 0 /*fFlags*/, cReqsMax, cReqsMax);
                                     if (RT_SUCCESS(rc))
                                     {
-                                        /* Spin up the worker thread. */
-                                        if (pMaster)
-                                            rc = RTThreadCreateF(&pJob->hThread, ioPerfJobThread, pJob, 0,
-                                                                 RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "ioperf-%u", idJob);
-
+                                        rc = RTIoQueueHandleRegister(pJob->hIoQueue, &pJob->Hnd);
                                         if (RT_SUCCESS(rc))
-                                            return VINF_SUCCESS;
+                                        {
+                                            /* Spin up the worker thread. */
+                                            if (pMaster)
+                                                rc = RTThreadCreateF(&pJob->hThread, ioPerfJobThread, pJob, 0,
+                                                                     RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "ioperf-%u", idJob);
+
+                                            if (RT_SUCCESS(rc))
+                                                return VINF_SUCCESS;
+                                        }
                                     }
                                 }
+                                else
+                                    rc = VERR_NOT_SUPPORTED;
                             }
-                            else
-                                rc = VERR_NOT_SUPPORTED;
+
+                            RTRandAdvDestroy(pJob->hRand);
                         }
 
-                        RTRandAdvDestroy(pJob->hRand);
+                        RTFileClose(pJob->Hnd.u.hFile);
+                        RTFileDelete(pJob->pszFilename);
                     }
 
-                    RTFileClose(pJob->Hnd.u.hFile);
-                    RTFileDelete(pJob->pszFilename);
+                    RTStrFree(pJob->pszFilename);
                 }
-
-                RTStrFree(pJob->pszFilename);
+                else
+                    rc = VERR_NO_STR_MEMORY;
+
+                RTMemPageFree(pJob->pvIoReqReadBuf, pJob->cbIoReqReadBuf);
             }
-
-            RTMemPageFree(pJob->pvIoReqReadBuf, pJob->cbIoReqReadBuf);
+            else
+                rc = VERR_NO_MEMORY;
+
+            RTMemFree(pJob->paReqStats);
         }
         else
-            rc = VERR_NO_STR_MEMORY;
-    }
+            rc = VERR_NO_MEMORY;
+    }
+    else
+        rc = VERR_NO_MEMORY;
 
     return rc;
@@ -1001 +1100 @@
     RTMemPageFree(pJob->pvIoReqReadBuf, pJob->cbIoReqReadBuf);
     RTMemFree(pJob->paIoReqs);
+    RTMemFree(pJob->paReqStats);
     return VINF_SUCCESS;
 }