Changeset b7d6a36 for benchmark/schedext/cfa2.cfa

Timestamp:

Feb 20, 2020, 4:15:51 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

6a490b2

Parents:

dca5802 (diff), 2cbfe92 (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 relaxed_ready

File:

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

benchmark/schedext/cfa2.cfa

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