Changes in libcfa/src/concurrency/kernel/cluster.cfa [adb3ea1:708ae38]

File:

• libcfa/src/concurrency/kernel/cluster.cfa (modified) (5 diffs)

libcfa/src/concurrency/kernel/cluster.cfa

@@ -253 +253 @@
 }
 
-static void assign_list(unsigned & valrq, unsigned & valio, dlist(processor) & list, unsigned count) {
+static void assign_list(unsigned & value, dlist(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->rdq.id = valrq;
+                it->rdq.id = value;
                 it->rdq.target = MAX;
-                it->io.id = valio;
-                it->io.target = MAX;
-                valrq += __shard_factor.readyq;
-                valio += __shard_factor.io;
+                value += __shard_factor.readyq;
                 it = &(*it)`next;
         }
@@ -268 +265 @@
 
 static void reassign_cltr_id(struct cluster * cltr) {
-        unsigned prefrq = 0;
-        unsigned prefio = 0;
-        assign_list(prefrq, prefio, cltr->procs.actives, cltr->procs.total - cltr->procs.idle);
-        assign_list(prefrq, prefio, cltr->procs.idles  , cltr->procs.idle );
-}
-
-static void assign_io($io_context ** data, size_t count, dlist(processor) & list) {
-        processor * it = &list`first;
-        while(it) {
-                /* paranoid */ verifyf( it, "Unexpected null iterator\n");
-                /* paranoid */ verifyf( it->io.id < count, "Processor %p has id %u above count %zu\n", it, it->rdq.id, count);
-                data[it->io.id] = it->io.ctx;
-                it = &(*it)`next;
-        }
-}
-
-static void reassign_cltr_io(struct cluster * cltr) {
-        assign_io(cltr->sched.io.data, cltr->sched.io.count, cltr->procs.actives);
-        assign_io(cltr->sched.io.data, cltr->sched.io.count, cltr->procs.idles  );
+        unsigned preferred = 0;
+        assign_list(preferred, cltr->procs.actives, cltr->procs.total - cltr->procs.idle);
+        assign_list(preferred, cltr->procs.idles  , cltr->procs.idle );
 }
 
@@ -341 +322 @@
 
         // Fix the io times
-        cltr->sched.io.count = target * __shard_factor.io;
+        cltr->sched.io.count = target;
         fix_times(cltr->sched.io.tscs, cltr->sched.io.count);
 
@@ -349 +330 @@
         // reassign the clusters.
         reassign_cltr_id(cltr);
-
-        cltr->sched.io.data = alloc( cltr->sched.io.count, cltr->sched.io.data`realloc );
-        reassign_cltr_io(cltr);
 
         // Make sure that everything is consistent
@@ -433 +411 @@
 
         // Fix the io times
-        cltr->sched.io.count = target * __shard_factor.io;
+        cltr->sched.io.count = target;
         fix_times(cltr->sched.io.tscs, cltr->sched.io.count);
 
         reassign_cltr_id(cltr);
-
-        cltr->sched.io.data = alloc( cltr->sched.io.count, cltr->sched.io.data`realloc );
-        reassign_cltr_io(cltr);
 
         // Make sure that everything is consistent