Changeset 168c007 for src/benchmark

Timestamp:

Mar 21, 2017, 12:50:27 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, stuck-waitfor-destruct, with_gc

Children:

da6d4566, f5392c1

Parents:

94a8123 (diff), e04b636 (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:/u/cforall/software/cfa/cfa-cc

Location:

src/benchmark

Files:

• CorCtxSwitch.c (modified) (1 diff)
• bench.c (modified) (4 diffs)
• csv-data.c (modified) (1 diff)

src/benchmark/CorCtxSwitch.c

@@ -24 +24 @@
 
 struct GreatSuspender {
-        coroutine_desc c;
+        coroutine_desc __cor;
 };
 

src/benchmark/bench.c

@@ -86 +86 @@
 //=======================================
 
-struct CoroutineDummy { coroutine_desc c; };
+struct CoroutineDummy { coroutine_desc __cor; };
 DECL_COROUTINE(CoroutineDummy);
 void main(CoroutineDummy * this) {}
@@ -119 +119 @@
 struct CoroutineResume {
     int N;
-    coroutine_desc c;
+    coroutine_desc __cor;
 };
 
@@ -150 +150 @@
 //=======================================
 
-struct ThreadDummy { thread_desc t; };
+struct ThreadDummy { thread_desc __thrd; };
 DECL_THREAD(ThreadDummy);
 void main(ThreadDummy * this) {}
@@ -180 +180 @@
     int N;
     long long result;
-    thread_desc t;
+    thread_desc __thrd;
 };
 

src/benchmark/csv-data.c

@@ -26 +26 @@
 
 struct GreatSuspender {
-        coroutine_desc c;
+        coroutine_desc __cor;
 };