Changeset 92bfda0 for libcfa/src/concurrency/kernel.cfa

Timestamp:

Jan 20, 2021, 4:40:28 PM (3 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:

dafbde8

Parents:

78a8440

Message:

Revisited abort again to be more streamlined and simple.

File:

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

libcfa/src/concurrency/kernel.cfa

@@ -624 +624 @@
 // Unexpected Terminating logic
 //=============================================================================================
-
-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;
+void __kernel_abort_msg( char * abort_text, int abort_text_size ) {
+        $thread * thrd = __cfaabi_tls.this_thread;
 
         if(thrd) {
@@ -669 +645 @@
 }
 
-int kernel_abort_lastframe( void ) __attribute__ ((__nothrow__)) {
-        return get_coroutine(kernelTLS().this_thread) == get_coroutine(mainThread) ? 4 : 2;
+int __kernel_abort_lastframe( void ) __attribute__ ((__nothrow__)) {
+        return get_coroutine(__cfaabi_tls.this_thread) == get_coroutine(mainThread) ? 4 : 2;
 }