Changeset e67a82d for libcfa/src/concurrency/ready_subqueue.hfa

Timestamp:

Aug 20, 2020, 11:48:15 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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:

fix conflicts

File:

• libcfa/src/concurrency/ready_subqueue.hfa (modified) (4 diffs)

libcfa/src/concurrency/ready_subqueue.hfa

@@ -144 +144 @@
 // returns popped
 // returns true of lane was empty before push, false otherwise
-[$thread *, bool] pop(__intrusive_lane_t & this) {
+$thread * pop(__intrusive_lane_t & this) {
         /* paranoid */ verify(this.lock);
         /* paranoid */ verify(this.before.link.ts != 0ul);
@@ -162 +162 @@
         head->link.next = next;
         next->link.prev = head;
-        node->link.[next, prev] = 0p;
+        node->link.next = 0p;
+        node->link.prev = 0p;
 
         // Update head time stamp
@@ -180 +181 @@
                 /* paranoid */ verify(tail(this)->link.prev == head(this));
                 /* paranoid */ verify(head(this)->link.next == tail(this));
-                return [node, true];
+                return node;
         }
         else {
@@ -187 +188 @@
                 /* paranoid */ verify(head(this)->link.next != tail(this));
                 /* paranoid */ verify(this.before.link.ts != 0);
-                return [node, false];
+                return node;
         }
 }