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

Timestamp:

Jul 7, 2021, 6:24:42 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

d83b266

Parents:

1f45c7d (diff), b1a2c4a (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) (6 diffs)

libcfa/src/concurrency/ready_subqueue.hfa

@@ -7 +7 @@
 // Intrusives lanes which are used by the relaxed ready queue
 struct __attribute__((aligned(128))) __intrusive_lane_t {
-        struct $thread * prev;
+        struct thread$ * prev;
 
         // spin lock protecting the queue
@@ -20 +20 @@
 
 // Get the head pointer (one before the first element) from the anchor
-static inline $thread * mock_head(const __intrusive_lane_t & this) {
-        $thread * rhead = ($thread *)(
-                (uintptr_t)( &this.anchor ) - __builtin_offsetof( $thread, link )
+static inline thread$ * mock_head(const __intrusive_lane_t & this) {
+        thread$ * rhead = (thread$ *)(
+                (uintptr_t)( &this.anchor ) - __builtin_offsetof( thread$, link )
         );
         return rhead;
@@ -38 +38 @@
 
         // We add a boat-load of assertions here because the anchor code is very fragile
-        /* paranoid */ _Static_assert( offsetof( $thread, link ) == offsetof(__intrusive_lane_t, anchor) );
-        /* paranoid */ verify( offsetof( $thread, link ) == offsetof(__intrusive_lane_t, anchor) );
-        /* paranoid */ verify( ((uintptr_t)( mock_head(this) ) + offsetof( $thread, link )) == (uintptr_t)(&this.anchor) );
+        /* paranoid */ _Static_assert( offsetof( thread$, link ) == offsetof(__intrusive_lane_t, anchor) );
+        /* paranoid */ verify( offsetof( thread$, link ) == offsetof(__intrusive_lane_t, anchor) );
+        /* paranoid */ verify( ((uintptr_t)( mock_head(this) ) + offsetof( thread$, link )) == (uintptr_t)(&this.anchor) );
         /* paranoid */ verify( &mock_head(this)->link.next == &this.anchor.next );
         /* paranoid */ verify( &mock_head(this)->link.ts   == &this.anchor.ts   );
@@ -61 +61 @@
 // Push a thread onto this lane
 // returns true of lane was empty before push, false otherwise
-static inline void push( __intrusive_lane_t & this, $thread * node ) {
+static inline void push( __intrusive_lane_t & this, thread$ * node ) {
         /* paranoid */ verify( this.lock );
         /* paranoid */ verify( node->link.next == 0p );
@@ -91 +91 @@
 // returns popped
 // returns true of lane was empty before push, false otherwise
-static inline [* $thread, unsigned long long] pop( __intrusive_lane_t & this ) {
+static inline [* thread$, unsigned long long] pop( __intrusive_lane_t & this ) {
         /* paranoid */ verify( this.lock );
         /* paranoid */ verify( this.anchor.next != 0p );
@@ -99 +99 @@
         // Get the relevant nodes locally
         unsigned long long ts = this.anchor.ts;
-        $thread * node = this.anchor.next;
+        thread$ * node = this.anchor.next;
         this.anchor.next = node->link.next;
         this.anchor.ts   = node->link.ts;