Changeset 8e4aa05 for libcfa/src/concurrency/kernel/startup.cfa

Timestamp:

Mar 4, 2021, 7:40:25 PM (5 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:

77d601f

Parents:

342af53 (diff), a5040fe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

libcfa/src/concurrency/kernel/startup.cfa

@@ -22 +22 @@
 extern "C" {
       #include <limits.h>       // PTHREAD_STACK_MIN
+        #include <sys/eventfd.h>  // eventfd
       #include <sys/mman.h>     // mprotect
       #include <sys/resource.h> // getrlimit
@@ -89 +90 @@
 extern void __kernel_alarm_startup(void);
 extern void __kernel_alarm_shutdown(void);
-extern void __kernel_io_startup (void);
-extern void __kernel_io_shutdown(void);
 
 //-----------------------------------------------------------------------------
@@ -102 +101 @@
 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__)
@@ -198 +196 @@
 
         void ?{}(processor & this) with( this ) {
-                ( this.idle ){};
-                ( this.terminated ){ 0 };
+                ( this.terminated ){};
                 ( this.runner ){};
                 init( this, "Main Processor", *mainCluster );
@@ -226 +223 @@
         __kernel_alarm_startup();
 
-        // Start IO
-        __kernel_io_startup();
-
         // 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
@@ -241 +235 @@
         // 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");
 
@@ -260 +244 @@
 
 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;
-
         /* paranoid */ verify( __preemption_enabled() );
         disable_interrupts();
@@ -282 +261 @@
         // Disable preemption
         __kernel_alarm_shutdown();
-
-        // Stop IO
-        __kernel_io_shutdown();
 
         // Destroy the main processor and its context in reverse order of construction
@@ -484 +460 @@
         pending_preemption = false;
 
+        this.io.ctx = 0p;
+        this.io.pending = false;
+        this.io.dirty   = false;
+
+        this.idle = eventfd(0, 0);
+        if (idle < 0) {
+                abort("KERNEL ERROR: PROCESSOR EVENTFD - %s\n", strerror(errno));
+        }
+
         #if !defined(__CFA_NO_STATISTICS__)
                 print_stats = 0;
@@ -524 +509 @@
         // Finally we don't need the read_lock any more
         unregister((__processor_id_t*)&this);
+
+        close(this.idle);
 }
 
 void ?{}(processor & this, const char name[], cluster & _cltr) {
-        ( this.idle ){};
-        ( this.terminated ){ 0 };
+        ( this.terminated ){};
         ( this.runner ){};
 
@@ -549 +535 @@
                 __wake_proc( &this );
 
-                P( terminated );
+                wait( terminated );
                 /* paranoid */ verify( active_processor() != &this);
         }
@@ -582 +568 @@
         threads{ __get };
 
+        io.arbiter = create();
+        io.params = io_params;
+
         doregister(this);
 
@@ -594 +583 @@
         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
@@ -736 +715 @@
 }
 
-
 #if defined(__CFA_WITH_VERIFY__)
 static bool verify_fwd_bck_rng(void) {