Consolidate QueryPerformanceCounter/GetTickCount usages to minipal/time.h (#115408)

Remove the duplicated implementations and use minipal/time.h as single source of truth.

Not touching a bit ifdef'd-out instances, which are supposed for local debug usages only.

Co-authored-by: Jan Kotas <[email protected]>

Author: 2 people

src/coreclr/System.Private.CoreLib/src/System/Environment.CoreCLR.cs

@@ -108,21 +108,5 @@ private static unsafe string[] InitializeCommandLineArgs(char* exePath, int argc
 
         // Used by VM
         internal static string? GetResourceStringLocal(string key) => SR.GetResourceString(key);
-
-        /// <summary>Gets the number of milliseconds elapsed since the system started.</summary>
-        /// <value>A 32-bit signed integer containing the amount of time in milliseconds that has passed since the last time the computer was started.</value>
-        public static extern int TickCount
-        {
-            [MethodImpl(MethodImplOptions.InternalCall)]
-            get;
-        }
-
-        /// <summary>Gets the number of milliseconds elapsed since the system started.</summary>
-        /// <value>A 64-bit signed integer containing the amount of time in milliseconds that has passed since the last time the computer was started.</value>
-        public static extern long TickCount64
-        {
-            [MethodImpl(MethodImplOptions.InternalCall)]
-            get;
-        }
     }
 }

src/coreclr/classlibnative/bcltype/system.cpp

@@ -32,24 +32,6 @@
 
 #include <minipal/cpuid.h>
 
-
-FCIMPL0(UINT32, SystemNative::GetTickCount)
-{
-    FCALL_CONTRACT;
-
-    return ::GetTickCount();
-}
-FCIMPLEND;
-
-FCIMPL0(UINT64, SystemNative::GetTickCount64)
-{
-    FCALL_CONTRACT;
-
-    return ::GetTickCount64();
-}
-FCIMPLEND;
-
-
 extern "C" VOID QCALLTYPE Environment_Exit(INT32 exitcode)
 {
     QCALL_CONTRACT;

src/coreclr/classlibnative/bcltype/system.h

@@ -37,9 +37,6 @@ class SystemNative
 
 public:
     // Functions on the System.Environment class
-    static FCDECL0(UINT32, GetTickCount);
-    static FCDECL0(UINT64, GetTickCount64);
-
     static FCDECL1(VOID,SetExitCode,INT32 exitcode);
     static FCDECL0(INT32, GetExitCode);
 

src/coreclr/debug/createdump/config.h.in

@@ -4,5 +4,3 @@
 #pragma once
 
 #cmakedefine HAVE_PROCESS_VM_READV
-#cmakedefine01 HAVE_CLOCK_GETTIME_NSEC_NP
-#cmakedefine01 HAVE_CLOCK_MONOTONIC

src/coreclr/debug/createdump/configure.cmake

@@ -1,22 +1,3 @@
 check_function_exists(process_vm_readv HAVE_PROCESS_VM_READV)
 
-check_symbol_exists(
-    clock_gettime_nsec_np
-    time.h
-    HAVE_CLOCK_GETTIME_NSEC_NP)
-
-check_cxx_source_runs("
-#include <stdlib.h>
-#include <time.h>
-#include <sys/time.h>
-
-int main()
-{
-  int ret;
-  struct timespec ts;
-  ret = clock_gettime(CLOCK_MONOTONIC, &ts);
-
-  exit(ret);
-}" HAVE_CLOCK_MONOTONIC)
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)

src/coreclr/debug/createdump/createdumpmain.cpp

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 #include "createdump.h"
+#include "minipal/time.h"
 
 #ifdef HOST_WINDOWS
 #define DEFAULT_DUMP_PATH "%TEMP%\\"
@@ -45,8 +46,6 @@ bool g_diagnostics = false;
 bool g_diagnosticsVerbose = false;
 uint64_t g_ticksPerMS = 0;
 uint64_t g_startTime = 0;
-uint64_t GetTickFrequency();
-uint64_t GetTimeStamp();
 
 //
 // Common entry point
@@ -198,8 +197,8 @@ int createdump_main(const int argc, const char* argv[])
         return -1;
     }
 
