Changeset 343d10e

Timestamp:

Aug 11, 2020, 5:38:42 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

7ff3e522, a77257be

Parents:

0d070ca

Message:

Removed code broken in new-ast out of libcfa

Location:

libcfa/src

Files:

• Makefile.am (modified) (1 diff)
• concurrency/ready_queue.cfa (modified) (3 diffs)
• concurrency/ready_subqueue.hfa (modified) (4 diffs)

libcfa/src/Makefile.am ¶

@@ -44 +44 @@
 
 headers = common.hfa fstream.hfa heap.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa \
-                time.hfa stdlib.hfa memory.hfa parseargs.hfa \
+                time.hfa stdlib.hfa parseargs.hfa \
                 containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
 

libcfa/src/concurrency/ready_queue.cfa ¶

@@ -419 +419 @@
         // Actually pop the list
         struct $thread * thrd;
-        bool emptied;
-        [thrd, emptied] = pop(lane);
+        thrd = pop(lane);
 
         /* paranoid */ verify(thrd);
@@ -457 +456 @@
                         if(head(lane)->link.next == thrd) {
                                 $thread * pthrd;
-                                bool emptied;
-                                [pthrd, emptied] = pop(lane);
+                                pthrd = pop(lane);
 
                                 /* paranoid */ verify( pthrd == thrd );
@@ -608 +606 @@
                         while(!is_empty(lanes.data[idx])) {
                                 struct $thread * thrd;
-                                __attribute__((unused)) bool _;
-                                [thrd, _] = pop(lanes.data[idx]);
+                                thrd = pop(lanes.data[idx]);
 
                                 push(cltr, thrd);

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