Changes in libcfa/src/concurrency/ready_queue.cfa [32c2c5e:bd0bdd37]

File:

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

libcfa/src/concurrency/ready_queue.cfa

@@ -39 +39 @@
 #endif
 
-#define BIAS 16
+#define BIAS 4
 
 // returns the maximum number of processors the RWLock support
@@ -252 +252 @@
                 preferred =
                         //*
-                        kernelTLS().this_processor ? kernelTLS().this_processor->id * 4 : -1;
+                        kernelTLS().this_processor ? kernelTLS().this_processor->cltr_id : -1;
                         /*/
                         thrd->link.preferred * 4;
@@ -330 +330 @@
         #if defined(BIAS)
                 // Don't bother trying locally too much
-                preferred = kernelTLS().this_processor->id * 4;
+                preferred = kernelTLS().this_processor->cltr_id;
         #endif
 
@@ -352 +352 @@
 
                 #if !defined(__CFA_NO_STATISTICS__)
-                        if(locali) {
-                                __tls_stats()->ready.pick.pop.local++;
-                        }
-                        if(localj) {
+                        if(locali && localj) {
                                 __tls_stats()->ready.pick.pop.local++;
                         }
@@ -528 +525 @@
 
 // Grow the ready queue
-void ready_queue_grow  (struct cluster * cltr, int target) {
+unsigned ready_queue_grow(struct cluster * cltr, int target) {
+        unsigned preferred;
+        size_t ncount;
+
         /* paranoid */ verify( ready_mutate_islocked() );
         __cfadbg_print_safe(ready_queue, "Kernel : Growing ready queue\n");
@@ -543 +543 @@
                 // Find new count
                 // Make sure we always have atleast 1 list
-                size_t ncount = target >= 2 ? target * 4: 1;
+                if(target >= 2) {
+                        ncount = target * 4;
+                        preferred = ncount - 4;
+                } else {
+                        ncount = 1;
+                        preferred = 0;
+                }
 
                 // Allocate new array (uses realloc and memcpies the data)
@@ -578 +584 @@
 
         /* paranoid */ verify( ready_mutate_islocked() );
+        return preferred;
 }