Changes in libcfa/src/concurrency/kernel.cfa [454f478:4f449d2]

File:

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

libcfa/src/concurrency/kernel.cfa

@@ -224 +224 @@
         }
 
-        post( this->terminated );
+        V( this->terminated );
 
         if(this == mainProcessor) {
@@ -624 +624 @@
 // Unexpected Terminating logic
 //=============================================================================================
-void __kernel_abort_msg( char * abort_text, int abort_text_size ) {
-        $thread * thrd = __cfaabi_tls.this_thread;
+
+extern "C" {
+        extern void __cfaabi_real_abort(void);
+}
+static volatile bool kernel_abort_called = false;
+
+void * kernel_abort(void) __attribute__ ((__nothrow__)) {
+        // abort cannot be recursively entered by the same or different processors because all signal handlers return when
+        // the globalAbort flag is true.
+        bool first = !__atomic_test_and_set( &kernel_abort_called, __ATOMIC_SEQ_CST);
+
+        // first task to abort ?
+        if ( !first ) {
+                // We aren't the first to abort.
+                // I give up, just let C handle it
+                __cfaabi_real_abort();
+        }
+
+        // disable interrupts, it no longer makes sense to try to interrupt this processor
+        disable_interrupts();
+
+        return __cfaabi_tls.this_thread;
+}
+
+void kernel_abort_msg( void * kernel_data, char * abort_text, int abort_text_size ) {
+        $thread * thrd = ( $thread * ) kernel_data;
 
         if(thrd) {
@@ -645 +669 @@
 }
 
-int __kernel_abort_lastframe( void ) __attribute__ ((__nothrow__)) {
-        return get_coroutine(__cfaabi_tls.this_thread) == get_coroutine(mainThread) ? 4 : 2;
+int kernel_abort_lastframe( void ) __attribute__ ((__nothrow__)) {
+        return get_coroutine(kernelTLS().this_thread) == get_coroutine(mainThread) ? 4 : 2;
 }
 
@@ -664 +688 @@
 // Kernel Utilities
 //=============================================================================================
+//-----------------------------------------------------------------------------
+// Locks
+void  ?{}( semaphore & this, int count = 1 ) {
+        (this.lock){};
+        this.count = count;
+        (this.waiting){};
+}
+void ^?{}(semaphore & this) {}
+
+bool P(semaphore & this) with( this ){
+        lock( lock __cfaabi_dbg_ctx2 );
+        count -= 1;
+        if ( count < 0 ) {
+                // queue current task
+                append( waiting, active_thread() );
+
+                // atomically release spin lock and block
+                unlock( lock );
+                park();
+                return true;
+        }
+        else {
+            unlock( lock );
+            return false;
+        }
+}
+
+bool V(semaphore & this) with( this ) {
+        $thread * thrd = 0p;
+        lock( lock __cfaabi_dbg_ctx2 );
+        count += 1;
+        if ( count <= 0 ) {
+                // remove task at head of waiting list
+                thrd = pop_head( waiting );
+        }
+
+        unlock( lock );
+
+        // make new owner
+        unpark( thrd );
+
+        return thrd != 0p;
+}
+
+bool V(semaphore & this, unsigned diff) with( this ) {
+        $thread * thrd = 0p;
+        lock( lock __cfaabi_dbg_ctx2 );
+        int release = max(-count, (int)diff);
+        count += diff;
+        for(release) {
+                unpark( pop_head( waiting ) );
+        }
+
+        unlock( lock );
+
+        return thrd != 0p;
+}
+
 //-----------------------------------------------------------------------------
 // Debug