Changeset a017ee7

Timestamp:

Apr 15, 2021, 11:45:44 AM (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:

a4b0aa4

Parents:

fc59b580

Message:

Ready-queue grow/shrink now reassigns the id of all processors.

Location:

libcfa/src/concurrency

Files:

• kernel/startup.cfa (modified) (5 diffs)
• kernel_private.hfa (modified) (1 diff)
• ready_queue.cfa (modified) (8 diffs)

libcfa/src/concurrency/kernel/startup.cfa

@@ -469 +469 @@
         this.name = name;
         this.cltr = &_cltr;
+        this.cltr_id = -1u;
         do_terminate = false;
         preemption_alarm = 0p;
@@ -491 +492 @@
         // Register and Lock the RWlock so no-one pushes/pops while we are changing the queue
         uint_fast32_t last_size = ready_mutate_register((__processor_id_t*)&this);
-                int target = this.cltr->procs.total += 1u;
+                this.cltr->procs.total += 1u;
                 insert_last(this.cltr->procs.actives, this);
 
                 // Adjust the ready queue size
-                this.cltr_id = ready_queue_grow( cltr, target );
+                ready_queue_grow( cltr );
 
         // Unlock the RWlock
@@ -507 +508 @@
         // Lock the RWlock so no-one pushes/pops while we are changing the queue
         uint_fast32_t last_size = ready_mutate_lock();
-                int target = this.cltr->procs.total -= 1u;
+                this.cltr->procs.total -= 1u;
                 remove(this);
 
                 // Adjust the ready queue size
-                ready_queue_shrink( this.cltr, target );
+                ready_queue_shrink( this.cltr );
 
         // Unlock the RWlock and unregister: we don't need the read_lock any more
@@ -586 +587 @@
 
                 // Adjust the ready queue size
-                ready_queue_grow( &this, 0 );
+                ready_queue_grow( &this );
 
         // Unlock the RWlock
@@ -601 +602 @@
 
                 // Adjust the ready queue size
-                ready_queue_shrink( &this, 0 );
+                ready_queue_shrink( &this );
 
         // Unlock the RWlock

libcfa/src/concurrency/kernel_private.hfa

@@ -312 +312 @@
 //-----------------------------------------------------------------------
 // Increase the width of the ready queue (number of lanes) by 4
-unsigned ready_queue_grow  (struct cluster * cltr, int target);
+void ready_queue_grow  (struct cluster * cltr);
 
 //-----------------------------------------------------------------------
 // Decrease the width of the ready queue (number of lanes) by 4
-void ready_queue_shrink(struct cluster * cltr, int target);
+void ready_queue_shrink(struct cluster * cltr);
 
 

libcfa/src/concurrency/ready_queue.cfa

@@ -254 +254 @@
         __attribute__((unused)) int preferred;
         #if defined(BIAS)
+                /* paranoid */ verify(external || kernelTLS().this_processor->cltr_id < lanes.count );
                 preferred =
                         //*
@@ -344 +345 @@
         int preferred;
         #if defined(BIAS)
-                // Don't bother trying locally too much
+                /* paranoid */ verify(kernelTLS().this_processor->cltr_id < lanes.count );
                 preferred = kernelTLS().this_processor->cltr_id;
         #endif
@@ -541 +542 @@
 }
 
+static void assign_list(unsigned & value, const int inc, dlist(processor, processor) & list, unsigned count) {
+        processor * it = &list`first;
+        for(unsigned i = 0; i < count; i++) {
+                /* paranoid */ verifyf( it, "Unexpected null iterator, at index %u of %u\n", i, count);
+                it->cltr_id = value;
+                value += inc;
+                it = &(*it)`next;
+        }
+}
+
+static void reassign_cltr_id(struct cluster * cltr, const int inc) {
+        unsigned preferred = 0;
+        assign_list(preferred, inc, cltr->procs.actives, cltr->procs.total - cltr->procs.idle);
+        assign_list(preferred, inc, cltr->procs.idles  , cltr->procs.idle );
+}
+
 // Grow the ready queue
-unsigned ready_queue_grow(struct cluster * cltr, int target) {
-        unsigned preferred;
+void ready_queue_grow(struct cluster * cltr) {
         size_t ncount;
+        int target = cltr->procs.total;
 
         /* paranoid */ verify( ready_mutate_islocked() );
@@ -562 +579 @@
                 if(target >= 2) {
                         ncount = target * 4;
-                        preferred = ncount - 4;
                 } else {
                         ncount = 1;
-                        preferred = 0;
                 }
 
@@ -595 +610 @@
         }
 
+        reassign_cltr_id(cltr, 4);
+
         // Make sure that everything is consistent
         /* paranoid */ check( cltr->ready_queue );
@@ -601 +618 @@
 
         /* paranoid */ verify( ready_mutate_islocked() );
-        return preferred;
 }
 
 // Shrink the ready queue
-void ready_queue_shrink(struct cluster * cltr, int target) {
+void ready_queue_shrink(struct cluster * cltr) {
         /* paranoid */ verify( ready_mutate_islocked() );
         __cfadbg_print_safe(ready_queue, "Kernel : Shrinking ready queue\n");
@@ -611 +627 @@
         // Make sure that everything is consistent
         /* paranoid */ check( cltr->ready_queue );
+
+        int target = cltr->procs.total;
 
         with( cltr->ready_queue ) {
@@ -679 +697 @@
         }
 
+        reassign_cltr_id(cltr, 4);
+
         // Make sure that everything is consistent
         /* paranoid */ check( cltr->ready_queue );