Changeset 3b56166 for benchmark/schedint/cfa2.cfa

Timestamp:

Feb 10, 2020, 11:17:38 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

3966d9a, 41efd33

Parents:

807a632 (diff), d231700 (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:

• benchmark/schedint/cfa2.cfa (modified) (1 diff)

benchmark/schedint/cfa2.cfa

@@ -4 +4 @@
 #include <stdio.h>
 
-#include "bench.h"
+#include "../bench.h"
 
-int argc;
-char** argv;
 volatile int go = 0;
 
 condition c;
-monitor M {};
-M m1, m2;
+monitor M {} m1, m2;
 
-void __attribute__((noinline)) call( M & mutex a1, M & mutex a2 ) {
-        signal(c);
+void __attribute__((noinline)) call( M & mutex p1, M & mutex p2 ) {
+        signal( c );
 }
-
-int  __attribute__((noinline)) wait( M & mutex a1, M & mutex a2 ) {
+void __attribute__((noinline)) wait( M & mutex p1, M & mutex p2 ) {
         go = 1;
-        BENCH(
-                for ( i; n ) {
-                        wait(c);
-                },
-                result
-        )
-
-        printf("%g\n", result);
-        go = 0;
-        return 0;
+        for ( times ) {
+                wait( c );
+        }
 }
 
 thread T {};
-void ^?{}( T & mutex this ) {}
 void main( T & ) {
-        while(go == 0) { yield(); }
-        while(go == 1) { call(m1, m2); }
-
+        while ( go == 0 ) { yield(); } // waiter must start first
+        BENCH(
+                for ( times ) { call( m1, m2 ); },
+                result
+        )
+        printf( "%g\n", result );
 }
 
-int main(__attribute__((unused)) int argc, __attribute__((unused)) char* argv[]) {
+int main( int argc, char * argv[] ) {
+        BENCH_START()
         T t;
-        return wait(m1, m2);
+        wait( m1, m2 );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //