Changes in / [4cb1a24:298fe57]

Location:

benchmark

Files:

• Cargo.toml.in (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• c.c (added)
• readyQ/churn.cfa (modified) (7 diffs)
• readyQ/churn.rs (deleted)

benchmark/Cargo.toml.in

@@ -4 +4 @@
 authors = ["Cforall"]
 edition = "2018"
-
-[[bin]]
-name = "rdq-churn-tokio"
-path = "@abs_srcdir@/readyQ/churn.rs"
 
 [[bin]]

benchmark/Makefile.am

@@ -614 +614 @@
 RDQBENCHES = \
         rdq-churn-cfa \
-        rdq-churn-tokio \
-        rdq-churn-go \
-        rdq-churn-fibre \
         rdq-cycle-cfa \
         rdq-cycle-tokio \

benchmark/readyQ/churn.cfa

@@ -1 +1 @@
 #include "rq_bench.hfa"
 
-#include <locks.hfa>
-
 unsigned spot_cnt = 2;
-semaphore * spots;
+bench_sem * volatile * spots;
 
 thread BThrd {
         unsigned long long count;
         unsigned long long blocks;
-        bool skip;
+        bench_sem sem;
 };
 
@@ -16 +14 @@
         this.count  = 0;
         this.blocks = 0;
-        this.skip = false;
 }
 
@@ -22 +19 @@
 
 void main( BThrd & this ) with( this ) {
-        park();
+        wait( sem );
         for() {
-                uint32_t r = prng(this);
-                semaphore & sem = spots[r % spot_cnt];
-                if(!skip) V( sem );
-                blocks += P( sem );
-                skip = false;
-
+                uint32_t r = prng();
+                bench_sem * next = __atomic_exchange_n(&spots[r % spot_cnt], &sem, __ATOMIC_SEQ_CST);
+                if(next) post( *next );
+                blocks += wait( sem );
                 count ++;
                 if( clock_mode && stop) break;
@@ -54 +49 @@
                         spots = aalloc(spot_cnt);
                         for(i; spot_cnt) {
-                                (spots[i]){ 0 };
+                                spots[i] = 0p;
                         }
 
@@ -60 +55 @@
                         BThrd * threads[nthreads];
                         for(i; nthreads ) {
-                                BThrd & t = *(threads[i] = malloc());
-                                (t){};
-                                t.skip = i < spot_cnt;
+                                threads[i] = malloc();
+                                (*threads[i]){};
                         }
                         printf("Starting\n");
@@ -70 +64 @@
 
                         for(i; nthreads) {
-                                unpark( *threads[i] );
+                                post( threads[i]->sem );
                         }
                         wait(start, is_tty);
@@ -78 +72 @@
                         printf("\nDone\n");
 
-                        for(i; spot_cnt) {
-                                for(10000) V( spots[i] );
-                        }
-
                         for(i; nthreads) {
+                                post( threads[i]->sem );
                                 BThrd & thrd = join( *threads[i] );
                                 global_counter += thrd.count;