Changeset dddb3dd0 for libcfa/src/concurrency/kernel/startup.cfa

Timestamp:

Mar 2, 2021, 1:58:12 PM (4 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:

2cd784a

Parents:

6047b00

Message:

Changed io to use ring per kernel threads.

File:

• libcfa/src/concurrency/kernel/startup.cfa (modified) (11 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
@@ -80 +81 @@
 static void ?{}(processorCtx_t & this) {}
 static void ?{}(processorCtx_t & this, processor * proc, current_stack_info_t * info);
-static void ?{}(__bin_sem_t & this);
-static void ^?{}(__bin_sem_t & this);
 
 #if defined(__CFA_WITH_VERIFY__)
@@ -91 +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);
 
 //-----------------------------------------------------------------------------
@@ -104 +101 @@
 KERNEL_STORAGE($thread,              mainThread);
 KERNEL_STORAGE(__stack_t,            mainThreadCtx);
-KERNEL_STORAGE(io_context,           mainIoContext);
 KERNEL_STORAGE(__scheduler_RWLock_t, __scheduler_lock);
 #if !defined(__CFA_NO_STATISTICS__)
@@ -200 +196 @@
 
         void ?{}(processor & this) with( this ) {
-                ( this.idle ){};
                 ( this.terminated ){};
                 ( this.runner ){};
@@ -228 +223 @@
         __kernel_alarm_startup();
 
-        // Start IO
-        __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
@@ -255 +244 @@
 
 static void __kernel_shutdown(void) {
-        //Before we start shutting things down, wait for systems that need threading to shutdown
-        io_context * mainio = (io_context *)&storage_mainIoContext;
-        ^(*mainio){};
-
         /* paranoid */ verify( __preemption_enabled() );
         disable_interrupts();
@@ -276 +261 @@
         // Disable preemption
         __kernel_alarm_shutdown();
-
-        // Stop IO
-        __kernel_io_shutdown();
 
         // Destroy the main processor and its context in reverse order of construction
@@ -479 +461 @@
 
         this.io.ctx = 0p;
-        this.io.lock = false;
+        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__)
@@ -521 +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 ){};
         ( this.runner ){};
@@ -726 +715 @@
 }
 
-extern "C" {
-        char * strerror(int);
-}
-#define CHECKED(x) { int err = x; if( err != 0 ) abort("KERNEL ERROR: Operation \"" #x "\" return error %d - %s\n", err, strerror(err)); }
-
-static void ?{}(__bin_sem_t & this) with( this ) {
-        // Create the mutex with error checking
-        pthread_mutexattr_t mattr;
-        pthread_mutexattr_init( &mattr );
-        pthread_mutexattr_settype( &mattr, PTHREAD_MUTEX_ERRORCHECK_NP);
-        pthread_mutex_init(&lock, &mattr);
-
-        pthread_cond_init (&cond, (const pthread_condattr_t *)0p);  // workaround trac#208: cast should not be required
-        val = 0;
-}
-
-static void ^?{}(__bin_sem_t & this) with( this ) {
-        CHECKED( pthread_mutex_destroy(&lock) );
-        CHECKED( pthread_cond_destroy (&cond) );
-}
-
-#undef CHECKED
-
 #if defined(__CFA_WITH_VERIFY__)
 static bool verify_fwd_bck_rng(void) {