Changeset 3d5701e for benchmark/mutex/cfa1.cfa

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• benchmark/mutex/cfa1.cfa (modified) (1 diff)

benchmark/mutex/cfa1.cfa

@@ -4 +4 @@
 #include "bench.h"
 
-monitor M {};
-void __attribute__((noinline)) call( M & mutex m ) {}
+monitor M {} m1;
+void __attribute__((noinline)) call( M & mutex p1 ) {}
 
-int main(int argc, char* argv[]) {
-        M m;
+int main( int argc, char * argv[] ) {
+        BENCH_START()
         BENCH(
-                for ( i; n ) {
-                        call(m);
+                for ( times ) {
+                        call( m1 );
                 },
                 result
         )
+        printf( "%g\n", result );
+}
 
-        printf("%g\n", result);
-}
+// Local Variables: //
+// tab-width: 4 //
+// End: //