From c60ee10185db5c099d8fc2a16a10d46cacecce31 Mon Sep 17 00:00:00 2001 From: LeoVen Date: Fri, 5 Jul 2019 13:30:07 -0300 Subject: [PATCH] Changing timer_t to cmc_timer to not generate conflicts --- benchmarks/benchmark.c | 2 +- src/utl/test.h | 2 +- src/utl/timer.h | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/benchmarks/benchmark.c b/benchmarks/benchmark.c index 1f81ec9..3a90179 100644 --- a/benchmarks/benchmark.c +++ b/benchmarks/benchmark.c @@ -75,7 +75,7 @@ COLLECTION_GENERATE(HASHMAP, hm, hmap, /* FMOD */, int, int) { \ printf("+------------------------------------------------------------ %10s\n", #NAME); \ printf("+------------------------------------------------------------ \n"); \ - timer_t timer, total; \ + cmc_timer timer, total; \ int r, k, v; \ size_t j; \ \ diff --git a/src/utl/test.h b/src/utl/test.h index 493510f..76aa452 100644 --- a/src/utl/test.h +++ b/src/utl/test.h @@ -98,7 +98,7 @@ static void cmc_test_log(const char *unit_name, const char *current_test, bool a const char *current_test = NULL; \ \ cmc_test_info tinfo = {0}; \ - timer_t timer = {0}; \ + cmc_timer timer = {0}; \ \ tinfo.verbose = VERBOSE; \ \ diff --git a/src/utl/timer.h b/src/utl/timer.h index 7850547..b3b77f3 100644 --- a/src/utl/timer.h +++ b/src/utl/timer.h @@ -15,31 +15,33 @@ #include -typedef struct timer_s +typedef struct cmc_timer_s { clock_t start; clock_t stop; double result; -} timer_t; +} cmc_timer; #define timer_start(timer) \ do \ { \ - (timer).start = clock(); \ + cmc_timer *t = &(timer); \ + t->start = clock(); \ \ } while (0) #define timer_stop(timer) \ do \ { \ - (timer).stop = clock(); \ + cmc_timer *t = &(timer);\ + t->stop = clock(); \ \ } while (0) #define timer_calc(timer) \ do \ { \ - timer_t *t = &(timer); \ + cmc_timer *t = &(timer); \ t->result = (double)(t->stop - t->start) * 1000.0 / CLOCKS_PER_SEC; \ \ } while (0)