msvclibx/clock_gettime: add CLOCK_MONOTONIC to msvclibx

deps/MsvcLibX/include/msvcTime.h

@@ -38,6 +38,7 @@
 typedef int clockid_t;
 /* Supported values for clockid_t */
 #define CLOCK_REALTIME 0
+#define CLOCK_MONOTONIC 1
 
 int clock_gettime(clockid_t clock_id, struct timespec *tp);
 

deps/MsvcLibX/src/clock_gettime.c

@@ -34,15 +34,56 @@
 #include "msvcTime.h"
 #include "sys/msvcStat.h" /* For MsvcLibX's Filetime2Timespec */
 
-int clock_gettime(clockid_t clock_id, struct timespec *pTS) {
+#define MS_PER_SEC      1000ULL     // MS = milliseconds
-  FILETIME ft;
+#define US_PER_MS       1000ULL     // US = microseconds
-  if (clock_id != CLOCK_REALTIME) {
+#define HNS_PER_US      10ULL       // HNS = hundred-nanoseconds (e.g., 1 hns = 100 ns)
-    errno = EINVAL;
+#define NS_PER_US       1000ULL
-    return -1;
+
+#define HNS_PER_SEC     (MS_PER_SEC * US_PER_MS * HNS_PER_US)
+#define NS_PER_HNS      (100ULL)    // NS = nanoseconds
+#define NS_PER_SEC      (MS_PER_SEC * US_PER_MS * NS_PER_US)
+
+int clock_gettime_monotonic(struct timespec *tv) {
+  static LARGE_INTEGER ticksPerSec;
+  LARGE_INTEGER ticks;
+  double seconds;
+
+  if (!ticksPerSec.QuadPart) {
+    QueryPerformanceFrequency(&ticksPerSec);
+    if (!ticksPerSec.QuadPart) {
+      errno = ENOTSUP;
+      return -1;
+    }
   }
-  GetSystemTimeAsFileTime(&ft);
+
-  Filetime2Timespec(&ft, pTS);
+  QueryPerformanceCounter(&ticks);
+
+  seconds = (double) ticks.QuadPart / (double) ticksPerSec.QuadPart;
+  tv->tv_sec = (time_t)seconds;
+  tv->tv_nsec = (long)((ULONGLONG)(seconds * NS_PER_SEC) % NS_PER_SEC);
+
   return 0;
 }
 
+int clock_gettime_realtime(struct timespec *pTS) {
+  FILETIME ft;
+
+  GetSystemTimeAsFileTime(&ft);
+  Filetime2Timespec(&ft, pTS);
+
+  return 0;
+}
+
+int clock_gettime(clockid_t clock_id, struct timespec *pTS) {
+  if (clock_id == CLOCK_MONOTONIC) {
+    return clock_gettime_monotonic(pTS);
+  } else if (clock_id == CLOCK_REALTIME) {
+    return clock_gettime_realtime(pTS);
+  }
+
+  errno = ENOTSUP;
+
+  return -1;
+}
+
 #endif /* defined(_WIN32) */

deps/rmonotonic/CMakeLists.txt

@@ -4,3 +4,4 @@ add_definitions(-DUSE_PROCESSOR_CLOCK)
 
 ADD_LIBRARY(rmonotonic ${SOURCE_LIST})
 TARGET_INCLUDE_DIRECTORIES(rmonotonic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc)
+TARGET_LINK_LIBRARIES(rmonotonic MsvcLibXw)

deps/rmonotonic/inc/monotonic.h

@@ -15,6 +15,10 @@
 #include <stdint.h>
 //#include <unistd.h>
 
+#if defined(_WIN32) || defined(_WIN64)
+  #define inline
+#endif
+
 /* A counter in micro-seconds.  The 'monotime' type is provided for variables
  * holding a monotonic time.  This will help distinguish & document that the
  * variable is associated with the monotonic clock and should not be confused

deps/rmonotonic/src/clock_gettime_win.c

@@ -1,72 +0,0 @@
-#if defined(_WIN32) || defined(_WIN64)
-#include <windows.h>
-#include <time.h>
-
-#define MS_PER_SEC      1000ULL     // MS = milliseconds
-#define US_PER_MS       1000ULL     // US = microseconds
-#define HNS_PER_US      10ULL       // HNS = hundred-nanoseconds (e.g., 1 hns = 100 ns)
-#define NS_PER_US       1000ULL
-
-#define HNS_PER_SEC     (MS_PER_SEC * US_PER_MS * HNS_PER_US)
-#define NS_PER_HNS      (100ULL)    // NS = nanoseconds
-#define NS_PER_SEC      (MS_PER_SEC * US_PER_MS * NS_PER_US)
-
-int clock_gettime_monotonic(struct timespec *tv)
-{
-    static LARGE_INTEGER ticksPerSec;
-    LARGE_INTEGER ticks;
-    double seconds;
-
-    if (!ticksPerSec.QuadPart) {
-        QueryPerformanceFrequency(&ticksPerSec);
-        if (!ticksPerSec.QuadPart) {
-            errno = ENOTSUP;
-            return -1;
-        }
-    }
-
-    QueryPerformanceCounter(&ticks);
-
-    seconds = (double) ticks.QuadPart / (double) ticksPerSec.QuadPart;
-    tv->tv_sec = (time_t)seconds;
-    tv->tv_nsec = (long)((ULONGLONG)(seconds * NS_PER_SEC) % NS_PER_SEC);
-
-    return 0;
-}
-
-int clock_gettime_realtime(struct timespec *tv)
-{
-    FILETIME ft;
-    ULARGE_INTEGER hnsTime;
-
-    GetSystemTimeAsFileTime(&ft);
-
-    hnsTime.LowPart = ft.dwLowDateTime;
-    hnsTime.HighPart = ft.dwHighDateTime;
-
-    // To get POSIX Epoch as baseline, subtract the number of hns intervals from Jan 1, 1601 to Jan 1, 1970.
-    hnsTime.QuadPart -= (11644473600ULL * HNS_PER_SEC);
-
-    // modulus by hns intervals per second first, then convert to ns, as not to lose resolution
-    tv->tv_nsec = (long) ((hnsTime.QuadPart % HNS_PER_SEC) * NS_PER_HNS);
-    tv->tv_sec = (long) (hnsTime.QuadPart / HNS_PER_SEC);
-
-    return 0;
-}
-
-int clock_gettime(clockid_t type, struct timespec *tp)
-{
-    if (type == CLOCK_MONOTONIC)
-    {
-        return clock_gettime_monotonic(tp);
-    }
-    else if (type == CLOCK_REALTIME)
-    {
-        return clock_gettime_realtime(tp);
-    }
-
-    errno = ENOTSUP;
-    return -1;
-}
-
-#endif

deps/rmonotonic/src/monotonic.c

@@ -7,6 +7,8 @@
 #undef NDEBUG
 #include <assert.h>
 
+#include "msvcTime.h"
+#include "msvcStdio.h"
 
 /* The function pointer for clock retrieval.  */
 monotime (*getMonotonicUs)(void) = NULL;
@@ -129,8 +131,7 @@ static void monotonicInit_aarch64() {
 }
 #endif
 
-
+static monotime getMonotonicUs_posix(void) {
-static monotime getMonotonicUs_posix() {
     /* clock_gettime() is specified in POSIX.1b (1993).  Even so, some systems
      * did not support this until much later.  CLOCK_MONOTONIC is technically
      * optional and may not be supported - but it appears to be universal.