Changeset 6250a312 for src/benchmark/bench.c

Timestamp:

May 10, 2017, 5:00:47 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8514fe19, dbfb35d

Parents:

0f9bef3 (diff), 29cf9c8 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/benchmark/bench.c (modified) (6 diffs)

src/benchmark/bench.c

@@ -4 +4 @@
 #include <thread>
 
-#include <unistd.h>                                     // sysconf
-#include <sys/times.h>                                  // times
-#include <time.h>
-
-inline unsigned long long int Time() {
-    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
+#include "bench.h"
 
 //=======================================
@@ -86 +68 @@
 //=======================================
 
-struct CoroutineDummy { coroutine_desc __cor; };
-DECL_COROUTINE(CoroutineDummy);
+coroutine CoroutineDummy {};
 void main(CoroutineDummy * this) {}
 
@@ -117 +98 @@
 }
 
-struct CoroutineResume {
+coroutine CoroutineResume {
     int N;
-    coroutine_desc __cor;
 };
-
-DECL_COROUTINE(CoroutineResume);
 
 void ?{}(CoroutineResume* this, int N) {
@@ -150 +128 @@
 //=======================================
 
-struct ThreadDummy { thread_desc __thrd; };
-DECL_THREAD(ThreadDummy);
+thread ThreadDummy {};
 void main(ThreadDummy * this) {}
 
@@ -177 +154 @@
 }
 
-struct ContextSwitch {
+thread ContextSwitch {
     int N;
     long long result;
-    thread_desc __thrd;
 };
-
-DECL_THREAD(ContextSwitch);
 
 void main(ContextSwitch * this) {    
@@ -241 +215 @@
         DynamicTaskCreateDelete( NoOfTimes );
         {
-                scoped(ContextSwitch) dummy = { (int)NoOfTimes };               // context switch
+                ContextSwitch dummy = { (int)NoOfTimes };               // context switch
         }
         sout | "\t" | endl;