Changeset 73d0c54a for libcfa/src/concurrency

Timestamp:

Apr 21, 2021, 3:39:14 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b39e6566

Parents:

665edf40 (diff), 7711064 (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

Location:

libcfa/src/concurrency

Files:

• locks.hfa (modified) (1 diff)
• ready_queue.cfa (modified) (1 diff)

libcfa/src/concurrency/locks.hfa

@@ -197 +197 @@
 static inline $thread * unlock( fast_lock & this ) __attribute__((artificial));
 static inline $thread * unlock( fast_lock & this ) {
-        $thread * thrd = active_thread();
-        /* paranoid */ verify(thrd == this.owner);
+        /* paranoid */ verify(active_thread() == this.owner);
 
         // open 'owner' before unlocking anyone

libcfa/src/concurrency/ready_queue.cfa

@@ -413 +413 @@
                         unsigned it2  = proc->rdq.itr + 1;
                         unsigned idx1 = proc->rdq.id + (it1 % READYQ_SHARD_FACTOR);
-                        unsigned idx2 = 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);
-                }
-                else if(lanes.tscs[proc->rdq.target].tv < proc->rdq.cutoff) {
-                        $thread * t = try_pop(cltr, proc->rdq.target __STATS(, __tls_stats()->ready.pop.help));
+                        if(proc->rdq.cutoff == 0) proc->rdq.cutoff = -1ull;
+                }
+                else {
+                        unsigned target = proc->rdq.target;
                         proc->rdq.target = -1u;
-                        if(t) return t;
+                        if(lanes.tscs[target].tv < proc->rdq.cutoff) {
+                                $thread * t = try_pop(cltr, target __STATS(, __tls_stats()->ready.pop.help));
+                                if(t) return t;
+                        }
                 }