Changes in benchmark/readyQ/yield.cfa [8197ca5:6dc2db9]

File:

• benchmark/readyQ/yield.cfa (modified) (1 diff)

benchmark/readyQ/yield.cfa

@@ -1 @@
-#include "rq_bench.hfa"
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <limits.h>
+
+extern "C" {
+        #include <locale.h>
+        #include <getopt.h>
+}
+
+#include <unistd.h>
+
+#include <clock.hfa>
+#include <time.hfa>
+#include <stats.hfa>
+
+#include "../benchcltr.hfa"
+
+extern bool traceHeapOn();
+
+
+volatile bool run = false;
+volatile unsigned long long global_counter;
 
 thread __attribute__((aligned(128))) Yielder {
-        unsigned long long count;
+        unsigned long long counter;
 };
 void ?{}( Yielder & this ) {
-        ((thread&)this){ "Yielder Thread", bench_cluster };
-        this.count = 0;
+        this.counter = 0;
+        ((thread&)this){ "Yielder Thread", *the_benchmark_cluster };
 }
 
 void main( Yielder & this ) {
         park();
-        for() {
+        /* paranoid */ assert( true == __atomic_load_n(&run, __ATOMIC_RELAXED) );
+
+        while(__atomic_load_n(&run, __ATOMIC_RELAXED)) {
                 yield();
-                this.count++;
-                if( clock_mode && stop) break;
-                if(!clock_mode && this.count >= stop_count) break;
+                this.counter++;
         }
-
-        __atomic_fetch_add(&threads_left, -1, __ATOMIC_SEQ_CST);
+        __atomic_fetch_add(&global_counter, this.counter, __ATOMIC_SEQ_CST);
 }
 
 int main(int argc, char * argv[]) {
+        unsigned num_io = 1;
+        io_context_params params;
+
         cfa_option opt[] = {
-                BENCH_OPT
+                BENCH_OPT_CFA
         };
-        BENCH_OPT_PARSE("cforall yield benchmark");
+        int opt_cnt = sizeof(opt) / sizeof(cfa_option);
+
+        char **left;
+        parse_args( argc, argv, opt, opt_cnt, "[OPTIONS]...\ncforall yield benchmark", left );
 
         {
-                unsigned long long global_counter = 0;
+                printf("Running %d threads on %d processors for %f seconds\n", nthreads, nprocs, duration);
 
                 Time start, end;
-                BenchCluster bc = { nprocs };
+                BenchCluster cl = { num_io, params, CFA_STATS_READY_Q };
                 {
-                        threads_left = nthreads;
-                        Yielder threads[nthreads];
-                        printf("Starting\n");
+                        BenchProc procs[nprocs];
+                        {
+                                Yielder threads[nthreads];
+                                printf("Starting\n");
 
-                        bool is_tty = isatty(STDOUT_FILENO);
-                        start = timeHiRes();
+                                bool is_tty = isatty(STDOUT_FILENO);
+                                start = timeHiRes();
+                                run = true;
 
-                        for(i; nthreads) {
-                                unpark( threads[i] );
-                        }
-                        wait(start, is_tty);
+                                for(i; nthreads) {
+                                        unpark( threads[i] );
+                                }
+                                wait(duration, start, end, is_tty);
 
-                        stop = true;
-                        end = timeHiRes();
-                        printf("\nDone\n");
-
-                        for(i; nthreads) {
-                                Yielder & y = join( threads[i] );
-                                global_counter += y.count;
+                                run = false;
+                                end = timeHiRes();
+                                printf("\nDone\n");
                         }
                 }
 
-                printf("Duration (ms)        : %'ld\n", (end - start)`dms);
-                printf("Number of processors : %'d\n", nprocs);
-                printf("Number of threads    : %'d\n", nthreads);
-                printf("Total Operations(ops): %'15llu\n", global_counter);
-                printf("Ops per second       : %'18.2lf\n", ((double)global_counter) / (end - start)`s);
-                printf("ns per ops           : %'18.2lf\n", (end - start)`dns / global_counter);
-                printf("Ops per threads      : %'15llu\n", global_counter / nthreads);
-                printf("Ops per procs        : %'15llu\n", global_counter / nprocs);
-                printf("Ops/sec/procs        : %'18.2lf\n", (((double)global_counter) / nprocs) / (end - start)`s);
-                printf("ns per ops/procs     : %'18.2lf\n", (end - start)`dns / (global_counter / nprocs));
+                printf("Duration (ms)       : %'ld\n", (end - start)`dms);
+                printf("Number of processors: %'d\n", nprocs);
+                printf("Number of threads   : %'d\n", nthreads);
+                printf("Total yields        : %'15llu\n", global_counter);
+                printf("Yields per second   : %'18.2lf\n", ((double)global_counter) / (end - start)`s);
+                printf("ns per yields       : %'18.2lf\n", ((double)(end - start)`ns) / global_counter);
+                printf("Yields per procs    : %'15llu\n", global_counter / nprocs);
+                printf("Yields/sec/procs    : %'18.2lf\n", (((double)global_counter) / nprocs) / (end - start)`s);
+                printf("ns per yields/procs : %'18.2lf\n", ((double)(end - start)`ns) / (global_counter / nprocs));
                 fflush(stdout);
         }