Changes in libcfa/src/concurrency/kernel/startup.cfa [639e4fc:116a2ea]

File:

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

libcfa/src/concurrency/kernel/startup.cfa

@@ -16 +16 @@
 #define __cforall_thread__
 #define _GNU_SOURCE
-
-// #define __CFA_DEBUG_PRINT_RUNTIME_CORE__
 
 // C Includes
@@ -115 +113 @@
 KERNEL_STORAGE(thread$,              mainThread);
 KERNEL_STORAGE(__stack_t,            mainThreadCtx);
+// KERNEL_STORAGE(__scheduler_RWLock_t, __scheduler_lock);
+KERNEL_STORAGE(eventfd_t,            mainIdleEventFd);
+KERNEL_STORAGE(io_future_t,          mainIdleFuture);
 #if !defined(__CFA_NO_STATISTICS__)
 KERNEL_STORAGE(__stats_t, mainProcStats);
@@ -221 +222 @@
                 ( this.runner ){};
                 init( this, "Main Processor", *mainCluster, 0p );
-                kernel_thread = __cfaabi_pthread_self();
+                kernel_thread = pthread_self();
 
                 runner{ &this };
@@ -231 +232 @@
         mainProcessor = (processor *)&storage_mainProcessor;
         (*mainProcessor){};
+
+        mainProcessor->idle_wctx.rdbuf = &storage_mainIdleEventFd;
+        mainProcessor->idle_wctx.ftr   = (io_future_t*)&storage_mainIdleFuture;
+        /* paranoid */ verify( sizeof(storage_mainIdleEventFd) == sizeof(eventfd_t) );
 
         __cfa_io_start( mainProcessor );
@@ -278 +283 @@
 }
 
-extern "C"{
-        void pthread_delete_kernel_threads_();
-}
-
-
 static void __kernel_shutdown(void) {
         if(!cfa_main_returned) return;
-
-        //delete kernel threads for pthread_concurrency
-        pthread_delete_kernel_threads_();
-
         /* paranoid */ verify( __preemption_enabled() );
         disable_interrupts();
@@ -331 +327 @@
 
                 /* paranoid */ verify( this.do_terminate == true );
-                __cfadbg_print_safe(runtime_core, "Kernel : destroyed main processor context %p\n", &runner);
+                __cfaabi_dbg_print_safe("Kernel : destroyed main processor context %p\n", &runner);
         }
 
@@ -377 +373 @@
         register_tls( proc );
 
+        // used for idle sleep when io_uring is present
+        io_future_t future;
+        eventfd_t idle_buf;
+        proc->idle_wctx.ftr = &future;
+        proc->idle_wctx.rdbuf = &idle_buf;
+
+
         // SKULLDUGGERY: We want to create a context for the processor coroutine
         // which is needed for the 2-step context switch. However, there is no reason
@@ -385 +388 @@
         (proc->runner){ proc, &info };
 
-        __cfadbg_print_safe(runtime_core, "Coroutine : created stack %p\n", get_coroutine(proc->runner)->stack.storage);
+        __cfaabi_dbg_print_safe("Coroutine : created stack %p\n", get_coroutine(proc->runner)->stack.storage);
 
         //Set global state
@@ -511 +514 @@
         self_mon.recursion = 1;
         self_mon_p = &self_mon;
-        rdy_link.next = 0p;
-        rdy_link.ts   = MAX;
+        link.next = 0p;
+        link.ts   = MAX;
         preferred = ready_queue_new_preferred();
         last_proc = 0p;
         random_state = __global_random_mask ? __global_random_prime : __global_random_prime ^ rdtscl();
         #if defined( __CFA_WITH_VERIFY__ )
-                executing = 0p;
                 canary = 0x0D15EA5E0D15EA5Ep;
         #endif
 
+        node.next = 0p;
+        node.prev = 0p;
         doregister(curr_cluster, this);
 
@@ -643 +647 @@
         #endif
 