-    g_ticksPerMS = GetTickFrequency() / 1000UL;
-    g_startTime = GetTimeStamp();
+    g_ticksPerMS = minipal_hires_tick_frequency() / 1000UL;
+    g_startTime = minipal_hires_ticks();
     TRACE("TickFrequency: %d ticks per ms\n", g_ticksPerMS);
 
     ArrayHolder<char> tmpPath = new char[MAX_LONGPATH];
@@ -221,11 +220,11 @@ int createdump_main(const int argc, const char* argv[])
 
     if (CreateDump(options))
     {
-        printf_status("Dump successfully written in %llums\n", GetTimeStamp() - g_startTime);
+        printf_status("Dump successfully written in %llums\n", (minipal_hires_ticks() - g_startTime) / g_ticksPerMS);
     }
     else
     {
-        printf_error("Failure took %llums\n", GetTimeStamp() - g_startTime);
+        printf_error("Failure took %llums\n", (minipal_hires_ticks() - g_startTime) / g_ticksPerMS);
         exitCode = -1;
     }
 
@@ -332,24 +331,6 @@ printf_error(const char* format, ...)
     va_end(args);
 }
 
-uint64_t
-GetTickFrequency()
-{
-    LARGE_INTEGER ret;
-    ZeroMemory(&ret, sizeof(LARGE_INTEGER));
-    QueryPerformanceFrequency(&ret);
-    return ret.QuadPart;
-}
-
-uint64_t
-GetTimeStamp()
-{
-    LARGE_INTEGER ret;
-    ZeroMemory(&ret, sizeof(LARGE_INTEGER));
-    QueryPerformanceCounter(&ret);
-    return ret.QuadPart / g_ticksPerMS;
-}
-
 #ifdef HOST_UNIX
 
 static void
@@ -360,7 +341,7 @@ trace_prefix(const char* format, va_list args)
     {
         fprintf(g_stdout, "[createdump] ");
     }
-    fprintf(g_stdout, "%08" PRIx64 " ", GetTimeStamp());
+    fprintf(g_stdout, "%08" PRIx64 " ", minipal_hires_ticks() / g_ticksPerMS);
     vfprintf(g_stdout, format, args);
     fflush(g_stdout);
 }

src/coreclr/debug/createdump/createdumppal.cpp

@@ -96,52 +96,6 @@ UninitializePAL(
     }
 }
 
-#define tccSecondsToNanoSeconds 1000000000      // 10^9
-
-BOOL
-PALAPI
-QueryPerformanceCounter(
-    OUT LARGE_INTEGER* lpPerformanceCount)
-{
-#if HAVE_CLOCK_GETTIME_NSEC_NP
-    lpPerformanceCount->QuadPart = (LONGLONG)clock_gettime_nsec_np(CLOCK_UPTIME_RAW);
-#elif HAVE_CLOCK_MONOTONIC
-    struct timespec ts;
-    int result = clock_gettime(CLOCK_MONOTONIC, &ts);
-    if (result != 0)
-    {
-        return TRUE;
-    }
-    else
-    {
-        lpPerformanceCount->QuadPart = ((LONGLONG)(ts.tv_sec) * (LONGLONG)(tccSecondsToNanoSeconds)) + (LONGLONG)(ts.tv_nsec);
-    }
-#else
-    #error "The createdump requires either mach_absolute_time() or clock_gettime(CLOCK_MONOTONIC) to be supported."
-#endif
-    return TRUE;
-}
-
-BOOL
-PALAPI
-QueryPerformanceFrequency(
-    OUT LARGE_INTEGER* lpFrequency)
-{
-#if HAVE_CLOCK_GETTIME_NSEC_NP
-    lpFrequency->QuadPart = (LONGLONG)(tccSecondsToNanoSeconds);
-#elif HAVE_CLOCK_MONOTONIC
-    // clock_gettime() returns a result in terms of nanoseconds rather than a count. This
-    // means that we need to either always scale the result by the actual resolution (to
-    // get a count) or we need to say the resolution is in terms of nanoseconds. We prefer
-    // the latter since it allows the highest throughput and should minimize error propagated
-    // to the user.
-    lpFrequency->QuadPart = (LONGLONG)(tccSecondsToNanoSeconds);
-#else
-    #error "The createdump requires either mach_absolute_time() or clock_gettime(CLOCK_MONOTONIC) to be supported."
-#endif
-    return TRUE;
-}
-
 #define TEMP_DIRECTORY_PATH "/tmp/"
 
 DWORD

