Changeset 5f6a172

Timestamp:

Apr 16, 2021, 2:01:27 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

c8a0210, e54d0c3

Parents:

6528d75

Message:

Fix assertions on ready_queue with workstealling

File:

• libcfa/src/concurrency/ready_queue.cfa (modified) (4 diffs)

libcfa/src/concurrency/ready_queue.cfa

@@ -44 +44 @@
         #define BIAS 4
         #define READYQ_SHARD_FACTOR 4
+        #define SEQUENTIAL_SHARD 1
 #elif defined(USE_WORK_STEALING)
         #define READYQ_SHARD_FACTOR 2
+        #define SEQUENTIAL_SHARD 2
 #else
         #error no scheduling strategy selected
@@ -216 +218 @@
 
 void ^?{}(__ready_queue_t & this) with (this) {
-        verify( 1 == lanes.count );
+        verify( SEQUENTIAL_SHARD == lanes.count );
         free(lanes.data);
         free(lanes.tscs);
@@ -614 +616 @@
                         ncount = target * READYQ_SHARD_FACTOR;
                 } else {
-                        ncount = 1;
+                        ncount = SEQUENTIAL_SHARD;
                 }
 
@@ -662 +664 @@
                 // Find new count
                 // Make sure we always have atleast 1 list
-                lanes.count = target >= 2 ? target * READYQ_SHARD_FACTOR: 1;
+                lanes.count = target >= 2 ? target * READYQ_SHARD_FACTOR: SEQUENTIAL_SHARD;
                 /* paranoid */ verify( ocount >= lanes.count );
                 /* paranoid */ verify( lanes.count == target * READYQ_SHARD_FACTOR || target < 2 );