Changes in libcfa/src/concurrency/kernel/startup.cfa [a017ee7:73f4d08]

File:

• libcfa/src/concurrency/kernel/startup.cfa (modified) (6 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;
@@ -490 +489 @@
         #endif
 
-        // 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);
-                this.cltr->procs.total += 1u;
-                insert_last(this.cltr->procs.actives, this);
+        lock( this.cltr->idles );
+                int target = this.cltr->idles.total += 1u;
+        unlock( this.cltr->idles );
+
+        id = doregister((__processor_id_t*)&this);
+
+        // Lock the RWlock so no-one pushes/pops while we are changing the queue
+        uint_fast32_t last_size = ready_mutate_lock();
 
                 // Adjust the ready queue size
-                ready_queue_grow( cltr );
+                this.cltr_id = ready_queue_grow( cltr, target );
 
         // Unlock the RWlock
@@ -506 +509 @@
 // Not a ctor, it just preps the destruction but should not destroy members
 static void deinit(processor & this) {
+        lock( this.cltr->idles );
+                int target = this.cltr->idles.total -= 1u;
+        unlock( this.cltr->idles );
+
         // Lock the RWlock so no-one pushes/pops while we are changing the queue
         uint_fast32_t last_size = ready_mutate_lock();
-                this.cltr->procs.total -= 1u;
-                remove(this);
 
                 // Adjust the ready queue size
-                ready_queue_shrink( this.cltr );
-
-        // Unlock the RWlock and unregister: we don't need the read_lock any more
-        ready_mutate_unregister((__processor_id_t*)&this, last_size );
+                ready_queue_shrink( this.cltr, target );
+
+        // Unlock the RWlock
+        ready_mutate_unlock( last_size );
+
+        // Finally we don't need the read_lock any more
+        unregister((__processor_id_t*)&this);
 
         close(this.idle);
@@ -558 +566 @@
 //-----------------------------------------------------------------------------
 // Cluster
-static void ?{}(__cluster_proc_list & this) {
+static void ?{}(__cluster_idles & this) {
         this.lock  = 0;
         this.idle  = 0;
         this.total = 0;
+        (this.list){};
 }
 
@@ -587 +596 @@
 
                 // Adjust the ready queue size
-                ready_queue_grow( &this );
+                ready_queue_grow( &this, 0 );
 
         // Unlock the RWlock
@@ -602 +611 @@
 
                 // Adjust the ready queue size
-                ready_queue_shrink( &this );
+                ready_queue_shrink( &this, 0 );
 
         // Unlock the RWlock