Changeset f00b26d4 for libcfa/src/concurrency/kernel.cfa

Timestamp:

Jul 30, 2020, 3:00:19 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

920dca3

Parents:

e0f93e0

Message:

Re-worked IO to use epoll and support multiple io_contexts per cluster.
Also redid how cluster options are handled.
Changed how iofwd calls are passed to support future features and io_contexts rework.

File:

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

libcfa/src/concurrency/kernel.cfa

@@ -130 +130 @@
 KERNEL_STORAGE($thread,              mainThread);
 KERNEL_STORAGE(__stack_t,            mainThreadCtx);
+KERNEL_STORAGE(io_context,           mainPollerThread);
 KERNEL_STORAGE(__scheduler_RWLock_t, __scheduler_lock);
 #if !defined(__CFA_NO_STATISTICS__)
@@ -310 +311 @@
 }
 
-void ?{}(cluster & this, const char name[], Duration preemption_rate, unsigned io_flags) with( this ) {
+void ?{}(cluster & this, const char name[], Duration preemption_rate, unsigned num_io, const io_context_params & io_params) with( this ) {
         this.name = name;
         this.preemption_rate = preemption_rate;
@@ -335 +336 @@
         ready_mutate_unlock( last_size );
 
-
-        __kernel_io_startup( this, io_flags, &this == mainCluster );
+        this.io.cnt  = num_io;
+        this.io.ctxs = aalloc(num_io);
+        for(i; this.io.cnt) {
+                (this.io.ctxs[i]){ this, io_params };
+        }
 }
 
 void ^?{}(cluster & this) {
-        __kernel_io_shutdown( this, &this == mainCluster );
+        for(i; this.io.cnt) {
+                ^(this.io.ctxs[i]){ true };
+        }
+        free(this.io.ctxs);
 
         // Lock the RWlock so no-one pushes/pops while we are changing the queue
@@ -853 +860 @@
         // Initialize the main cluster
         mainCluster = (cluster *)&storage_mainCluster;
-        (*mainCluster){"Main Cluster"};
+        (*mainCluster){"Main Cluster", 0};
 
         __cfadbg_print_safe(runtime_core, "Kernel : Main cluster ready\n");
@@ -901 +908 @@
         #endif
 
+        // Start IO
+        __kernel_io_startup();
+
         // Enable preemption
         kernel_start_preemption();
@@ -918 +928 @@
 
         // Now that the system is up, finish creating systems that need threading
-        __kernel_io_finish_start( *mainCluster );
-
+        mainCluster->io.ctxs = (io_context *)&storage_mainPollerThread;
+        mainCluster->io.cnt  = 1;
+        (*mainCluster->io.ctxs){ *mainCluster };
 
         __cfadbg_print_safe(runtime_core, "Kernel : Started\n--------------------------------------------------\n\n");
@@ -930 +941 @@
 static void __kernel_shutdown(void) {
         //Before we start shutting things down, wait for systems that need threading to shutdown
-        __kernel_io_prepare_stop( *mainCluster );
+        ^(*mainCluster->io.ctxs){};
+        mainCluster->io.cnt  = 0;
+        mainCluster->io.ctxs = 0p;
 
         /* paranoid */ verify( TL_GET( preemption_state.enabled ) );
@@ -949 +962 @@
         // Disable preemption
         kernel_stop_preemption();
+
+        // Stop IO
+        __kernel_io_shutdown();
 
         // Destroy the main processor and its context in reverse order of construction