Changes in libcfa/src/concurrency/ready_queue.cfa [d3ba775:8cd5434]

File:

• libcfa/src/concurrency/ready_queue.cfa (modified) (6 diffs)

libcfa/src/concurrency/ready_queue.cfa

@@ -398 +398 @@
 
                 if(proc->rdq.target == -1u) {
+                        unsigned long long min = ts(lanes.data[proc->rdq.id]);
+                        for(int i = 0; i < READYQ_SHARD_FACTOR; i++) {
+                                unsigned long long tsc = ts(lanes.data[proc->rdq.id + i]);
+                                if(tsc < min) min = tsc;
+                        }
+                        proc->rdq.cutoff = min;
                         proc->rdq.target = __tls_rand() % lanes.count;
-                        unsigned it1  = proc->rdq.itr;
-                        unsigned it2  = proc->rdq.itr + 1;
-                        unsigned idx1 = proc->rdq.id + (it1 % READYQ_SHARD_FACTOR);
-                        unsigned idx2 = proc->rdq.id + (it2 % READYQ_SHARD_FACTOR);
-                        unsigned long long tsc1 = ts(lanes.data[idx1]);
-                        unsigned long long tsc2 = ts(lanes.data[idx2]);
-                        proc->rdq.cutoff = min(tsc1, tsc2);
-                        if(proc->rdq.cutoff == 0) proc->rdq.cutoff = -1ull;
                 }
                 else {
@@ -418 +416 @@
 
                 for(READYQ_SHARD_FACTOR) {
-                        unsigned i = proc->rdq.id + (--proc->rdq.itr % READYQ_SHARD_FACTOR);
+                        unsigned i = proc->rdq.id + (proc->rdq.itr++ % READYQ_SHARD_FACTOR);
                         if($thread * t = try_pop(cltr, i __STATS(, __tls_stats()->ready.pop.local))) return t;
                 }
@@ -469 +467 @@
         // Actually pop the list
         struct $thread * thrd;
-        thrd = pop(lane);
+        unsigned long long tsv;
+        [thrd, tsv] = pop(lane);
 
         /* paranoid */ verify(thrd);
@@ -481 +480 @@
 
         #if defined(USE_WORK_STEALING)
-                lanes.tscs[w].tv = thrd->link.ts;
+                lanes.tscs[w].tv = tsv;
         #endif
 
@@ -663 +662 @@
                         while(!is_empty(lanes.data[idx])) {
                                 struct $thread * thrd;
-                                thrd = pop(lanes.data[idx]);
+                                unsigned long long _;
+                                [thrd, _] = pop(lanes.data[idx]);
 
                                 push(cltr, thrd);
@@ -702 +702 @@
         /* paranoid */ verify( ready_mutate_islocked() );
 }
+
+#if !defined(__CFA_NO_STATISTICS__)
+        unsigned cnt(const __ready_queue_t & this, unsigned idx) {
+                /* paranoid */ verify(this.lanes.count > idx);
+                return this.lanes.data[idx].cnt;
+        }
+#endif