Changes in libcfa/src/concurrency/ready_queue.cfa [5cb51502:a017ee7]

File:

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

libcfa/src/concurrency/ready_queue.cfa

@@ -94 +94 @@
 //=======================================================================
 // Lock-Free registering/unregistering of threads
-unsigned doregister( struct __processor_id_t * proc ) with(*__scheduler_lock) {
+void register_proc_id( struct __processor_id_t * proc ) with(*__scheduler_lock) {
         __cfadbg_print_safe(ready_queue, "Kernel : Registering proc %p for RW-Lock\n", proc);
 
@@ -108 +108 @@
                         /*paranoid*/ verify(0 == (__alignof__(data[i]) % cache_line_size));
                         /*paranoid*/ verify((((uintptr_t)&data[i]) % cache_line_size) == 0);
-                        return i;
+                        proc->id = i;
                 }
         }
@@ -135 +135 @@
         /*paranoid*/ verify(__alignof__(data[n]) == (2 * cache_line_size));
         /*paranoid*/ verify((((uintptr_t)&data[n]) % cache_line_size) == 0);
-        return n;
-}
-
-void unregister( struct __processor_id_t * proc ) with(*__scheduler_lock) {
+        proc->id = n;
+}
+
+void unregister_proc_id( struct __processor_id_t * proc ) with(*__scheduler_lock) {
         unsigned id = proc->id;
         /*paranoid*/ verify(id < ready);
@@ -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 );