Changes in benchmark/readyQ/cycle.cfa [b5d51b0:7a2a3af]

File:

• benchmark/readyQ/cycle.cfa (modified) (5 diffs)

benchmark/readyQ/cycle.cfa

@@ -1 +1 @@
 #include "rq_bench.hfa"
 
-struct Partner {
+thread Partner {
+        Partner * partner;
         unsigned long long count;
-        unsigned long long blocks;
-        bench_sem self;
-        bench_sem * next;
 };
 
 void ?{}( Partner & this ) {
-        this.count = this.blocks = 0;
+        ((thread&)this){ bench_cluster };
 }
 
-thread BThrd {
-        Partner & partner;
-};
-
-void ?{}( BThrd & this, Partner * partner ) {
-        ((thread&)this){ bench_cluster };
-        &this.partner = partner;
-}
-
-void ^?{}( BThrd & mutex this ) {}
-
-void main( BThrd & thrd ) with(thrd.partner) {
-        count = 0;
+void main( Partner & this ) {
+        this.count = 0;
         for() {
-                blocks += wait( self );
-                post( *next );
-                count ++;
+                park();
+                unpark( *this.partner );
+                this.count ++;
                 if( clock_mode && stop) break;
-                if(!clock_mode && count >= stop_count) break;
+                if(!clock_mode && this.count >= stop_count) break;
         }
 
@@ -46 +33 @@
         {
                 unsigned long long global_counter = 0;
-                unsigned long long global_blocks  = 0;
                 unsigned tthreads = nthreads * ring_size;
                 Time start, end;
@@ -52 +38 @@
                 {
                         threads_left = tthreads;
-                        BThrd * threads[tthreads];
-                        Partner thddata[tthreads];
+                        Partner threads[tthreads];
                         for(i; tthreads) {
                                 unsigned pi = (i + nthreads) % tthreads;
-                                thddata[i].next = &thddata[pi].self;
-                        }
-                        for(int i = 0; i < tthreads; i++) {
-                                threads[i] = malloc();
-                                (*threads[i]){ &thddata[i] };
+                                threads[i].partner = &threads[pi];
                         }
                         printf("Starting\n");
@@ -68 +49 @@
 
                         for(i; nthreads) {
-                                post( thddata[i].self );
+                                unpark( threads[i] );
                         }
                         wait(start, is_tty);
@@ -77 +58 @@
 
                         for(i; tthreads) {
-                                Partner & partner = join( *threads[i] ).partner;
-                                global_counter += partner.count;
-                                global_blocks  += partner.blocks;
-                                delete(threads[i]);
+                                global_counter += join( threads[i] ).count;
                         }
                 }
 
-                printf("Duration (ms)        : %'ld\n", (end - start)`dms);
-                printf("Number of processors : %'d\n", nprocs);
-                printf("Number of threads    : %'d\n", tthreads);
-                printf("Cycle size (# thrds) : %'d\n", ring_size);
-                printf("Total Operations(ops): %'15llu\n", global_counter);
-                printf("Total blocks         : %'15llu\n", global_blocks);
-                printf("Ops per second       : %'18.2lf\n", ((double)global_counter) / (end - start)`ds);
-                printf("ns per ops           : %'18.2lf\n", (end - start)`dns / global_counter);
-                printf("Ops per threads      : %'15llu\n", global_counter / tthreads);
-                printf("Ops per procs        : %'15llu\n", global_counter / nprocs);
-                printf("Ops/sec/procs        : %'18.2lf\n", (((double)global_counter) / nprocs) / (end - start)`ds);
-                printf("ns per ops/procs     : %'18.2lf\n", (end - start)`dns / (global_counter / nprocs));
+                printf("Duration (ms)       : %'ld\n", (end - start)`ms);
+                printf("Number of processors: %'d\n", nprocs);
+                printf("Number of threads   : %'d\n", tthreads);
+                printf("Cycle size (# thrds): %'d\n", ring_size);
+                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("Total yields        : %'15llu\n", global_counter);
+                printf("Yields per threads  : %'15llu\n", global_counter / tthreads);
+                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);
         }