Changeset 63be3387 for libcfa/src/concurrency/kernel/cluster.cfa

Timestamp:

Nov 14, 2022, 11:52:44 AM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

7d9598d8

Parents:

b77f0e1 (diff), 19a8c40 (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/kernel/cluster.cfa (modified) (1 diff)

libcfa/src/concurrency/kernel/cluster.cfa

@@ -483 +483 @@
 
         // We add a boat-load of assertions here because the anchor code is very fragile
-        /* paranoid */ _Static_assert( offsetof( thread$, link ) == nested_offsetof(__intrusive_lane_t, l.anchor) );
-        /* paranoid */ verify( offsetof( thread$, link ) == nested_offsetof(__intrusive_lane_t, l.anchor) );
-        /* paranoid */ verify( ((uintptr_t)( mock_head(this) ) + offsetof( thread$, link )) == (uintptr_t)(&this.l.anchor) );
-        /* paranoid */ verify( &mock_head(this)->link.next == &this.l.anchor.next );
-        /* paranoid */ verify( &mock_head(this)->link.ts   == &this.l.anchor.ts   );
-        /* paranoid */ verify( mock_head(this)->link.next == 0p );
-        /* paranoid */ verify( mock_head(this)->link.ts   == MAX );
+        /* paranoid */ _Static_assert( offsetof( thread$, rdy_link ) == nested_offsetof(__intrusive_lane_t, l.anchor) );
+        /* paranoid */ verify( offsetof( thread$, rdy_link ) == nested_offsetof(__intrusive_lane_t, l.anchor) );
+        /* paranoid */ verify( ((uintptr_t)( mock_head(this) ) + offsetof( thread$, rdy_link )) == (uintptr_t)(&this.l.anchor) );
+        /* paranoid */ verify( &mock_head(this)->rdy_link.next == &this.l.anchor.next );
+        /* paranoid */ verify( &mock_head(this)->rdy_link.ts   == &this.l.anchor.ts   );
+        /* paranoid */ verify( mock_head(this)->rdy_link.next == 0p );
+        /* paranoid */ verify( mock_head(this)->rdy_link.ts   == MAX );
         /* paranoid */ verify( mock_head(this) == this.l.prev );
         /* paranoid */ verify( __alignof__(__intrusive_lane_t) == 64 );