Changeset 90152a4 for benchmark/bench.h

Timestamp:

Aug 27, 2018, 4:40:34 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

• benchmark/bench.h (moved) (moved from src/benchmark/bench.h ) (2 diffs)

benchmark/bench.h

@@ -6 +6 @@
         #include <stdlib.h>
         #include <unistd.h>                                     // sysconf
-        #include <sys/times.h>                                  // times
+#if ! defined(__cforall)
         #include <time.h>
-#if defined(__cforall)
+        #include <sys/time.h>
+#else
 }
+#include <time.hfa>
 #endif
 
-static inline unsigned long long int Time() {
+
+static inline unsigned long long int bench_time() {
     struct timespec ts;
     clock_gettime(
@@ -39 +42 @@
         }                                               \
         long long int StartTime, EndTime;       \
-        StartTime = Time();                     \
+        StartTime = bench_time();               \
         statement;                                      \
-        EndTime = Time();                               \
+        EndTime = bench_time();                 \
         unsigned long long int output =         \
         ( EndTime - StartTime ) / n;
 
-unsigned int default_preemption() {
+#if defined(__cforall)
+Duration default_preemption() {
         return 0;
 }
+#endif