summaryrefslogtreecommitdiff
path: root/src/libstddjb/tain_now.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2019-09-03 18:07:28 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2019-09-03 18:07:28 +0000
commite69717d9e0cd107f461abff85f255be82d7bd69b (patch)
treea1158470fe0ea9afea4fb95e974464ac61fe058e /src/libstddjb/tain_now.c
parent2aa26bce30a3a1d46979a011d85928dda927932c (diff)
downloadskalibs-e69717d9e0cd107f461abff85f255be82d7bd69b.tar.xz
Big wallclock/stopwatch refactor. It was long overdue.
* --enable-clock and --enable-monotonic are gone * tain_sysclock() has been renamed tain_wallclock_read() * tain_wallclock_read() reads from CLOCK_REALTIME (or gettimeofday()) * tain_clockmon[_init]() have been renamed to tain_stopwatch_[read|init]() and now accept a monotonic clock name as an extra argument * tain_now() points to the system (wall) clock by default * tain_now_set_[stopwatch|wallclock]() can be used to switch Now to make a pass on all skarnet.org programs and add a tain_now_set_stopwatch() call everywhere needed... >.>
Diffstat (limited to 'src/libstddjb/tain_now.c')
-rw-r--r--src/libstddjb/tain_now.c44
1 files changed, 1 insertions, 43 deletions
diff --git a/src/libstddjb/tain_now.c b/src/libstddjb/tain_now.c
index 157087a..d6625d6 100644
--- a/src/libstddjb/tain_now.c
+++ b/src/libstddjb/tain_now.c
@@ -2,48 +2,6 @@
/* MT-unsafe */
-#include <skalibs/config.h>
-#include <skalibs/sysdeps.h>
#include <skalibs/tai.h>
-#ifdef SKALIBS_FLAG_USEMON
-# ifndef SKALIBS_HASCLOCKMON
-# undef SKALIBS_FLAG_USEMON
-# warning "SKALIBS_FLAG_USEMON set but SKALIBS_HASCLOCKMON not found. Clearing SKALIBS_FLAG_USEMON."
-# endif
-#endif
-
-
-#ifdef SKALIBS_FLAG_USEMON
-
-static tain_t offset ;
-
-int tain_init ()
-{
- return tain_clockmon_init(&offset) ;
-}
-
-int tain_now (tain_t *a)
-{
- static int initted = 0 ;
- if (!initted)
- {
- if (!tain_clockmon_init(&offset)) return 0 ;
- initted = 1 ;
- }
- return tain_clockmon(a, &offset) ;
-}
-
-#else
-
-int tain_init ()
-{
- return 1 ;
-}
-
-int tain_now (tain_t *a)
-{
- return tain_sysclock(a) ;
-}
-
-#endif
+tain_clockread_func_t_ref tain_now = &tain_wallclock_read ;