Changes in / [7d51ef8:1e5cd9a]

Location:

libcfa/src/concurrency

Files:

• kernel/startup.cfa (modified) (1 diff)
• ready_queue.cfa (modified) (1 diff)

libcfa/src/concurrency/kernel/startup.cfa

@@ -496 +496 @@
         this.rdq.id  = -1u;
         this.rdq.target = -1u;
-        this.rdq.cutoff = -1ull;
+        this.rdq.cutoff = 0ull;
         do_terminate = false;
         preemption_alarm = 0p;

libcfa/src/concurrency/ready_queue.cfa

@@ -398 +398 @@
 
                 if(proc->rdq.target == -1u) {
-                        _Static_assert(READYQ_SHARD_FACTOR == 2);
-                        unsigned idx1 = proc->rdq.id + 0;
-                        unsigned idx2 = proc->rdq.id + 1;
-                        unsigned long long tsc1 = ts(lanes.data[idx1]);
-                        unsigned long long tsc2 = ts(lanes.data[idx2]);
+                        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;
-
-                        // WARNING: std::min is polymorphic and therefore causes 500% slowdown instead of the expected 2%
-                        proc->rdq.cutoff = tsc1 < tsc2 ? tsc1 : tsc2;
                 }
                 else {