From 1ccc1d4ff569893e462e52b6eb932bbc854d2564 Mon Sep 17 00:00:00 2001 From: Glenn Strauss Date: Mon, 12 Jul 2021 17:10:57 -0400 Subject: [PATCH] [core] log_clock_gettime->clock_gettime for 64-bit map log_clock_gettime() directly to clock_gettime() for 64-bit time_t (on systems with clock_gettime()) --- src/log.c | 5 +++++ src/log.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/log.c b/src/log.c index 0fbf352b..278b66a3 100644 --- a/src/log.c +++ b/src/log.c @@ -24,6 +24,8 @@ unix_time64_t log_epoch_secs = 0; unix_time64_t log_monotonic_secs = 0; +#if !defined(HAVE_CLOCK_GETTIME) || !HAS_TIME_BITS64 + int log_clock_gettime (const int clockid, unix_timespec64_t * const ts) { #ifdef HAVE_CLOCK_GETTIME #if HAS_TIME_BITS64 @@ -63,6 +65,9 @@ int log_clock_gettime_realtime (unix_timespec64_t *ts) { #endif } +#endif /* !defined(HAVE_CLOCK_GETTIME) || !HAS_TIME_BITS64 */ + + /* retry write on EINTR or when not all data was written */ ssize_t write_all(int fd, const void * const buf, size_t count) { ssize_t written = 0; diff --git a/src/log.h b/src/log.h index 6d3e1aee..a1e0d466 100644 --- a/src/log.h +++ b/src/log.h @@ -8,8 +8,13 @@ extern unix_time64_t log_epoch_secs; extern unix_time64_t log_monotonic_secs; +#if defined(HAVE_CLOCK_GETTIME) && HAS_TIME_BITS64 +#define log_clock_gettime(clockid,ts) clock_gettime((clockid),(ts)) +#define log_clock_gettime_realtime(ts) clock_gettime(CLOCK_REALTIME,(ts)) +#else int log_clock_gettime(int clockid, unix_timespec64_t *ts); int log_clock_gettime_realtime (unix_timespec64_t *ts); +#endif ssize_t write_all(int fd, const void* buf, size_t count);