From 30484f42919eb594c51a8c958102ac8b0997ea54 Mon Sep 17 00:00:00 2001 From: Patrick Pelissier Date: Sat, 8 Jul 2017 15:14:01 +0200 Subject: [PATCH] Factorisation. --- bench/bench-glib.c | 32 +------------------------------- bench/bench-klib.c | 32 +------------------------------- bench/bench-libdynamic.c | 32 +------------------------------- bench/bench-mlib.c | 32 +------------------------------- bench/bench-qt.cpp | 32 +------------------------------- bench/bench-stl.cpp | 32 +------------------------------- bench/common.h | 31 +++++++++++++++++++++++++++++++ 7 files changed, 37 insertions(+), 186 deletions(-) create mode 100644 bench/common.h diff --git a/bench/bench-glib.c b/bench/bench-glib.c index 5e8bbd7d..d61ac7da 100644 --- a/bench/bench-glib.c +++ b/bench/bench-glib.c @@ -10,37 +10,7 @@ #include -unsigned long g_result; - -static unsigned long long -cputime (void) -{ - struct rusage rus; - getrusage (0, &rus); - return rus.ru_utime.tv_sec * 1000000ULL + rus.ru_utime.tv_usec; -} - -static unsigned int randValue = 0; -static void rand_init(void) -{ - randValue = 0; -} -static unsigned int rand_get(void) -{ - randValue = randValue * 31421U + 6927U; - return randValue; -} - -static void test_function(const char str[], size_t n, void (*func)(size_t)) -{ - unsigned long long start, end; - // (*func)(n); - start = cputime(); - (*func)(n); - end = cputime(); - end = (end - start) / 1000U; - printf ("%s %Lu ms for n = %lu\n", str, end, n); -} +#include "common.h" /********************************************************************************************/ diff --git a/bench/bench-klib.c b/bench/bench-klib.c index 5f99af1c..645f5532 100644 --- a/bench/bench-klib.c +++ b/bench/bench-klib.c @@ -13,37 +13,7 @@ #include "khash.h" #include "ksort.h" -unsigned long g_result; - -static unsigned long long -cputime (void) -{ - struct rusage rus; - getrusage (0, &rus); - return rus.ru_utime.tv_sec * 1000000ULL + rus.ru_utime.tv_usec; -} - -static unsigned int randValue = 0; -static void rand_init(void) -{ - randValue = 0; -} -static unsigned int rand_get(void) -{ - randValue = randValue * 31421U + 6927U; - return randValue; -} - -static void test_function(const char str[], size_t n, void (*func)(size_t)) -{ - unsigned long long start, end; - // (*func)(n); - start = cputime(); - (*func)(n); - end = cputime(); - end = (end - start) / 1000U; - printf ("%s %Lu ms for n = %lu\n", str, end, n); -} +#include "common.h" /********************************************************************************************/ diff --git a/bench/bench-libdynamic.c b/bench/bench-libdynamic.c index 2dead409..20802a86 100644 --- a/bench/bench-libdynamic.c +++ b/bench/bench-libdynamic.c @@ -11,37 +11,7 @@ #include "dynamic.h" -unsigned long g_result; - -static unsigned long long -cputime (void) -{ - struct rusage rus; - getrusage (0, &rus); - return rus.ru_utime.tv_sec * 1000000ULL + rus.ru_utime.tv_usec; -} - -static unsigned int randValue = 0; -static void rand_init(void) -{ - randValue = 0; -} -static unsigned int rand_get(void) -{ - randValue = randValue * 31421U + 6927U; - return randValue; -} - -static void test_function(const char str[], size_t n, void (*func)(size_t)) -{ - unsigned long long start, end; - // (*func)(n); - start = cputime(); - (*func)(n); - end = cputime(); - end = (end - start) / 1000U; - printf ("%s %Lu ms for n = %lu\n", str, end, n); -} +#include "common.h" /********************************************************************************************/ diff --git a/bench/bench-mlib.c b/bench/bench-mlib.c index fbfc328d..9823290b 100644 --- a/bench/bench-mlib.c +++ b/bench/bench-mlib.c @@ -15,37 +15,7 @@ #include "m-mempool.h" #include "m-string.h" -unsigned long g_result; - -static unsigned long long -cputime (void) -{ - struct rusage rus; - getrusage (0, &rus); - return rus.ru_utime.tv_sec * 1000000ULL + rus.ru_utime.tv_usec; -} - -static unsigned int randValue = 0; -static void rand_init(void) -{ - randValue = 0; -} -static unsigned int rand_get(void) -{ - randValue = randValue * 31421U + 6927U; - return randValue; -} - -static void test_function(const char str[], size_t n, void (*func)(size_t)) -{ - unsigned long long start, end; - // (*func)(n); - start = cputime(); - (*func)(n); - end = cputime(); - end = (end - start) / 1000U; - printf ("%s %Lu ms for n = %lu (r=%lu)\n", str, end, n, g_result); -} +#include "common.h" /********************************************************************************************/ diff --git a/bench/bench-qt.cpp b/bench/bench-qt.cpp index 8a14a87e..eba12196 100644 --- a/bench/bench-qt.cpp +++ b/bench/bench-qt.cpp @@ -17,37 +17,7 @@ using namespace std; -unsigned long g_result; - -static unsigned long long -cputime (void) -{ - struct rusage rus; - getrusage (0, &rus); - return rus.ru_utime.tv_sec * 1000000ULL + rus.ru_utime.tv_usec; -} - -static unsigned int randValue = 0; -static void rand_init(void) -{ - randValue = 0; -} -static unsigned int rand_get(void) -{ - randValue = randValue * 31421U + 6927U; - return randValue; -} - -static void test_function(const char str[], size_t n, void (*func)(size_t)) -{ - unsigned long long start, end; - // (*func)(n); - start = cputime(); - (*func)(n); - end = cputime(); - end = (end - start) / 1000U; - printf ("%s %Lu ms for n = %lu\n", str, end, n); -} +#include "common.h" /********************************************************************************************/ diff --git a/bench/bench-stl.cpp b/bench/bench-stl.cpp index a82ffb1d..871c811c 100644 --- a/bench/bench-stl.cpp +++ b/bench/bench-stl.cpp @@ -20,37 +20,7 @@ using namespace std; -unsigned long g_result; - -static unsigned long long -cputime (void) -{ - struct rusage rus; - getrusage (0, &rus); - return rus.ru_utime.tv_sec * 1000000ULL + rus.ru_utime.tv_usec; -} - -static unsigned int randValue = 0; -static void rand_init(void) -{ - randValue = 0; -} -static unsigned int rand_get(void) -{ - randValue = randValue * 31421U + 6927U; - return randValue; -} - -static void test_function(const char str[], size_t n, void (*func)(size_t)) -{ - unsigned long long start, end; - // (*func)(n); - start = cputime(); - (*func)(n); - end = cputime(); - end = (end - start) / 1000U; - printf ("%s %Lu ms for n = %lu\n", str, end, n); -} +#include "common.h" /********************************************************************************************/ diff --git a/bench/common.h b/bench/common.h new file mode 100644 index 00000000..c53d6840 --- /dev/null +++ b/bench/common.h @@ -0,0 +1,31 @@ +unsigned long g_result; + +static unsigned long long +cputime (void) +{ + struct rusage rus; + getrusage (0, &rus); + return rus.ru_utime.tv_sec * 1000000ULL + rus.ru_utime.tv_usec; +} + +static unsigned int randValue = 0; +static void rand_init(void) +{ + randValue = 0; +} +static unsigned int rand_get(void) +{ + randValue = randValue * 31421U + 6927U; + return randValue; +} + +static void test_function(const char str[], size_t n, void (*func)(size_t)) +{ + unsigned long long start, end; + // (*func)(n); + start = cputime(); + (*func)(n); + end = cputime(); + end = (end - start) / 1000U; + printf ("%s %Lu ms for n = %lu\n", str, end, n); +}