Changeset 96506 in vbox

Timestamp:

Aug 25, 2022 10:44:36 PM (2 years ago)

Author:

vboxsync

Message:

ValKit/rdtsc.cpp: Made it build in no-CRT mode. bugref:10261

File:

• trunk/src/VBox/ValidationKit/utils/cpu/rdtsc.cpp (modified) (14 diffs)

trunk/src/VBox/ValidationKit/utils/cpu/rdtsc.cpp

@@ -39 +39 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/types.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
+#include <iprt/errcore.h>
+#include <iprt/initterm.h>
+#include <iprt/message.h>
+#include <iprt/stream.h>
+#include <iprt/string.h>
+#include <iprt/time.h>
 
 
@@ -79 +81 @@
 int main(int argc, char **argv)
 {
+    int rc = RTR3InitExe(argc, &argv, 0);
+    if (RT_FAILURE(rc))
+        return RTMsgInitFailure(rc);
 
     /*
@@ -99 +104 @@
                 /* Option value. */
                 const char *pszValue = NULL;
-                unsigned long uValue = 0;
+                uint64_t    uValue = 0;
                 switch (chOpt)
                 {
@@ -108 +113 @@
                         {
                             if (i + 1 >= argc)
-                            {
-                                printf("syntax error: The %c option requires a value\n", chOpt);
-                                return RTEXITCODE_SYNTAX;
-                            }
+                                return RTMsgSyntax("The %c option requires a value", chOpt);
                             pszValue = argv[++i];
                         }
@@ -123 +125 @@
                             {
                                 char *pszNext = NULL;
-                                uValue = strtoul(pszValue, &pszNext, 0);
+                                rc = RTStrToUInt64Ex(pszValue, &pszNext, 0, &uValue);
+                                if (RT_FAILURE(rc))
+                                    return RTMsgSyntax("Bad number: %s (%Rrc)", pszValue, rc);
                                 if (pszNext && *pszNext != '\0')
                                 {
@@ -133 +137 @@
                                         uValue *= _1G;
                                     else
-                                    {
-                                        printf("syntax error: Bad value format for option %c: %s\n", chOpt, pszValue);
-                                        return RTEXITCODE_SYNTAX;
-                                    }
+                                        return RTMsgSyntax("Bad value format for option %c: %s", chOpt, pszValue);
                                 }
                                 break;
@@ -161 +162 @@
                     case 'h':
                     case '?':
-                        printf("usage: rdtsc [-l <loops>] [-s <loops-between-status>]\n"
-                               "             [-m <minimum-seconds-to-run>]\n");
+                        RTPrintf("usage: rdtsc [-l <loops>] [-s <loops-between-status>]\n"
+                                 "             [-m <minimum-seconds-to-run>]\n");
                         return RTEXITCODE_SUCCESS;
 
                     default:
-                        printf("syntax error: Unknown option %c (argument %d)\n", chOpt, i);
-                        return RTEXITCODE_SYNTAX;
+                        return RTMsgSyntax("Unknown option %c (argument %d)\n", chOpt, i);
                 }
             }
         }
         else
-        {
-            printf("synatx error: argument %d (%s): not an option\n", i, psz);
-            return RTEXITCODE_SYNTAX;
-        }
+            return RTMsgSyntax("argument %d (%s): not an option\n", i, psz);
     }
 
@@ -181 +178 @@
      * Do the job.
      */
-    time_t          uSecStart;
-    time(&uSecStart);
+    uint64_t const  nsTsStart          = RTTimeNanoTS();
     unsigned        cOuterLoops        = 0;
     unsigned        cLoopsToNextStatus = cStatusEvery;
@@ -224 +220 @@
                             if ((uint64_t)offDelta > offMaxJump)
                                 offMaxJump = offDelta;
-                            printf("%u/%u: Jump: %#010x`%08x -> %#010x`%08x\n", cOuterLoops, iLoop,
-                                   (unsigned)g_aRdTscResults[i].uHigh, (unsigned)g_aRdTscResults[i].uLow,
-                                   (unsigned)g_aRdTscResults[i + 1].uHigh, (unsigned)g_aRdTscResults[i + 1].uLow);
+                            RTPrintf("%u/%u: Jump: %#010x`%08x -> %#010x`%08x\n", cOuterLoops, iLoop,
+                                     (unsigned)g_aRdTscResults[i].uHigh, (unsigned)g_aRdTscResults[i].uLow,
+                                     (unsigned)g_aRdTscResults[i + 1].uHigh, (unsigned)g_aRdTscResults[i + 1].uLow);
                         }
                     }
@@ -232 +228 @@
                     {
                         cBackwards++;
-                        printf("%u/%u: Back: %#010x`%08x -> %#010x`%08x\n", cOuterLoops, iLoop,
-                               (unsigned)g_aRdTscResults[i].uHigh, (unsigned)g_aRdTscResults[i].uLow,
-                               (unsigned)g_aRdTscResults[i + 1].uHigh, (unsigned)g_aRdTscResults[i + 1].uLow);
+                        RTPrintf("%u/%u: Back: %#010x`%08x -> %#010x`%08x\n", cOuterLoops, iLoop,
+                                 (unsigned)g_aRdTscResults[i].uHigh, (unsigned)g_aRdTscResults[i].uLow,
+                                 (unsigned)g_aRdTscResults[i + 1].uHigh, (unsigned)g_aRdTscResults[i + 1].uLow);
                     }
                 }
