From 7d0c9b50604e80c0959eb4fad98c811931eb8d93 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Tue, 20 Aug 2013 22:27:14 +1000 Subject: [PATCH] Rename cgsleep_prepare_r as cgtimer_time to get time in cgtimer_t format and call cgsleep_prepare_r as a macro for cgtimer_time --- util.c | 4 ++-- util.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/util.c b/util.c index f0b39c91..f2272ab0 100644 --- a/util.c +++ b/util.c @@ -886,7 +886,7 @@ void timeraddspec(struct timespec *a, const struct timespec *b) /* These are cgminer specific sleep functions that use an absolute nanosecond * resolution timer to avoid poor usleep accuracy and overruns. */ #ifndef WIN32 -void cgsleep_prepare_r(cgtimer_t *ts_start) +void cgtimer_time(cgtimer_t *ts_start) { clock_gettime(CLOCK_MONOTONIC, ts_start); } @@ -922,7 +922,7 @@ void cgsleep_us_r(cgtimer_t *ts_start, int64_t us) } #else -void cgsleep_prepare_r(cgtimer_t *ts_start) +void cgtimer_time(cgtimer_t *ts_start) { cgtime(ts_start); } diff --git a/util.h b/util.h index 08eeaf71..d864bc5a 100644 --- a/util.h +++ b/util.h @@ -86,7 +86,8 @@ void ms_to_timespec(struct timespec *spec, int64_t ms); void timeraddspec(struct timespec *a, const struct timespec *b); void cgsleep_ms(int ms); void cgsleep_us(int64_t us); -void cgsleep_prepare_r(cgtimer_t *ts_start); +void cgtimer_time(cgtimer_t *ts_start); +#define cgsleep_prepare_r(ts_start) cgtimer_time(ts_start) void cgsleep_ms_r(cgtimer_t *ts_start, int ms); void cgsleep_us_r(cgtimer_t *ts_start, int64_t us); double us_tdiff(struct timeval *end, struct timeval *start);