Changes in libcfa/src/concurrency/kernel.cfa [804c0ff:6011658]

File:

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

libcfa/src/concurrency/kernel.cfa

@@ -140 +140 @@
                 preemption_scope scope = { this };
 
-                #if !defined(__CFA_NO_STATISTICS__)
-                        unsigned long long last_tally = rdtscl();
-                #endif
-
-
                 __cfadbg_print_safe(runtime_core, "Kernel : core %p started\n", this);
 
@@ -211 +206 @@
                         // Are we done?
                         if( __atomic_load_n(&this->do_terminate, __ATOMIC_SEQ_CST) ) break MAIN_LOOP;
-
-                        #if !defined(__CFA_NO_STATISTICS__)
-                                unsigned long long curr = rdtscl();
-                                if(curr > (last_tally + 500000000)) {
-                                        __tally_stats(this->cltr->stats, __cfaabi_tls.this_stats);
-                                        last_tally = curr;
-                                }
-                        #endif
                 }
 
@@ -624 +611 @@
 // Unexpected Terminating logic
 //=============================================================================================
-
-extern "C" {
-        extern void __cfaabi_real_abort(void);
-}
-static volatile bool kernel_abort_called = false;
+static __spinlock_t kernel_abort_lock;
+static 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();
-        }
+        lock( kernel_abort_lock __cfaabi_dbg_ctx2 );
 
         // disable interrupts, it no longer makes sense to try to interrupt this processor
         disable_interrupts();
+
+        // first task to abort ?
+        if ( kernel_abort_called ) {                    // not first task to abort ?
+                unlock( kernel_abort_lock );
+
+                sigset_t mask;
+                sigemptyset( &mask );
+                sigaddset( &mask, SIGALRM );            // block SIGALRM signals
+                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 {
+                kernel_abort_called = true;
+                unlock( kernel_abort_lock );
+        }
 
         return __cfaabi_tls.this_thread;