Changes in benchmark/schedint/cfa2.cfa [2316525:6e540ea]

File:

• benchmark/schedint/cfa2.cfa (modified) (2 diffs)

benchmark/schedint/cfa2.cfa

@@ -4 +4 @@
 #include <stdio.h>
 
-#include "../bench.h"
+#include "bench.h"
 
 volatile int go = 0;
+
 condition c;
-monitor M {} m1, m2;
+monitor M {};
+M m1, m2;
 
-void __attribute__((noinline)) call( M & mutex p1, M & mutex p2 ) {
-        signal( c );
+void __attribute__((noinline)) call( M & mutex a1, M & mutex a2 ) {
+        signal(c);
 }
 
-void __attribute__((noinline)) wait( M & mutex p1, M & mutex p2 ) {
+int  __attribute__((noinline)) wait( M & mutex a1, M & mutex a2 ) {
         go = 1;
-        for ( times ) {
-                wait( c );
-        }
+        BENCH(
+                for ( i; times ) {
+                        wait(c);
+                },
+                result
+        )
+        printf( "%g\n", result );
         go = 0;
+        return 0;
 }
 
 thread T {};
+void ^?{}( T & mutex this ) {}
 void main( T & ) {
-        while ( go == 0 ) { yield(); }
-        BENCH(
-                while ( go == 1 ) { call( m1, m2 ); },
-                result
-        )
-        printf( "%g\n", result );
+        while(go == 0) { yield(); }
+        while(go == 1) { call(m1, m2); }
+
 }
 
@@ -35 +40 @@
         BENCH_START()
         T t;
-        wait( m1, m2 );
+        return wait(m1, m2);
 }