Changeset 3d5701e for libcfa/src/concurrency/kernel.cfa

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

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

libcfa/src/concurrency/kernel.cfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun 20 17:21:23 2019
-// Update Count     : 25
+// Last Modified On : Tue Feb  4 13:03:15 2020
+// Update Count     : 58
 //
 
@@ -26 +26 @@
 #include <signal.h>
 #include <unistd.h>
+#include <limits.h>                                                                             // PTHREAD_STACK_MIN
+#include <sys/mman.h>                                                                   // mprotect
 }
 
@@ -40 +42 @@
 //-----------------------------------------------------------------------------
 // Some assembly required
-#if   defined( __i386 )
+#if defined( __i386 )
         #define CtxGet( ctx )        \
                 __asm__ volatile (     \
@@ -108 +110 @@
 //-----------------------------------------------------------------------------
 //Start and stop routine for the kernel, declared first to make sure they run first
-static void kernel_startup(void)  __attribute__(( constructor( STARTUP_PRIORITY_KERNEL ) ));
-static void kernel_shutdown(void) __attribute__(( destructor ( STARTUP_PRIORITY_KERNEL ) ));
+static void __kernel_startup (void) __attribute__(( constructor( STARTUP_PRIORITY_KERNEL ) ));
+static void __kernel_shutdown(void) __attribute__(( destructor ( STARTUP_PRIORITY_KERNEL ) ));
 
 //-----------------------------------------------------------------------------
@@ -115 +117 @@
 KERNEL_STORAGE(cluster,         mainCluster);
 KERNEL_STORAGE(processor,       mainProcessor);
-KERNEL_STORAGE(thread_desc,     mainThread);
+KERNEL_STORAGE($thread, mainThread);
 KERNEL_STORAGE(__stack_t,       mainThreadCtx);
 
 cluster     * mainCluster;
 processor   * mainProcessor;
-thread_desc * mainThread;
+$thread * mainThread;
 
 extern "C" {
-struct { __dllist_t(cluster) list; __spinlock_t lock; } __cfa_dbg_global_clusters;
+        struct { __dllist_t(cluster) list; __spinlock_t lock; } __cfa_dbg_global_clusters;
 }
 
@@ -131 +133 @@
 // Global state
 thread_local struct KernelThreadData kernelTLS __attribute__ ((tls_model ( "initial-exec" ))) = {
+        NULL,                                                                                           // cannot use 0p
         NULL,
-        NULL,
-        { 1, false, false }
+        { 1, false, false },
+        6u //this should be seeded better but due to a bug calling rdtsc doesn't work
 };
 
@@ -139 +142 @@
 // Struct to steal stack
 struct current_stack_info_t {
-        __stack_t * storage;            // pointer to stack object
-        void *base;                             // base of stack
-        void *limit;                    // stack grows towards stack limit
-        void *context;                  // address of cfa_context_t
+        __stack_t * storage;                                                            // pointer to stack object
+        void * base;                                                                            // base of stack
+        void * limit;                                                                           // stack grows towards stack limit
+        void * context;                                                                         // address of cfa_context_t
 };
 
@@ -161 +164 @@
 // Main thread construction
 
-void ?{}( coroutine_desc & this, current_stack_info_t * info) with( this ) {
+void ?{}( $coroutine & this, current_stack_info_t * info) with( this ) {
         stack.storage = info->storage;
         with(*stack.storage) {
@@ -171 +174 @@
         name = "Main Thread";
         state = Start;
-        starter = NULL;
-        last = NULL;
-        cancellation = NULL;
-}
-
-void ?{}( thread_desc & this, current_stack_info_t * info) with( this ) {
+        starter = 0p;
+        last = 0p;
+        cancellation = 0p;
+}
+
+void ?{}( $thread & this, current_stack_info_t * info) with( this ) {
         state = Start;
         self_cor{ info };
@@ -184 +187 @@
         self_mon.recursion = 1;
         self_mon_p = &self_mon;
-        next = NULL;
-
-        node.next = NULL;
-        node.prev = NULL;
+        next = 0p;
+
+        node.next = 0p;
+        node.prev = 0p;
         doregister(curr_cluster, this);
 
@@ -205 +208 @@
 }
 
-static void start(processor * this);
-void ?{}(processor & this, const char * name, cluster & cltr) with( this ) {
+static void * __invoke_processor(void * arg);
+
+void ?{}(processor & this, const char name[], cluster & cltr) with( this ) {
         this.name = name;
         this.cltr = &cltr;
         terminated{ 0 };
+        destroyer = 0p;
         do_terminate = false;
-        preemption_alarm = NULL;
+        preemption_alarm = 0p;
         pending_preemption = false;
         runner.proc = &this;
@@ -217 +222 @@
         idleLock{};
 
-        start( &this );
+        __cfaabi_dbg_print_safe("Kernel : Starting core %p\n", &this);
+
+        this.stack = __create_pthread( &this.kernel_thread, __invoke_processor, (void *)&this );
+
+        __cfaabi_dbg_print_safe("Kernel : core %p started\n", &this);
 }
 
@@ -231 +240 @@
         }
 
-        pthread_join( kernel_thread, NULL );
-}
-
-void ?{}(cluster & this, const char * name, Duration preemption_rate) with( this ) {
+        pthread_join( kernel_thread, 0p );
+        free( this.stack );
+}
+
+void ?{}(cluster & this, const char name[], Duration preemption_rate) with( this ) {
         this.name = name;
         this.preemption_rate = preemption_rate;
@@ -254 +264 @@
 // Kernel Scheduling logic
 //=============================================================================================
-static void runThread(processor * this, thread_desc * dst);
-static void finishRunning(processor * this);
-static void halt(processor * this);
+static $thread * __next_thread(cluster * this);
+static void __run_thread(processor * this, $thread * dst);
+static void __halt(processor * this);
 
 //Main of the processor contexts
 void main(processorCtx_t & runner) {
+        // Because of a bug, we couldn't initialized the seed on construction
+        // Do it here
+        kernelTLS.rand_seed ^= rdtscl();
+
         processor * this = runner.proc;
         verify(this);
@@ -273 +287 @@
                 __cfaabi_dbg_print_safe("Kernel : core %p started\n", this);
 
-                thread_desc * readyThread = NULL;
-                for( unsigned int spin_count = 0; ! __atomic_load_n(&this->do_terminate, __ATOMIC_SEQ_CST); spin_count++ )
-                {
-                        readyThread = nextThread( this->cltr );
-
-                        if(readyThread)
-                        {
-                                verify( ! kernelTLS.preemption_state.enabled );
-
-                                runThread(this, readyThread);
-
-                                verify( ! kernelTLS.preemption_state.enabled );
-
-                                //Some actions need to be taken from the kernel
-                                finishRunning(this);
+                $thread * readyThread = 0p;
+                for( unsigned int spin_count = 0; ! __atomic_load_n(&this->do_terminate, __ATOMIC_SEQ_CST); spin_count++ ) {
+                        readyThread = __next_thread( this->cltr );
+
+                        if(readyThread) {
+                                /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+                                /* paranoid */ verifyf( readyThread->state == Inactive || readyThread->state == Start || readyThread->preempted != __NO_PREEMPTION, "state : %d, preempted %d\n", readyThread->state, readyThread->preempted);
+                                /* paranoid */ verifyf( readyThread->next == 0p, "Expected null got %p", readyThread->next );
+
+                                __run_thread(this, readyThread);
+
+                                /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
 
                                 spin_count = 0;
-                        }
-                        else
-                        {
+                        } else {
                                 // spin(this, &spin_count);
-                                halt(this);
+                                __halt(this);
                         }
                 }
@@ -314 +323 @@
 // runThread runs a thread by context switching
 // from the processor coroutine to the target thread
-static void runThread(processor * this, thread_desc * thrd_dst) {
-        coroutine_desc * proc_cor = get_coroutine(this->runner);
-
-        // Reset the terminating actions here
-        this->finish.action_code = No_Action;
+static void __run_thread(processor * this, $thread * thrd_dst) {
+        $coroutine * proc_cor = get_coroutine(this->runner);
 
         // Update global state
         kernelTLS.this_thread = thrd_dst;
 
-        // set state of processor coroutine to inactive and the thread to active
-        proc_cor->state = proc_cor->state == Halted ? Halted : Inactive;
-        thrd_dst->state = Active;
-
-        // set context switch to the thread that the processor is executing
-        verify( thrd_dst->context.SP );
-        CtxSwitch( &proc_cor->context, &thrd_dst->context );
-        // when CtxSwitch returns we are back in the processor coroutine
-
-        // set state of processor coroutine to active and the thread to inactive
-        thrd_dst->state = thrd_dst->state == Halted ? Halted : Inactive;
+        // set state of processor coroutine to inactive
+        verify(proc_cor->state == Active);
+        proc_cor->state = Inactive;
+
+        // Actually run the thread
+        RUNNING:  while(true) {
+                if(unlikely(thrd_dst->preempted)) {
+                        thrd_dst->preempted = __NO_PREEMPTION;
+                        verify(thrd_dst->state == Active || thrd_dst->state == Rerun);
+                } else {
+                        verify(thrd_dst->state == Start || thrd_dst->state == Primed || thrd_dst->state == Inactive);
+                        thrd_dst->state = Active;
+                }
+
+                /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+
+                // set context switch to the thread that the processor is executing
+                verify( thrd_dst->context.SP );
+                __cfactx_switch( &proc_cor->context, &thrd_dst->context );
+                // when __cfactx_switch returns we are back in the processor coroutine
+
+                /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+
+
+                // We just finished running a thread, there are a few things that could have happened.
+                // 1 - Regular case : the thread has blocked and now one has scheduled it yet.
+                // 2 - Racy case    : the thread has blocked but someone has already tried to schedule it.
+                // 3 - Polite Racy case : the thread has blocked, someone has already tried to schedule it, but the thread is nice and wants to go through the ready-queue any way
+                // 4 - Preempted
+                // In case 1, we may have won a race so we can't write to the state again.
+                // In case 2, we lost the race so we now own the thread.
+                // In case 3, we lost the race but can just reschedule the thread.
+
+                if(unlikely(thrd_dst->preempted != __NO_PREEMPTION)) {
+                        // The thread was preempted, reschedule it and reset the flag
+                        __schedule_thread( thrd_dst );
+                        break RUNNING;
+                }
+
+                // set state of processor coroutine to active and the thread to inactive
+                static_assert(sizeof(thrd_dst->state) == sizeof(int));
+                enum coroutine_state old_state = __atomic_exchange_n(&thrd_dst->state, Inactive, __ATOMIC_SEQ_CST);
+                switch(old_state) {
+                        case Halted:
+                                // The thread has halted, it should never be scheduled/run again, leave it back to Halted and move on
+                                thrd_dst->state = Halted;
+
+                                // We may need to wake someone up here since
+                                unpark( this->destroyer );
+                                this->destroyer = 0p;
+                                break RUNNING;
+                        case Active:
+                                // This is case 1, the regular case, nothing more is needed
+                                break RUNNING;
+                        case Rerun:
+                                // This is case 2, the racy case, someone tried to run this thread before it finished blocking
+                                // In this case, just run it again.
+                                continue RUNNING;
+                        default:
+                                // This makes no sense, something is wrong abort
+                                abort("Finished running a thread that was Inactive/Start/Primed %d\n", old_state);
+                }
+        }
+
+        // Just before returning to the processor, set the processor coroutine to active
         proc_cor->state = Active;
 }
 
 // KERNEL_ONLY
-static void returnToKernel() {
-        coroutine_desc * proc_cor = get_coroutine(kernelTLS.this_processor->runner);
-        thread_desc * thrd_src = kernelTLS.this_thread;
-
-        // set state of current coroutine to inactive
-        thrd_src->state = thrd_src->state == Halted ? Halted : Inactive;
-        proc_cor->state = Active;
-        int local_errno = *__volatile_errno();
-        #if defined( __i386 ) || defined( __x86_64 )
-                __x87_store;
-        #endif
-
-        // set new coroutine that the processor is executing
-        // and context switch to it
-        verify( proc_cor->context.SP );
-        CtxSwitch( &thrd_src->context, &proc_cor->context );
-
-        // set state of new coroutine to active
-        proc_cor->state = proc_cor->state == Halted ? Halted : Inactive;
-        thrd_src->state = Active;
-
-        #if defined( __i386 ) || defined( __x86_64 )
-                __x87_load;
-        #endif
-        *__volatile_errno() = local_errno;
-}
-
-// KERNEL_ONLY
-// Once a thread has finished running, some of
-// its final actions must be executed from the kernel
-static void finishRunning(processor * this) with( this->finish ) {
-        verify( ! kernelTLS.preemption_state.enabled );
-        choose( action_code ) {
-        case No_Action:
-                break;
-        case Release:
-                unlock( *lock );
-        case Schedule:
-                ScheduleThread( thrd );
-        case Release_Schedule:
-                unlock( *lock );
-                ScheduleThread( thrd );
-        case Release_Multi:
-                for(int i = 0; i < lock_count; i++) {
-                        unlock( *locks[i] );
-                }
-        case Release_Multi_Schedule:
-                for(int i = 0; i < lock_count; i++) {
-                        unlock( *locks[i] );
-                }
-                for(int i = 0; i < thrd_count; i++) {
-                        ScheduleThread( thrds[i] );
-                }
-        case Callback:
-                callback();
-        default:
-                abort("KERNEL ERROR: Unexpected action to run after thread");
-        }
+void returnToKernel() {
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+        $coroutine * proc_cor = get_coroutine(kernelTLS.this_processor->runner);
+        $thread * thrd_src = kernelTLS.this_thread;
+
+        // Run the thread on this processor
+        {
+                int local_errno = *__volatile_errno();
+                #if defined( __i386 ) || defined( __x86_64 )
+                        __x87_store;
+                #endif
+                verify( proc_cor->context.SP );
+                __cfactx_switch( &thrd_src->context, &proc_cor->context );
+                #if defined( __i386 ) || defined( __x86_64 )
+                        __x87_load;
+                #endif
+                *__volatile_errno() = local_errno;
+        }
+
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
 }
 
@@ -402 +424 @@
 // This is the entry point for processors (kernel threads)
 // It effectively constructs a coroutine by stealing the pthread stack
-static void * CtxInvokeProcessor(void * arg) {
+static void * __invoke_processor(void * arg) {
         processor * proc = (processor *) arg;
         kernelTLS.this_processor = proc;
-        kernelTLS.this_thread    = NULL;
+        kernelTLS.this_thread    = 0p;
         kernelTLS.preemption_state.[enabled, disable_count] = [false, 1];
         // SKULLDUGGERY: We want to create a context for the processor coroutine
@@ -418 +440 @@
 
         //Set global state
-        kernelTLS.this_thread    = NULL;
+        kernelTLS.this_thread = 0p;
 
         //We now have a proper context from which to schedule threads
@@ -434 +456 @@
         __cfaabi_dbg_print_safe("Kernel : core %p main ended (%p)\n", proc, &proc->runner);
 
-        return NULL;
-}
-
-static void start(processor * this) {
-        __cfaabi_dbg_print_safe("Kernel : Starting core %p\n", this);
-
-        pthread_create( &this->kernel_thread, NULL, CtxInvokeProcessor, (void*)this );
-
-        __cfaabi_dbg_print_safe("Kernel : core %p started\n", this);
+        return 0p;
+}
+
+static void Abort( int ret, const char func[] ) {
+        if ( ret ) {                                                                            // pthread routines return errno values
+                abort( "%s : internal error, error(%d) %s.", func, ret, strerror( ret ) );
+        } // if
+} // Abort
+
+void * __create_pthread( pthread_t * pthread, void * (*start)(void *), void * arg ) {
+        pthread_attr_t attr;
+
+        Abort( pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
+
+        size_t stacksize;
+        // default stack size, normally defined by shell limit
+        Abort( pthread_attr_getstacksize( &attr, &stacksize ), "pthread_attr_getstacksize" );
+        assert( stacksize >= PTHREAD_STACK_MIN );
+
+        void * stack;
+        __cfaabi_dbg_debug_do(
+                stack = memalign( __page_size, stacksize + __page_size );
+                // pthread has no mechanism to create the guard page in user supplied stack.
+                if ( mprotect( stack, __page_size, PROT_NONE ) == -1 ) {
+                        abort( "mprotect : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
+                } // if
+        );
+        __cfaabi_dbg_no_debug_do(
+                stack = malloc( stacksize );
+        );
+
+        Abort( pthread_attr_setstack( &attr, stack, stacksize ), "pthread_attr_setstack" );
+
+        Abort( pthread_create( pthread, &attr, start, arg ), "pthread_create" );
+        return stack;
 }
 
 // KERNEL_ONLY
-void kernel_first_resume( processor * this ) {
-        thread_desc * src = mainThread;
-        coroutine_desc * dst = get_coroutine(this->runner);
+static void __kernel_first_resume( processor * this ) {
+        $thread * src = mainThread;
+        $coroutine * dst = get_coroutine(this->runner);
 
         verify( ! kernelTLS.preemption_state.enabled );
 
+        kernelTLS.this_thread->curr_cor = dst;
         __stack_prepare( &dst->stack, 65000 );
-        CtxStart(&this->runner, CtxInvokeCoroutine);
+        __cfactx_start(main, dst, this->runner, __cfactx_invoke_coroutine);
 
         verify( ! kernelTLS.preemption_state.enabled );
@@ -465 +514 @@
         // context switch to specified coroutine
         verify( dst->context.SP );
-        CtxSwitch( &src->context, &dst->context );
-        // when CtxSwitch returns we are back in the src coroutine
+        __cfactx_switch( &src->context, &dst->context );
+        // when __cfactx_switch returns we are back in the src coroutine
+
+        mainThread->curr_cor = &mainThread->self_cor;
 
         // set state of new coroutine to active
@@ -475 +526 @@
 
 // KERNEL_ONLY
-void kernel_last_resume( processor * this ) {
-        coroutine_desc * src = &mainThread->self_cor;
-        coroutine_desc * dst = get_coroutine(this->runner);
+static void __kernel_last_resume( processor * this ) {
+        $coroutine * src = &mainThread->self_cor;
+        $coroutine * dst = get_coroutine(this->runner);
 
         verify( ! kernelTLS.preemption_state.enabled );
@@ -484 +535 @@
 
         // context switch to the processor
-        CtxSwitch( &src->context, &dst->context );
+        __cfactx_switch( &src->context, &dst->context );
 }
 
 //-----------------------------------------------------------------------------
 // Scheduler routines
-
 // KERNEL ONLY
-void ScheduleThread( thread_desc * thrd ) {
-        verify( thrd );
-        verify( thrd->state != Halted );
-
-        verify( ! kernelTLS.preemption_state.enabled );
-
-        verifyf( thrd->next == NULL, "Expected null got %p", thrd->next );
-
-        with( *thrd->curr_cluster ) {
-                lock  ( ready_queue_lock __cfaabi_dbg_ctx2 );
-                bool was_empty = !(ready_queue != 0);
-                append( ready_queue, thrd );
-                unlock( ready_queue_lock );
-
-                if(was_empty) {
-                        lock      (proc_list_lock __cfaabi_dbg_ctx2);
-                        if(idles) {
-                                wake_fast(idles.head);
-                        }
-                        unlock    (proc_list_lock);
+void __schedule_thread( $thread * thrd ) with( *thrd->curr_cluster ) {
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+        /* paranoid */ #if defined( __CFA_WITH_VERIFY__ )
+        /* paranoid */ if( thrd->state == Inactive || thrd->state == Start ) assertf( thrd->preempted == __NO_PREEMPTION,
+                          "Error inactive thread marked as preempted, state %d, preemption %d\n", thrd->state, thrd->preempted );
+        /* paranoid */ if( thrd->preempted != __NO_PREEMPTION ) assertf(thrd->state == Active || thrd->state == Rerun,
+                          "Error preempted thread marked as not currently running, state %d, preemption %d\n", thrd->state, thrd->preempted );
+        /* paranoid */ #endif
+        /* paranoid */ verifyf( thrd->next == 0p, "Expected null got %p", thrd->next );
+
+        lock  ( ready_queue_lock __cfaabi_dbg_ctx2 );
+        bool was_empty = !(ready_queue != 0);
+        append( ready_queue, thrd );
+        unlock( ready_queue_lock );
+
+        if(was_empty) {
+                lock      (proc_list_lock __cfaabi_dbg_ctx2);
+                if(idles) {
+                        wake_fast(idles.head);
                 }
-                else if( struct processor * idle = idles.head ) {
-                        wake_fast(idle);
-                }
-
-        }
-
-        verify( ! kernelTLS.preemption_state.enabled );
+                unlock    (proc_list_lock);
+        }
+        else if( struct processor * idle = idles.head ) {
+                wake_fast(idle);
+        }
+
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
 }
 
 // KERNEL ONLY
-thread_desc * nextThread(cluster * this) with( *this ) {
-        verify( ! kernelTLS.preemption_state.enabled );
+static $thread * __next_thread(cluster * this) with( *this ) {
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+
         lock( ready_queue_lock __cfaabi_dbg_ctx2 );
-        thread_desc * head = pop_head( ready_queue );
+        $thread * head = pop_head( ready_queue );
         unlock( ready_queue_lock );
-        verify( ! kernelTLS.preemption_state.enabled );
+
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
         return head;
 }
 
-void BlockInternal() {
+void unpark( $thread * thrd ) {
+        if( !thrd ) return;
+
         disable_interrupts();
-        verify( ! kernelTLS.preemption_state.enabled );
+        static_assert(sizeof(thrd->state) == sizeof(int));
+        enum coroutine_state old_state = __atomic_exchange_n(&thrd->state, Rerun, __ATOMIC_SEQ_CST);
+        switch(old_state) {
+                case Active:
+                        // Wake won the race, the thread will reschedule/rerun itself
+                        break;
+                case Inactive:
+                        /* paranoid */ verify( ! thrd->preempted != __NO_PREEMPTION );
+
+                        // Wake lost the race,
+                        thrd->state = Inactive;
+                        __schedule_thread( thrd );
+                        break;
+                case Rerun:
+                        abort("More than one thread attempted to schedule thread %p\n", thrd);
+                        break;
+                case Halted:
+                case Start:
+                case Primed:
+                default:
+                        // This makes no sense, something is wrong abort
+                        abort();
+        }
+        enable_interrupts( __cfaabi_dbg_ctx );
+}
+
+void park( void ) {
+        /* paranoid */ verify( kernelTLS.preemption_state.enabled );
+        disable_interrupts();
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+        /* paranoid */ verify( kernelTLS.this_thread->preempted == __NO_PREEMPTION );
+
         returnToKernel();
-        verify( ! kernelTLS.preemption_state.enabled );
+
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
         enable_interrupts( __cfaabi_dbg_ctx );
-}
-
-void BlockInternal( __spinlock_t * lock ) {
+        /* paranoid */ verify( kernelTLS.preemption_state.enabled );
+
+}
+
+// KERNEL ONLY
+void __leave_thread() {
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+        returnToKernel();
+        abort();
+}
+
+// KERNEL ONLY
+bool force_yield( __Preemption_Reason reason ) {
+        /* paranoid */ verify( kernelTLS.preemption_state.enabled );
         disable_interrupts();
-        with( *kernelTLS.this_processor ) {
-                finish.action_code = Release;
-                finish.lock        = lock;
-        }
-
-        verify( ! kernelTLS.preemption_state.enabled );
-        returnToKernel();
-        verify( ! kernelTLS.preemption_state.enabled );
-
-        enable_interrupts( __cfaabi_dbg_ctx );
-}
-
-void BlockInternal( thread_desc * thrd ) {
-        disable_interrupts();
-        with( * kernelTLS.this_processor ) {
-                finish.action_code = Schedule;
-                finish.thrd        = thrd;
-        }
-
-        verify( ! kernelTLS.preemption_state.enabled );
-        returnToKernel();
-        verify( ! kernelTLS.preemption_state.enabled );
-
-        enable_interrupts( __cfaabi_dbg_ctx );
-}
-
-void BlockInternal( __spinlock_t * lock, thread_desc * thrd ) {
-        assert(thrd);
-        disable_interrupts();
-        with( * kernelTLS.this_processor ) {
-                finish.action_code = Release_Schedule;
-                finish.lock        = lock;
-                finish.thrd        = thrd;
-        }
-
-        verify( ! kernelTLS.preemption_state.enabled );
-        returnToKernel();
-        verify( ! kernelTLS.preemption_state.enabled );
-
-        enable_interrupts( __cfaabi_dbg_ctx );
-}
-
-void BlockInternal(__spinlock_t * locks [], unsigned short count) {
-        disable_interrupts();
-        with( * kernelTLS.this_processor ) {
-                finish.action_code = Release_Multi;
-                finish.locks       = locks;
-                finish.lock_count  = count;
-        }
-
-        verify( ! kernelTLS.preemption_state.enabled );
-        returnToKernel();
-        verify( ! kernelTLS.preemption_state.enabled );
-
-        enable_interrupts( __cfaabi_dbg_ctx );
-}
-
-void BlockInternal(__spinlock_t * locks [], unsigned short lock_count, thread_desc * thrds [], unsigned short thrd_count) {
-        disable_interrupts();
-        with( *kernelTLS.this_processor ) {
-                finish.action_code = Release_Multi_Schedule;
-                finish.locks       = locks;
-                finish.lock_count  = lock_count;
-                finish.thrds       = thrds;
-                finish.thrd_count  = thrd_count;
-        }
-
-        verify( ! kernelTLS.preemption_state.enabled );
-        returnToKernel();
-        verify( ! kernelTLS.preemption_state.enabled );
-
-        enable_interrupts( __cfaabi_dbg_ctx );
-}
-
-void BlockInternal(__finish_callback_fptr_t callback) {
-        disable_interrupts();
-        with( *kernelTLS.this_processor ) {
-                finish.action_code = Callback;
-                finish.callback    = callback;
-        }
-
-        verify( ! kernelTLS.preemption_state.enabled );
-        returnToKernel();
-        verify( ! kernelTLS.preemption_state.enabled );
-
-        enable_interrupts( __cfaabi_dbg_ctx );
-}
-
-// KERNEL ONLY
-void LeaveThread(__spinlock_t * lock, thread_desc * thrd) {
-        verify( ! kernelTLS.preemption_state.enabled );
-        with( * kernelTLS.this_processor ) {
-                finish.action_code = thrd ? Release_Schedule : Release;
-                finish.lock        = lock;
-                finish.thrd        = thrd;
-        }
-
-        returnToKernel();
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+
+        $thread * thrd = kernelTLS.this_thread;
+        /* paranoid */ verify(thrd->state == Active || thrd->state == Rerun);
+
+        // SKULLDUGGERY: It is possible that we are preempting this thread just before
+        // it was going to park itself. If that is the case and it is already using the
+        // intrusive fields then we can't use them to preempt the thread
+        // If that is the case, abandon the preemption.
+        bool preempted = false;
+        if(thrd->next == 0p) {
+                preempted = true;
+                thrd->preempted = reason;
+                returnToKernel();
+        }
+
+        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+        enable_interrupts_noPoll();
+        /* paranoid */ verify( kernelTLS.preemption_state.enabled );
+
+        return preempted;
 }
 
@@ -646 +665 @@
 //-----------------------------------------------------------------------------
 // Kernel boot procedures
-static void kernel_startup(void) {
+static void __kernel_startup(void) {
         verify( ! kernelTLS.preemption_state.enabled );
         __cfaabi_dbg_print_safe("Kernel : Starting\n");
@@ -664 +683 @@
         // SKULLDUGGERY: the mainThread steals the process main thread
         // which will then be scheduled by the mainProcessor normally
-        mainThread = (thread_desc *)&storage_mainThread;
+        mainThread = ($thread *)&storage_mainThread;
         current_stack_info_t info;
         info.storage = (__stack_t*)&storage_mainThreadCtx;
@@ -676 +695 @@
         void ?{}(processorCtx_t & this, processor * proc) {
                 (this.__cor){ "Processor" };
-                this.__cor.starter = NULL;
+                this.__cor.starter = 0p;
                 this.proc = proc;
         }
@@ -685 +704 @@
                 terminated{ 0 };
                 do_terminate = false;
-                preemption_alarm = NULL;
+                preemption_alarm = 0p;
                 pending_preemption = false;
                 kernel_thread = pthread_self();
@@ -707 +726 @@
         // 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
-        ScheduleThread(mainThread);
+        __schedule_thread(mainThread);
 
         // SKULLDUGGERY: Force a context switch to the main processor to set the main thread's context to the current UNIX
-        // context. Hence, the main thread does not begin through CtxInvokeThread, like all other threads. The trick here is that
+        // context. Hence, the main thread does not begin through __cfactx_invoke_thread, like all other threads. The trick here is that
         // mainThread is on the ready queue when this call is made.
-        kernel_first_resume( kernelTLS.this_processor );
+        __kernel_first_resume( kernelTLS.this_processor );
 
 
@@ -724 +743 @@
 }
 
-static void kernel_shutdown(void) {
+static void __kernel_shutdown(void) {
         __cfaabi_dbg_print_safe("\n--------------------------------------------------\nKernel : Shutting down\n");
 
@@ -735 +754 @@
         // which is currently here
         __atomic_store_n(&mainProcessor->do_terminate, true, __ATOMIC_RELEASE);
-        kernel_last_resume( kernelTLS.this_processor );
+        __kernel_last_resume( kernelTLS.this_processor );
         mainThread->self_cor.state = Halted;
 
@@ -761 +780 @@
 // Kernel Quiescing
 //=============================================================================================
-static void halt(processor * this) with( *this ) {
+static void __halt(processor * this) with( *this ) {
         // verify( ! __atomic_load_n(&do_terminate, __ATOMIC_SEQ_CST) );
 
@@ -803 +822 @@
                 sigemptyset( &mask );
                 sigaddset( &mask, SIGALRM );            // block SIGALRM signals
-                sigsuspend( &mask );                    // block the processor to prevent further damage during abort
-                _exit( EXIT_FAILURE );                  // if processor unblocks before it is killed, terminate it
+                sigaddset( &mask, SIGUSR1 );            // block SIGALRM signals
+                sigsuspend( &mask );                            // block the processor to prevent further damage during abort
+                _exit( EXIT_FAILURE );                          // if processor unblocks before it is killed, terminate it
         }
         else {
@@ -815 +835 @@
 
 void kernel_abort_msg( void * kernel_data, char * abort_text, int abort_text_size ) {
-        thread_desc * thrd = kernel_data;
+        $thread * thrd = kernel_data;
 
         if(thrd) {
                 int len = snprintf( abort_text, abort_text_size, "Error occurred while executing thread %.256s (%p)", thrd->self_cor.name, thrd );
-                __cfaabi_dbg_bits_write( abort_text, len );
+                __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
 
                 if ( &thrd->self_cor != thrd->curr_cor ) {
                         len = snprintf( abort_text, abort_text_size, " in coroutine %.256s (%p).\n", thrd->curr_cor->name, thrd->curr_cor );
-                        __cfaabi_dbg_bits_write( abort_text, len );
+                        __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
                 }
                 else {
-                        __cfaabi_dbg_bits_write( ".\n", 2 );
+                        __cfaabi_bits_write( STDERR_FILENO, ".\n", 2 );
                 }
         }
         else {
                 int len = snprintf( abort_text, abort_text_size, "Error occurred outside of any thread.\n" );
-                __cfaabi_dbg_bits_write( abort_text, len );
+                __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
         }
 }
@@ -842 +862 @@
 
 extern "C" {
-        void __cfaabi_dbg_bits_acquire() {
+        void __cfaabi_bits_acquire() {
                 lock( kernel_debug_lock __cfaabi_dbg_ctx2 );
         }
 
-        void __cfaabi_dbg_bits_release() {
+        void __cfaabi_bits_release() {
                 unlock( kernel_debug_lock );
         }
@@ -871 +891 @@
 
                 // atomically release spin lock and block
-                BlockInternal( &lock );
+                unlock( lock );
+                park();
         }
         else {
@@ -879 +900 @@
 
 void V(semaphore & this) with( this ) {
-        thread_desc * thrd = NULL;
+        $thread * thrd = 0p;
         lock( lock __cfaabi_dbg_ctx2 );
         count += 1;
@@ -890 +911 @@
 
         // make new owner
-        WakeThread( thrd );
+        unpark( thrd );
 }
 
@@ -907 +928 @@
 }
 
-void doregister( cluster * cltr, thread_desc & thrd ) {
+void doregister( cluster * cltr, $thread & thrd ) {
         lock      (cltr->thread_list_lock __cfaabi_dbg_ctx2);
         cltr->nthreads += 1;
@@ -914 +935 @@
 }
 
-void unregister( cluster * cltr, thread_desc & thrd ) {
+void unregister( cluster * cltr, $thread & thrd ) {
         lock  (cltr->thread_list_lock __cfaabi_dbg_ctx2);
         remove(cltr->threads, thrd );
@@ -939 +960 @@
 __cfaabi_dbg_debug_do(
         extern "C" {
-                void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name) {
+                void __cfaabi_dbg_record(__spinlock_t & this, const char prev_name[]) {
                         this.prev_name = prev_name;
                         this.prev_thrd = kernelTLS.this_thread;
@@ -948 +969 @@
 //-----------------------------------------------------------------------------
 // Debug
-bool threading_enabled(void) {
+bool threading_enabled(void) __attribute__((const)) {
         return true;
 }