Changeset 78da4ab for libcfa/src/concurrency/kernel/startup.cfa

Timestamp:

Feb 19, 2021, 1:47:09 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

4f762d3

Parents:

b44959f

Message:

New implementation of io based on instance burrowing.
Trying to avoid the unbounded growth of the previous flat combining approach.

File:

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

libcfa/src/concurrency/kernel/startup.cfa

@@ -104 +104 @@
 KERNEL_STORAGE($thread,              mainThread);
 KERNEL_STORAGE(__stack_t,            mainThreadCtx);
-KERNEL_STORAGE(io_context,           mainPollerThread);
+KERNEL_STORAGE(io_context,           mainIoContext);
 KERNEL_STORAGE(__scheduler_RWLock_t, __scheduler_lock);
 #if !defined(__CFA_NO_STATISTICS__)
@@ -231 +231 @@
         __kernel_io_startup();
 
+        io_context * mainio = (io_context *)&storage_mainIoContext;
+        (*mainio){ *mainCluster };
+
         // Add the main thread to the ready queue
         // once resume is called on mainProcessor->runner the mainThread needs to be scheduled like any normal thread
@@ -243 +246 @@
         // THE SYSTEM IS NOW COMPLETELY RUNNING
 
-
-        // SKULLDUGGERY: The constructor for the mainCluster will call alloc with a dimension of 0
-        // malloc *can* return a non-null value, we should free it if that is the case
-        free( mainCluster->io.ctxs );
-
-        // Now that the system is up, finish creating systems that need threading
-        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");
 
@@ -263 +256 @@
 static void __kernel_shutdown(void) {
         //Before we start shutting things down, wait for systems that need threading to shutdown
-        ^(*mainCluster->io.ctxs){};
-        mainCluster->io.cnt  = 0;
-        mainCluster->io.ctxs = 0p;
+        io_context * mainio = (io_context *)&storage_mainIoContext;
+        ^(*mainio){};
 
         /* paranoid */ verify( __preemption_enabled() );
@@ -486 +478 @@
         pending_preemption = false;
 
+        this.io.ctx = 0p;
+        this.io.lock = false;
+
         #if !defined(__CFA_NO_STATISTICS__)
                 print_stats = 0;
@@ -584 +579 @@
         threads{ __get };
 
+        io.arbiter = create();
+        io.params = io_params;
+
         doregister(this);
 
@@ -596 +594 @@
         ready_mutate_unlock( last_size );
         enable_interrupts_noPoll(); // Don't poll, could be in main cluster
-
-
-        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) {
-        for(i; this.io.cnt) {
-                ^(this.io.ctxs[i]){ true };
-        }
-        free(this.io.ctxs);
+        destroy(this.io.arbiter);
 
         // Lock the RWlock so no-one pushes/pops while we are changing the queue