Changes in benchmark/bench.h [846c026:dc33b5b]

File:

• benchmark/bench.h (modified) (3 diffs)

benchmark/bench.h

@@ -5 +5 @@
 #endif
         #include <stdlib.h>
-        #include <stdint.h>                             // uint64_t
-        #include <unistd.h>                             // sysconf
+        #include <unistd.h>                                     // sysconf
 #if ! defined(__cforall)
         #include <time.h>
@@ -16 +15 @@
 
 
-static inline uint64_t bench_time() {
-        struct timespec ts;
-        clock_gettime( CLOCK_THREAD_CPUTIME_ID, &ts );
-        return 1000000000LL * ts.tv_sec + ts.tv_nsec;
-} // bench_time
+static inline unsigned long long int bench_time() {
+    struct timespec ts;
+    clock_gettime(
+#if defined( __linux__ )
+         CLOCK_THREAD_CPUTIME_ID,
+#elif defined( __freebsd__ )
+         CLOCK_PROF,
+#elif defined( __solaris__ )
+         CLOCK_HIGHRES,
+#else
+    #error uC++ : internal error, unsupported architecture
+#endif
+         &ts );
+    return 1000000000LL * ts.tv_sec + ts.tv_nsec;
+} // Time
 
 #ifndef BENCH_N
-#define BENCH_N 10000000
+#define BENCH_N 500 //10000000
 #endif
 
-size_t times = BENCH_N;
-
-#define BENCH_START()                           \
-        if ( argc > 2 ) exit( EXIT_FAILURE );   \
-        if ( argc == 2 ) {                      \
-                times = atoi( argv[1] );        \
-        }
-
 #define BENCH(statement, output)                \
-        uint64_t StartTime, EndTime;            \
+        size_t n = BENCH_N;                     \
+        if( argc > 2 ) return 1;                \
+        if( argc == 2 ) {                               \
+                n = atoi(argv[1]);              \
+        }                                               \
+        long long int StartTime, EndTime;       \
         StartTime = bench_time();               \
-        statement;                              \
+        statement;                                      \
         EndTime = bench_time();                 \
-        double output = (double)( EndTime - StartTime ) / times;
-
+        double output =         \
+            (double)( EndTime - StartTime ) / n;
 
 #if defined(__cforall)
@@ -47 +53 @@
 }
 #endif
-#if defined(__U_CPLUSPLUS__)
-unsigned int uDefaultPreemption() {
-        return 0;
-}
-#endif