Changeset 7f54356 for libcfa/src/concurrency/ready_subqueue.hfa

Timestamp:

May 5, 2021, 2:42:18 PM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

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

Children:

ce9ed84

Parents:

a5db488 (diff), b9376fe (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_subqueue.hfa (modified) (3 diffs)

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