Changeset ddd473f

Timestamp:

Apr 20, 2021, 12:35:52 PM (4 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:

0583b47b

Parents:

d2fadeb

Message:

Fix a copy/paste mistake and removed a warning in nodebug

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]);