src/coreclr/dlls/mscordac/mscordac_unixexports.src

@@ -113,8 +113,6 @@ nativeStringResourceTable_mscorrc
 #OutputDebugStringW
 #OpenEventW
 #OutputDebugStringA
-#QueryPerformanceCounter
-#QueryPerformanceFrequency
 #RaiseException
 #RaiseFailFastException
 #ReadFile

src/coreclr/gc/CMakeLists.txt

@@ -85,12 +85,14 @@ if(CLR_CMAKE_HOST_WIN32)
     advapi32.lib)
 endif(CLR_CMAKE_HOST_WIN32)
 
-set (GC_LINK_LIBRARIES ${GC_LINK_LIBRARIES} gc_pal)
+set (GC_LINK_LIBRARIES
+    ${GC_LINK_LIBRARIES}
+    gc_pal
+    minipal)
 
 if(CLR_CMAKE_TARGET_ARCH_AMD64)
     list(APPEND GC_LINK_LIBRARIES
         gc_vxsort
-        minipal
     )
 endif(CLR_CMAKE_TARGET_ARCH_AMD64)
 

src/coreclr/gc/unix/config.gc.h.in

@@ -17,7 +17,6 @@
 #cmakedefine01 HAVE_SYSCTLBYNAME
 #cmakedefine01 HAVE_PTHREAD_CONDATTR_SETCLOCK
 #cmakedefine01 HAVE_CLOCK_GETTIME_NSEC_NP
-#cmakedefine01 HAVE_CLOCK_MONOTONIC
 #cmakedefine01 HAVE_SCHED_GETAFFINITY
 #cmakedefine01 HAVE_SCHED_SETAFFINITY
 #cmakedefine01 HAVE_PTHREAD_SETAFFINITY_NP

src/coreclr/gc/unix/configure.cmake

@@ -89,20 +89,6 @@ check_symbol_exists(
     time.h
     HAVE_CLOCK_GETTIME_NSEC_NP)
 
