Changeset d46bdac for libcfa

Timestamp:

Jan 15, 2021, 3:01:31 PM (5 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

77ff383

Parents:

2d63023 (diff), b7664a03 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src

Files:

• concurrency/io/setup.cfa (modified) (1 diff)
• concurrency/kernel.cfa (modified) (1 diff)
• concurrency/stats.hfa (modified) (2 diffs)
• interpose.cfa (modified) (1 diff)
• parseargs.cfa (modified) (1 diff)

libcfa/src/concurrency/io/setup.cfa

@@ -42 +42 @@
         void ^?{}(io_context & this, bool cluster_context) {}
 
+        void register_fixed_files( io_context &, int *, unsigned ) {}
+        void register_fixed_files( cluster    &, int *, unsigned ) {}
+
 #else
         #include <errno.h>

libcfa/src/concurrency/kernel.cfa

@@ -624 +624 @@
 // Unexpected Terminating logic
 //=============================================================================================
-static __spinlock_t kernel_abort_lock;
-static bool kernel_abort_called = false;
+
+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.
-        lock( kernel_abort_lock __cfaabi_dbg_ctx2 );
+        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();
-
-        // 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;

libcfa/src/concurrency/stats.hfa

@@ -2 +2 @@
 
 #include <stdint.h>
+
+enum {
+        CFA_STATS_READY_Q  = 0x01,
+        CFA_STATS_IO = 0x02,
+};
 
 #if defined(__CFA_NO_STATISTICS__)
@@ -9 +14 @@
         static inline void __print_stats( struct __stats_t *, int, const char *, const char *, void * ) {}
 #else
-        enum {
-                CFA_STATS_READY_Q  = 0x01,
-                #if defined(CFA_HAVE_LINUX_IO_URING_H)
-                        CFA_STATS_IO = 0x02,
-                #endif
-        };
 
         struct __attribute__((aligned(64))) __stats_readQ_t {

libcfa/src/interpose.cfa

@@ -284 +284 @@
 }
 
+extern "C" {
+        void __cfaabi_real_abort(void) {
+                __cabi_libc.abort();
+        }
+}
+
 void sigHandler_segv( __CFA_SIGPARMS__ ) {
                 if ( sfp->si_addr == 0p ) {

libcfa/src/parseargs.cfa

@@ -39 +39 @@
                         if( options[i].short_name != '\0'
                         && options[i].short_name == options[j].short_name)
-                                abort("Parse Args error: two options have short name '%c' (%d & %d)", options[i].short_name, i, j);
-
-                        if(0 == strcmp(options[i].long_name, options[j].long_name)) abort("Parse Args error: two options have long name '%s' (%d & %d)", options[i].long_name, i, j);
+                                abort("Parse Args error: two options have short name '%c' (%zu & %zu)", options[i].short_name, i, j);
+
+                        if(0 == strcmp(options[i].long_name, options[j].long_name)) abort("Parse Args error: two options have long name '%s' (%zu & %zu)", options[i].long_name, i, j);
                 }
         }