Changes in libcfa/src/concurrency/kernel/startup.cfa [431cd4f:a5a01faa]

File:

• libcfa/src/concurrency/kernel/startup.cfa (modified) (9 diffs)

libcfa/src/concurrency/kernel/startup.cfa

@@ -268 +268 @@
                         __print_stats( st, mainProcessor->print_stats, "Processor ", mainProcessor->name, (void*)mainProcessor );
                 }
-                #if defined(CFA_STATS_ARRAY)
-                        __flush_stat( st, "Processor", mainProcessor );
-                #endif
         #endif
 
@@ -351 +348 @@
                         __print_stats( &local_stats, proc->print_stats, "Processor ", proc->name, (void*)proc );
                 }
-                #if defined(CFA_STATS_ARRAY)
-                        __flush_stat( &local_stats, "Processor", proc );
-                #endif
         #endif
 
@@ -469 +463 @@
         this.name = name;
         this.cltr = &_cltr;
-        this.rdq.its = 0;
-        this.rdq.itr = 0;
-        this.rdq.id  = -1u;
-        this.rdq.target = -1u;
-        this.rdq.cutoff = -1ull;
         do_terminate = false;
         preemption_alarm = 0p;
@@ -494 +483 @@
         #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
@@ -510 +503 @@
 // 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);
@@ -562 +560 @@
 //-----------------------------------------------------------------------------
 // Cluster
-static void ?{}(__cluster_proc_list & this) {
+static void ?{}(__cluster_idles & this) {
         this.lock  = 0;
         this.idle  = 0;
         this.total = 0;
+        (this.list){};
 }
 
@@ -591 +590 @@
 
                 // Adjust the ready queue size
-                ready_queue_grow( &this );
+                ready_queue_grow( &this, 0 );
 
         // Unlock the RWlock
@@ -606 +605 @@
 
                 // Adjust the ready queue size
-                ready_queue_shrink( &this );
+                ready_queue_shrink( &this, 0 );
 
         // Unlock the RWlock
@@ -616 +615 @@
                         __print_stats( this.stats, this.print_stats, "Cluster", this.name, (void*)&this );
                 }
-                #if defined(CFA_STATS_ARRAY)
-                        __flush_stat( this.stats, "Cluster", &this );
-                #endif
                 free( this.stats );
         #endif