Changeset adb3ea1

Timestamp:

Mar 18, 2022, 2:55:27 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

98d1b90

Parents:

0b4ddb71

Message:

Some more incremental work towards using timestamps for io fairness

Location:

libcfa/src/concurrency

Files:

• kernel.hfa (modified) (4 diffs)
• kernel/cluster.cfa (modified) (5 diffs)
• kernel/cluster.hfa (modified) (1 diff)

libcfa/src/concurrency/kernel.hfa

@@ -108 +108 @@
         struct {
                 $io_context * ctx;
+                unsigned id;
+                unsigned target;
                 volatile bool pending;
                 volatile bool dirty;
@@ -209 +211 @@
                 struct {
                         // Arary of subqueues
-                        __intrusive_lane_t * volatile data;
+                        __intrusive_lane_t * data;
 
                         // Time since subqueues were processed
-                        __timestamp_t * volatile tscs;
+                        __timestamp_t * tscs;
 
                         // Number of subqueue / timestamps
@@ -219 +221 @@
 
                 struct {
+                        // Array of $io_
+                        $io_context ** data;
+
                         // Time since subqueues were processed
-                        __timestamp_t * volatile tscs;
+                        __timestamp_t * tscs;
 
                         // Number of I/O subqueues
@@ -227 +232 @@
 
                 // Cache each kernel thread belongs to
-                __cache_id_t * volatile caches;
+                __cache_id_t * caches;
         } sched;
 

libcfa/src/concurrency/kernel/cluster.cfa

@@ -253 +253 @@
 }
 
-static void assign_list(unsigned & value, dlist(processor) & list, unsigned count) {
+static void assign_list(unsigned & valrq, unsigned & valio, 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 = value;
+                it->rdq.id = valrq;
                 it->rdq.target = MAX;
-                value += __shard_factor.readyq;
+                it->io.id = valio;
+                it->io.target = MAX;
+                valrq += __shard_factor.readyq;
+                valio += __shard_factor.io;
                 it = &(*it)`next;
         }
@@ -265 +268 @@
 
 static void reassign_cltr_id(struct cluster * cltr) {
-        unsigned preferred = 0;
-        assign_list(preferred, cltr->procs.actives, cltr->procs.total - cltr->procs.idle);
-        assign_list(preferred, cltr->procs.idles  , cltr->procs.idle );
+        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  );
 }
 
@@ -322 +341 @@
 
         // Fix the io times
-        cltr->sched.io.count = target;
+        cltr->sched.io.count = target * __shard_factor.io;
         fix_times(cltr->sched.io.tscs, cltr->sched.io.count);
 
@@ -330 +349 @@
         // 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
@@ -411 +433 @@
 
         // Fix the io times
-        cltr->sched.io.count = target;
+        cltr->sched.io.count = target * __shard_factor.io;
         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

libcfa/src/concurrency/kernel/cluster.hfa

@@ -72 +72 @@
 static struct {
         const unsigned readyq;
-} __shard_factor = { 2 };
+        const unsigned io;
+} __shard_factor = { 2, 1 };
 
 // Local Variables: //