Changeset f302d80

Timestamp:

May 5, 2021, 1:17:07 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:

b9376fe

Parents:

f55d54d

Message:

Fix timestamp with new subqueue which was read after being cleared.

Location:

libcfa/src/concurrency

Files:

• ready_queue.cfa (modified) (4 diffs)
• ready_subqueue.hfa (modified) (3 diffs)

libcfa/src/concurrency/ready_queue.cfa

@@ -406 +406 @@
 
                         // WARNING: std::min is polymorphic and therefore causes 500% slowdown instead of the expected 2%
-                        proc->rdq.cutoff = tsc1 < tsc2 ? tsc1 : tsc2; 
+                        proc->rdq.cutoff = tsc1 < tsc2 ? tsc1 : tsc2;
                 }
                 else {
@@ -469 +469 @@
         // Actually pop the list
         struct $thread * thrd;
-        thrd = pop(lane);
+        unsigned long long tsv;
+        [thrd, tsv] = pop(lane);
 
         /* paranoid */ verify(thrd);
@@ -481 +482 @@
 
         #if defined(USE_WORK_STEALING)
-                lanes.tscs[w].tv = thrd->link.ts;
+                lanes.tscs[w].tv = tsv;
         #endif
 
@@ -663 +664 @@
                         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);

libcfa/src/concurrency/ready_subqueue.hfa

@@ -53 +53 @@
 // Push a thread onto this lane
 // returns true of lane was empty before push, false otherwise
-void push( __intrusive_lane_t & this, $thread * node ) {
+static inline void push( __intrusive_lane_t & this, $thread * node ) {
         /* paranoid */ verify( node->link.next == 0p );
         /* paranoid */ verify( node->link.ts   == 0  );
@@ -77 +77 @@
 // returns popped
 // returns true of lane was empty before push, false otherwise
-$thread * pop( __intrusive_lane_t & this ) {
+static inline [* $thread, unsigned long long] pop( __intrusive_lane_t & this ) {
         /* paranoid */ verify( this.anchor.next != 0p );
         /* paranoid */ verify( this.anchor.ts   != 0  );
 
         // Get the relevant nodes locally
+        unsigned long long ts = this.anchor.ts;
         $thread * node = this.anchor.next;
         this.anchor.next = node->link.next;
@@ -94 +95 @@
         /* paranoid */ verify( node->link.next == 0p );
         /* paranoid */ verify( node->link.ts   == 0  );
-        return node;
+        return [node, ts];
 }