From b85d550a552d485f4a7f1eedbc00bdf1f67d6263 Mon Sep 17 00:00:00 2001 From: Kotresh HR Date: Tue, 20 Aug 2019 15:49:40 +0530 Subject: ctime: Fix incorrect realtime passed to frame->root->ctime On systems that don't support "timespec_get"(e.g., centos6), it was using "clock_gettime" with "CLOCK_MONOTONIC" to get unix epoch time which is incorrect. This patch introduces "timespec_now_realtime" which uses "clock_gettime" with "CLOCK_REALTIME" which fixes the issue. Backport of: > Patch: https://review.gluster.org/23274/ > Change-Id: I57be35ce442d7e05319e82112b687eb4f28d7612 > Signed-off-by: Kotresh HR > BUG: 1743652 (cherry picked from commit d14d0749340d9cb1ef6fc4b35f2fb3015ed0339d) Change-Id: I57be35ce442d7e05319e82112b687eb4f28d7612 Signed-off-by: Kotresh HR fixes: bz#1746145 --- libglusterfs/src/glusterfs/timespec.h | 2 ++ libglusterfs/src/libglusterfs.sym | 1 + libglusterfs/src/timespec.c | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+) (limited to 'libglusterfs') diff --git a/libglusterfs/src/glusterfs/timespec.h b/libglusterfs/src/glusterfs/timespec.h index 871871d538c..bb9ab446a5f 100644 --- a/libglusterfs/src/glusterfs/timespec.h +++ b/libglusterfs/src/glusterfs/timespec.h @@ -21,6 +21,8 @@ void timespec_now(struct timespec *ts); void +timespec_now_realtime(struct timespec *ts); +void timespec_adjust_delta(struct timespec *ts, struct timespec delta); void timespec_sub(const struct timespec *begin, const struct timespec *end, diff --git a/libglusterfs/src/libglusterfs.sym b/libglusterfs/src/libglusterfs.sym index 92f05946176..0de3836efc5 100644 --- a/libglusterfs/src/libglusterfs.sym +++ b/libglusterfs/src/libglusterfs.sym @@ -1074,6 +1074,7 @@ sys_accept tbf_init tbf_throttle timespec_now +timespec_now_realtime timespec_sub timespec_adjust_delta timespec_cmp diff --git a/libglusterfs/src/timespec.c b/libglusterfs/src/timespec.c index 1b7cff37eb6..96cef5c6f07 100644 --- a/libglusterfs/src/timespec.c +++ b/libglusterfs/src/timespec.c @@ -69,6 +69,28 @@ timespec_now(struct timespec *ts) #endif /* Platform verification */ } +void +timespec_now_realtime(struct timespec *ts) +{ +#if defined GF_LINUX_HOST_OS || defined GF_SOLARIS_HOST_OS || \ + defined GF_BSD_HOST_OS + if (0 == clock_gettime(CLOCK_REALTIME, ts)) { + return; + } +#endif + + /* Fall back to gettimeofday()*/ + struct timeval tv = { + 0, + }; + if (0 == gettimeofday(&tv, NULL)) { + TIMEVAL_TO_TIMESPEC(&tv, ts); + return; + } + + return; +} + void timespec_adjust_delta(struct timespec *ts, struct timespec delta) { -- cgit