Changes in libcfa/src/interpose.cfa [6011658:8a13c47]

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 : Fri Mar 13 17:35:37 2020
-// Update Count     : 178
+// Last Modified On : Thu Jan 30 17:47:32 2020
+// Update Count     : 156
 //
 
 #include <stdarg.h>                                                                             // va_start, va_end
-#include <stdio.h>
 #include <string.h>                                                                             // strlen
 #include <unistd.h>                                                                             // _exit, getpid
@@ -30 +29 @@
 #include "bits/signal.hfa"                                                              // sigHandler_?
 #include "startup.hfa"                                                                  // STARTUP_PRIORITY_CORE
-#include <assert.h>
 
 //=============================================================================================
@@ -42 +40 @@
 
 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;
 
@@ -144 +142 @@
 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, "%s", "" );
+                abort( false, NULL ); // FIX ME: 0p does not work
         }
 
@@ -154 +151 @@
                 va_list argp;
                 va_start( argp, fmt );
-                __abort( false, fmt, argp );
+                abort( false, fmt, argp );
                 va_end( argp );
         }
@@ -164 +161 @@
 
 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; }
@@ -172 +169 @@
 
 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 ); // does not demangle names
+        char ** messages = backtrace_symbols( array, size );
 
         *index( messages[0], '(' ) = '\0';                                      // find executable name
@@ -185 +184 @@
                 char * name = 0p, * offset_begin = 0p, * offset_end = 0p;
 
-                for ( char * p = messages[i]; *p; p += 1 ) {    // find parantheses and +offset
+                for ( char * p = messages[i]; *p; ++p ) {               // find parantheses and +offset
                         //__cfaabi_bits_print_nolock( "X %s\n", p);
                         if ( *p == '(' ) {
@@ -220 +219 @@
 }
 
-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)
+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 );
+
+                len = vsnprintf( abort_text, abort_text_size, fmt, args );
+                va_end( args );
                 __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
 
-                assert( fmt );
-                len = vsnprintf( abort_text, abort_text_size, fmt, args );
-                __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
-
-                // 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);
+                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
 }
 
@@ -271 +250 @@
         va_list args;
         va_start( args, fmt );
-        __abort( false, fmt, args );
-    // CONTROL NEVER REACHES HERE!
+        abort( false, fmt, args );
         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 );
 }