refactor: move 'gettime_i64()' to testutil.h

Relocate the clock time getter to testutil.h to make it
easily reusable across tests. This will be useful for
the upcoming unit test framework.

Author: furszy

Makefile.am

@@ -105,7 +105,7 @@ noinst_PROGRAMS =
 if USE_BENCHMARK
 noinst_PROGRAMS += bench bench_internal bench_ecmult
 bench_SOURCES = src/bench.c
-bench_LDADD = libsecp256k1.la
+bench_LDADD = $(COMMON_LIB) $(PRECOMPUTED_LIB)
 bench_CPPFLAGS = $(SECP_CONFIG_DEFINES)
 bench_internal_SOURCES = src/bench_internal.c
 bench_internal_LDADD = $(COMMON_LIB) $(PRECOMPUTED_LIB)

src/CMakeLists.txt

@@ -126,7 +126,7 @@ unset(${PROJECT_NAME}_soversion)
 
 if(SECP256K1_BUILD_BENCHMARK)
   add_executable(bench bench.c)
-  target_link_libraries(bench secp256k1)
+  target_link_libraries(bench secp256k1_precomputed secp256k1_asm)
   add_executable(bench_internal bench_internal.c)
   target_link_libraries(bench_internal secp256k1_precomputed secp256k1_asm)
   add_executable(bench_ecmult bench_ecmult.c)

src/bench.c

@@ -7,9 +7,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
+#include "secp256k1.c"
 #include "../include/secp256k1.h"
 #include "util.h"
+#include "field_impl.h"
+#include "testrand_impl.h"
 #include "bench.h"
 
 static void help(int default_iters) {

src/bench.h

@@ -12,27 +12,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#if (defined(_MSC_VER) && _MSC_VER >= 1900)
-#  include <time.h>
-#else
-#  include <sys/time.h>
-#endif
-
-static int64_t gettime_i64(void) {
-#if (defined(_MSC_VER) && _MSC_VER >= 1900)
-    /* C11 way to get wallclock time */
-    struct timespec tv;
-    if (!timespec_get(&tv, TIME_UTC)) {
-        fputs("timespec_get failed!", stderr);
-        exit(EXIT_FAILURE);
-    }
-    return (int64_t)tv.tv_nsec / 1000 + (int64_t)tv.tv_sec * 1000000LL;
-#else
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return (int64_t)tv.tv_usec + (int64_t)tv.tv_sec * 1000000LL;
-#endif
-}
+#include "testutil.h"
 
 #define FP_EXP (6)
 #define FP_MULT (1000000LL)

src/bench_ecmult.c

@@ -5,6 +5,7 @@
  ***********************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 
 #include "secp256k1.c"
 #include "../include/secp256k1.h"
@@ -15,6 +16,7 @@
 #include "group_impl.h"
 #include "scalar_impl.h"
 #include "ecmult_impl.h"
+#include "testrand_impl.h"
 #include "bench.h"
 
 #define POINTS 32768

src/bench_internal.c

@@ -5,6 +5,7 @@
  ***********************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 
 #include "secp256k1.c"
 #include "../include/secp256k1.h"
@@ -16,6 +17,7 @@
 #include "group_impl.h"
 #include "scalar_impl.h"
 #include "ecmult_impl.h"
+#include "testrand_impl.h"
 #include "bench.h"
 
 static void help(int default_iters) {

src/testutil.h

@@ -11,6 +11,28 @@
 #include "testrand.h"
 #include "util.h"
 
+#if (defined(_MSC_VER) && _MSC_VER >= 1900)
+#  include <time.h>
+#else
+#  include <sys/time.h>
+#endif
+
+static int64_t gettime_i64(void) {
+#if (defined(_MSC_VER) && _MSC_VER >= 1900)
+    /* C11 way to get wallclock time */
+    struct timespec tv;
+    if (!timespec_get(&tv, TIME_UTC)) {
+        fputs("timespec_get failed!", stderr);
+        exit(EXIT_FAILURE);
+    }
+    return (int64_t)tv.tv_nsec / 1000 + (int64_t)tv.tv_sec * 1000000LL;
+#else
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return (int64_t)tv.tv_usec + (int64_t)tv.tv_sec * 1000000LL;
+#endif
+}
+
 static void testutil_random_fe(secp256k1_fe *x) {
     unsigned char bin[32];
     do {