Changeset 3d5701e for benchmark/ctxswitch/cfa_thrd2.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/ctxswitch/cfa_thrd2.cfa (modified) (1 diff)

benchmark/ctxswitch/cfa_thrd2.cfa

@@ -8 +8 @@
 
 void main(__attribute__((unused)) Fibre & this) {
-        while(!done) {
+        while ( ! done ) {
                 yield();
         }
 }
 
-int main(int argc, char* argv[]) {
+int main( int argc, char * argv[] ) {
+        BENCH_START()
         Fibre f1;
         BENCH(
-                for ( i; n ) {
+                for ( times ) {
                         yield();
                 },
                 result
         )
+        printf( "%g\n", result );
+        done = true;
+}
 
-        printf("%g\n", result);
-        done = true;
-        return 0;
-}
+// Local Variables: //
+// tab-width: 4 //
+// End: //