-        threads{};
+        threads{ __get };
 
         io.arbiter = create();
         io.params = io_params;
-
-        managed.procs = 0p;
-        managed.cnt = 0;
 
         doregister(this);
@@ -666 +667 @@
 
 void ^?{}(cluster & this) libcfa_public {
-        set_concurrency( this, 0 );
-
         destroy(this.io.arbiter);
 
@@ -723 +722 @@
         lock      (cltr->thread_list_lock __cfaabi_dbg_ctx2);
         cltr->nthreads += 1;
-        insert_first(cltr->threads, thrd);
+        push_front(cltr->threads, thrd);
         unlock    (cltr->thread_list_lock);
 }
@@ -729 +728 @@
 void unregister( cluster * cltr, thread$ & thrd ) {
         lock  (cltr->thread_list_lock __cfaabi_dbg_ctx2);
-        {
-                tytagref( dlink(thread$), dlink(thread$) ) ?`inner( thread$ & this ) = void;
-                with( DLINK_VIA( thread$, struct __thread_user_link ) )
-                        remove( thrd );
-                cltr->nthreads -= 1;
-        }
+        remove(cltr->threads, thrd );
+        cltr->nthreads -= 1;
         unlock(cltr->thread_list_lock);
 }
@@ -782 +777 @@
         pthread_attr_t attr;
 
-        check( __cfaabi_pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
+        check( pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
 
         size_t stacksize = max( PTHREAD_STACK_MIN, DEFAULT_STACK_SIZE );
@@ -809 +804 @@
         #endif
 
-        check( __cfaabi_pthread_attr_setstack( &attr, stack, stacksize ), "pthread_attr_setstack" );
-        check( __cfaabi_pthread_create( pthread, &attr, start, arg ), "pthread_create" );
+        check( pthread_attr_setstack( &attr, stack, stacksize ), "pthread_attr_setstack" );
+        check( pthread_create( pthread, &attr, start, arg ), "pthread_create" );
         return stack;
 }
 
 void __destroy_pthread( pthread_t pthread, void * stack, void ** retval ) {
-        int err = __cfaabi_pthread_join( pthread, retval );
+        int err = pthread_join( pthread, retval );
         if( err != 0 ) abort("KERNEL ERROR: joining pthread %p caused error %s\n", (void*)pthread, strerror(err));
 
@@ -821 +816 @@
                 pthread_attr_t attr;
 
-                check( __cfaabi_pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
+                check( pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
 
                 size_t stacksize;
                 // default stack size, normally defined by shell limit
-                check( __cfaabi_pthread_attr_getstacksize( &attr, &stacksize ), "pthread_attr_getstacksize" );
+                check( pthread_attr_getstacksize( &attr, &stacksize ), "pthread_attr_getstacksize" );
                 assert( stacksize >= PTHREAD_STACK_MIN );
                 stacksize += __page_size;
@@ -843 +838 @@
 }
 
-unsigned set_concurrency( cluster & this, unsigned new ) libcfa_public {
-        unsigned old = this.managed.cnt;
-
-        __cfadbg_print_safe(runtime_core, "Kernel : resizing cluster from %u to %u\n", old, (unsigned)new);
-
-        // Delete all the old unneeded procs
-        if(old > new) for(i; (unsigned)new ~ old) {
-                __cfadbg_print_safe(runtime_core, "Kernel : destroying %u\n", i);
-                delete( this.managed.procs[i] );
-        }
-
-        // Allocate new array (uses realloc and memcpies the data)
-        this.managed.procs = alloc( new, this.managed.procs`realloc );
-        this.managed.cnt = new;
-
-        // Create the desired new procs
-        if(old < new) for(i; old ~ new) {
-                __cfadbg_print_safe(runtime_core, "Kernel : constructing %u\n", i);
-                (*(this.managed.procs[i] = alloc())){ this };
-        }
-
-        // return the old count
-        return old;
-}
-
 #if defined(__CFA_WITH_VERIFY__)
 static bool verify_fwd_bck_rng(void) {