Changeset ae151cf for libcfa/src/concurrency/ready_queue.cfa

Timestamp:

Oct 2, 2022, 10:00:43 PM (19 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

815943f

Parents:

f704974 (diff), f92e7b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

libcfa/src/concurrency/ready_queue.cfa

@@ -62 +62 @@
 //-----------------------------------------------------------------------
 __attribute__((hot)) void push(struct cluster * cltr, struct thread$ * thrd, unpark_hint hint) with (cltr->sched) {
-        processor * const proc = kernelTLS().this_processor;
+        struct processor * const proc = kernelTLS().this_processor;
         const bool external = (!proc) || (cltr != proc->cltr);
         const bool remote   = hint == UNPARK_REMOTE;
@@ -116 +116 @@
         /* paranoid */ verify( kernelTLS().this_processor->rdq.id < lanes_count );
 
-        processor * const proc = kernelTLS().this_processor;
+        struct processor * const proc = kernelTLS().this_processor;
         unsigned this = proc->rdq.id;
         /* paranoid */ verify( this < lanes_count );
@@ -139 +139 @@
                 /* paranoid */ verify( readyQ.tscs[target].t.tv != ULLONG_MAX );
                 if(target < lanes_count) {
-                        const unsigned long long cutoff = calc_cutoff(ctsc, proc->rdq.id, lanes_count, cltr->sched.readyQ.data, cltr->sched.readyQ.tscs, __shard_factor.readyq);
-                        const unsigned long long age = moving_average(ctsc, readyQ.tscs[target].t.tv, readyQ.tscs[target].t.ma);
+                        const unsigned long long cutoff = calc_cutoff(ctsc, proc->rdq.id, lanes_count, cltr->sched.readyQ.data, cltr->sched.readyQ.tscs, __shard_factor.readyq, true);
+                        const unsigned long long age = moving_average(ctsc, readyQ.tscs[target].t.tv, readyQ.tscs[target].t.ma, false);
                         __cfadbg_print_safe(ready_queue, "Kernel : Help attempt on %u from %u, age %'llu vs cutoff %'llu, %s\n", target, this, age, cutoff, age > cutoff ? "yes" : "no");
                         if(age > cutoff) {
@@ -214 +214 @@
         __STATS( stats.success++; )
 
-        touch_tsc(readyQ.tscs, w, ts_prev, ts_next);
+        touch_tsc(readyQ.tscs, w, ts_prev, ts_next, true);
 
         thrd->preferred = w / __shard_factor.readyq;