Changeset eef8dfb for libcfa/src/interpose.cfa

Timestamp:

Jan 7, 2021, 2:55:57 PM (5 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:

58fe85a

Parents:

bdfc032 (diff), 44e37ef (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' into dkobets-vector

File:

• libcfa/src/interpose.cfa (modified) (10 diffs)

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jan 30 17:47:32 2020
-// Update Count     : 156
+// Last Modified On : Fri Mar 13 17:35:37 2020
+// Update Count     : 178
 //
 
 #include <stdarg.h>                                                                             // va_start, va_end
+#include <stdio.h>
 #include <string.h>                                                                             // strlen
 #include <unistd.h>                                                                             // _exit, getpid
@@ -29 +30 @@
 #include "bits/signal.hfa"                                                              // sigHandler_?
 #include "startup.hfa"                                                                  // STARTUP_PRIORITY_CORE
+#include <assert.h>
 
 //=============================================================================================
@@ -40 +42 @@
 
 typedef void (* generic_fptr_t)(void);
-generic_fptr_t interpose_symbol( const char * symbol, const char * version ) {
+generic_fptr_t interpose_symbol( const char symbol[], const char version[] ) {
         const char * error;
 
@@ -142 +144 @@
 void abort( const char fmt[], ... ) __attribute__(( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ ));
 void abort( bool signalAbort, const char fmt[], ... ) __attribute__(( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ ));
+void __abort( bool signalAbort, const char fmt[], va_list args ) __attribute__(( __nothrow__, __leaf__, __noreturn__ ));
 
 extern "C" {
         void abort( void ) __attribute__(( __nothrow__, __leaf__, __noreturn__ )) {
-                abort( false, NULL ); // FIX ME: 0p does not work
+                abort( false, "%s", "" );
         }
 
@@ -151 +154 @@
                 va_list argp;
                 va_start( argp, fmt );
-                abort( false, fmt, argp );
+                __abort( false, fmt, argp );
                 va_end( argp );
         }
@@ -161 +164 @@
 
 void * kernel_abort( void ) __attribute__(( __nothrow__, __leaf__, __weak__ )) { return 0p; }
-void kernel_abort_msg( void * data, char * buffer, int size ) __attribute__(( __nothrow__, __leaf__, __weak__ )) {}
+void kernel_abort_msg( void * data, char buffer[], int size ) __attribute__(( __nothrow__, __leaf__, __weak__ )) {}
 // See concurrency/kernel.cfa for strong definition used in multi-processor mode.
 int kernel_abort_lastframe( void ) __attribute__(( __nothrow__, __leaf__, __weak__ )) { return 4; }
@@ -169 +172 @@
 
 static void __cfaabi_backtrace( int start ) {
-        enum {
-                Frames = 50,                                                                    // maximum number of stack frames
-        };
+        enum { Frames = 50, };                                                          // maximum number of stack frames
         int last = kernel_abort_lastframe();                            // skip last N stack frames
 
         void * array[Frames];
         size_t size = backtrace( array, Frames );
-        char ** messages = backtrace_symbols( array, size );
+        char ** messages = backtrace_symbols( array, size ); // does not demangle names
 
         *index( messages[0], '(' ) = '\0';                                      // find executable name
@@ -184 +185 @@
                 char * name = 0p, * offset_begin = 0p, * offset_end = 0p;
 
-                for ( char * p = messages[i]; *p; ++p ) {               // find parantheses and +offset
+                for ( char * p = messages[i]; *p; p += 1 ) {    // find parantheses and +offset
                         //__cfaabi_bits_print_nolock( "X %s\n", p);
                         if ( *p == '(' ) {
@@ -219 +220 @@
 }
 
-void abort( bool signalAbort, const char fmt[], ... ) {
-        void * kernel_data = kernel_abort();                            // must be done here to lock down kernel
-        int len;
-
-        signal( SIGABRT, SIG_DFL );                                                     // prevent final "real" abort from recursing to handler
-
-        len = snprintf( abort_text, abort_text_size, "Cforall Runtime error (UNIX pid:%ld) ", (long int)getpid() ); // use UNIX pid (versus getPid)
-        __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
-
-        if ( fmt ) {
-                va_list args;
-                va_start( args, fmt );
-
+static volatile int __abort_stage = 0;
+
+// Cannot forward va_list.
+void __abort( bool signalAbort, const char fmt[], va_list args ) {
+        int stage = __atomic_add_fetch( &__abort_stage, 1, __ATOMIC_SEQ_CST );
+
+        // First stage: stop the cforall kernel and print
+        if(stage == 1) {
+                // increment stage
+                stage = __atomic_add_fetch( &__abort_stage, 1, __ATOMIC_SEQ_CST );
+
+                // must be done here to lock down kernel
+                void * kernel_data = kernel_abort();
+                int len;
+
+                signal( SIGABRT, SIG_DFL );                                                     // prevent final "real" abort from recursing to handler
+
+                len = snprintf( abort_text, abort_text_size, "Cforall Runtime error (UNIX pid:%ld) ", (long int)getpid() ); // use UNIX pid (versus getPid)
+                __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
+
+                assert( fmt );
                 len = vsnprintf( abort_text, abort_text_size, fmt, args );
-                va_end( args );
                 __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
 
-                if ( fmt[strlen( fmt ) - 1] != '\n' ) {                 // add optional newline if missing at the end of the format text
-                        __cfaabi_dbg_write( "\n", 1 );
-                }
-        }
-
-        kernel_abort_msg( kernel_data, abort_text, abort_text_size );
-        __cfaabi_backtrace( signalAbort ? 4 : 3 );
-
-        __cabi_libc.abort();                                                            // print stack trace in handler
+                // add optional newline if missing at the end of the format text
+                if ( fmt[strlen( fmt ) - 1] != '\n' ) {
+                        __cfaabi_bits_write( STDERR_FILENO, "\n", 1 );
+                } // if
+                kernel_abort_msg( kernel_data, abort_text, abort_text_size );
+        }
+
+        // Second stage: print the backtrace
+        if(stage == 2) {
+                // increment stage
+                stage = __atomic_add_fetch( &__abort_stage, 1, __ATOMIC_SEQ_CST );
+
+                // print stack trace in handler
+                __cfaabi_backtrace( signalAbort ? 4 : 2 );
+        }
+
+        do {
+                // Finally call abort
+                __cabi_libc.abort();
+
+                // Loop so that we never return
+        } while(true);
 }
 
@@ -250 +271 @@
         va_list args;
         va_start( args, fmt );
-        abort( false, fmt, args );
+        __abort( false, fmt, args );
+    // CONTROL NEVER REACHES HERE!
         va_end( args );
+}
+
+void abort( bool signalAbort, const char fmt[], ... ) {
+    va_list args;
+    va_start( args, fmt );
+    __abort( signalAbort, fmt, args );
+    // CONTROL NEVER REACHES HERE!
+    va_end( args );
 }