-check_cxx_source_runs("
-#include <stdlib.h>
-#include <time.h>
-#include <sys/time.h>
-
-int main()
-{
-  int ret;
-  struct timespec ts;
-  ret = clock_gettime(CLOCK_MONOTONIC, &ts);
-
-  exit(ret);
-}" HAVE_CLOCK_MONOTONIC)
-
 check_symbol_exists(
     posix_madvise
     sys/mman.h

src/coreclr/gc/unix/gcenv.unix.cpp

@@ -24,6 +24,7 @@
 #include "gcconfig.h"
 #include "numasupport.h"
 #include <minipal/thread.h>
+#include <minipal/time.h>
 
 #if HAVE_SWAPCTL
 #include <sys/swap.h>
@@ -1449,22 +1450,7 @@ void GCToOSInterface::GetMemoryStatus(uint64_t restricted_limit, uint32_t* memor
 //  The counter value
 int64_t GCToOSInterface::QueryPerformanceCounter()
 {
-#if HAVE_CLOCK_GETTIME_NSEC_NP
-    return (int64_t)clock_gettime_nsec_np(CLOCK_UPTIME_RAW);
-#elif HAVE_CLOCK_MONOTONIC
-    struct timespec ts;
-    int result = clock_gettime(CLOCK_MONOTONIC, &ts);
-
-    if (result != 0)
-    {
-        assert(!"clock_gettime(CLOCK_MONOTONIC) failed");
-        __UNREACHABLE();
-    }
-
-    return ((int64_t)(ts.tv_sec) * (int64_t)(tccSecondsToNanoSeconds)) + (int64_t)(ts.tv_nsec);
-#else
-#error " clock_gettime(CLOCK_MONOTONIC) or clock_gettime_nsec_np() must be supported."
-#endif
+    return minipal_hires_ticks();
 }
 
 // Get a frequency of the high precision performance counter
@@ -1473,50 +1459,15 @@ int64_t GCToOSInterface::QueryPerformanceCounter()
 int64_t GCToOSInterface::QueryPerformanceFrequency()
 {
     // The counter frequency of gettimeofday is in microseconds.
-    return tccSecondsToNanoSeconds;
+    return minipal_hires_tick_frequency();
 }
 
 // Get a time stamp with a low precision
 // Return:
 //  Time stamp in milliseconds
 uint64_t GCToOSInterface::GetLowPrecisionTimeStamp()
 {
-    uint64_t retval = 0;
-
-#if HAVE_CLOCK_GETTIME_NSEC_NP
-    retval = clock_gettime_nsec_np(CLOCK_UPTIME_RAW) / tccMilliSecondsToNanoSeconds;
-#elif HAVE_CLOCK_MONOTONIC
-    struct timespec ts;
-
-#if HAVE_CLOCK_MONOTONIC_COARSE
-    clockid_t clockType = CLOCK_MONOTONIC_COARSE; // good enough resolution, fastest speed
-#else
-    clockid_t clockType = CLOCK_MONOTONIC;
-#endif
-
-    if (clock_gettime(clockType, &ts) != 0)
-    {
-#if HAVE_CLOCK_MONOTONIC_COARSE
-        assert(!"clock_gettime(HAVE_CLOCK_MONOTONIC_COARSE) failed\n");
-#else
-        assert(!"clock_gettime(CLOCK_MONOTONIC) failed\n");
-#endif
-    }
-
-    retval = (ts.tv_sec * tccSecondsToMilliSeconds) + (ts.tv_nsec / tccMilliSecondsToNanoSeconds);
-#else
-    struct timeval tv;
-    if (gettimeofday(&tv, NULL) == 0)
-    {
-        retval = (tv.tv_sec * tccSecondsToMilliSeconds) + (tv.tv_usec / tccMilliSecondsToMicroSeconds);
-    }
-    else
-    {
-        assert(!"gettimeofday() failed\n");
-    }
-#endif
-
-    return retval;
+    return (uint64_t)minipal_lowres_ticks();
 }
 
 // Gets the total number of processors on the machine, not taking

src/coreclr/ilasm/assembler.h

@@ -644,22 +644,22 @@ typedef FIFO<MethodBody> MethodBodyList;
 
 struct Clockwork
 {
-    DWORD  cBegin;
-    DWORD  cEnd;
-    DWORD  cParsBegin;
-    DWORD  cParsEnd;
-    DWORD  cMDInitBegin;
-    DWORD  cMDInitEnd;
-    DWORD  cMDEmitBegin;
-    DWORD  cMDEmitEnd;
-    DWORD  cMDEmit1;
-    DWORD  cMDEmit2;
-    DWORD  cMDEmit3;
-    DWORD  cMDEmit4;
-    DWORD  cRef2DefBegin;
-    DWORD  cRef2DefEnd;
-    DWORD  cFilegenBegin;
-    DWORD  cFilegenEnd;
+    int64_t  cBegin;
+    int64_t  cEnd;
+    int64_t  cParsBegin;
+    int64_t  cParsEnd;
+    int64_t  cMDInitBegin;
+    int64_t  cMDInitEnd;
+    int64_t  cMDEmitBegin;
+    int64_t  cMDEmitEnd;
+    int64_t  cMDEmit1;
+    int64_t  cMDEmit2;
+    int64_t  cMDEmit3;
+    int64_t  cMDEmit4;
+    int64_t  cRef2DefBegin;
+    int64_t  cRef2DefEnd;
+    int64_t  cFilegenBegin;
+    int64_t  cFilegenEnd;
 };
 
 struct TypeDefDescr