@@ -240 +236 @@
                 {
                     cSame++;
-                    printf("%u/%u: Same: %#010x`%08x -> %#010x`%08x\n", cOuterLoops, iLoop,
-                           (unsigned)g_aRdTscResults[i].uHigh, (unsigned)g_aRdTscResults[i].uLow,
-                           (unsigned)g_aRdTscResults[i + 1].uHigh, (unsigned)g_aRdTscResults[i + 1].uLow);
+                    RTPrintf("%u/%u: Same: %#010x`%08x -> %#010x`%08x\n", cOuterLoops, iLoop,
+                             (unsigned)g_aRdTscResults[i].uHigh, (unsigned)g_aRdTscResults[i].uLow,
+                             (unsigned)g_aRdTscResults[i + 1].uHigh, (unsigned)g_aRdTscResults[i + 1].uLow);
                 }
 #if ARCH_BITS == 64
@@ -259 +255 @@
             {
                 cLoopsToNextStatus = cStatusEvery;
-                printf("%u/%u: %#010x`%08x\n", cOuterLoops, iLoop,
-                       (unsigned)g_aRdTscResults[cResults].uHigh, (unsigned)g_aRdTscResults[cResults].uLow);
+                RTPrintf("%u/%u: %#010x`%08x\n", cOuterLoops, iLoop,
+                         (unsigned)g_aRdTscResults[cResults].uHigh, (unsigned)g_aRdTscResults[cResults].uLow);
             }
         }
@@ -270 +266 @@
         if (!cMinSeconds)
             break;
-        time_t uSecNow;
-        if (   time(&uSecNow) == (time_t)-1
-            || uSecNow        == (time_t)-1
-            || uSecStart      == (time_t)-1
-            || uSecNow - uSecStart >= (time_t)cMinSeconds)
+        uint64_t nsElapsed = RTTimeNanoTS() - nsTsStart;
+        if (nsElapsed >= cMinSeconds * RT_NS_1SEC_64)
             break;
     }
@@ -283 +276 @@
     if (cBackwards == 0 && cSame == 0 && cJumps == 0 && cBadValues == 0)
     {
-        printf("rdtsc: Success (%u RDTSC over %u*%u loops, deltas: %#x`%08x..%#x`%08x)\n",
-               cRdTscInstructions, cOuterLoops, cMaxLoops,
-               (unsigned)(offMinIncr >> 32), (unsigned)offMinIncr, (unsigned)(offMaxIncr >> 32), (unsigned)offMaxIncr);
+        RTPrintf("rdtsc: Success (%u RDTSC over %u*%u loops, deltas: %#x`%08x..%#x`%08x)\n",
+                 cRdTscInstructions, cOuterLoops, cMaxLoops,
+                 (unsigned)(offMinIncr >> 32), (unsigned)offMinIncr, (unsigned)(offMaxIncr >> 32), (unsigned)offMaxIncr);
         return RTEXITCODE_SUCCESS;
     }
-    printf("RDTSC instructions: %u\n", cRdTscInstructions);
-    printf("Loops:              %u * %u => %u\n", cMaxLoops, cOuterLoops, cOuterLoops * cMaxLoops);
-    printf("Backwards:          %u\n", cBackwards);
-    printf("Jumps:              %u\n", cJumps);
-    printf("Max jumps:          %#010x`%08x\n", (unsigned)(offMaxJump >> 32), (unsigned)offMaxJump);
-    printf("Same value:         %u\n", cSame);
-    printf("Bad values:         %u\n", cBadValues);
-    printf("Min increment:      %#010x`%08x\n", (unsigned)(offMinIncr >> 32), (unsigned)offMinIncr);
-    printf("Max increment:      %#010x`%08x\n", (unsigned)(offMaxIncr >> 32), (unsigned)offMaxIncr);
+    RTPrintf("RDTSC instructions: %u\n", cRdTscInstructions);
+    RTPrintf("Loops:              %u * %u => %u\n", cMaxLoops, cOuterLoops, cOuterLoops * cMaxLoops);
+    RTPrintf("Backwards:          %u\n", cBackwards);
+    RTPrintf("Jumps:              %u\n", cJumps);
+    RTPrintf("Max jumps:          %#010x`%08x\n", (unsigned)(offMaxJump >> 32), (unsigned)offMaxJump);
+    RTPrintf("Same value:         %u\n", cSame);
+    RTPrintf("Bad values:         %u\n", cBadValues);
+    RTPrintf("Min increment:      %#010x`%08x\n", (unsigned)(offMinIncr >> 32), (unsigned)offMinIncr);
+    RTPrintf("Max increment:      %#010x`%08x\n", (unsigned)(offMaxIncr >> 32), (unsigned)offMaxIncr);
     return RTEXITCODE_FAILURE;
 }