Changes in src/libcfa/interpose.c [a424315d:6bfe5cc]

File:

• src/libcfa/interpose.c (modified) (8 diffs)

src/libcfa/interpose.c

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  7 09:05:18 2018
-// Update Count     : 59
+// Last Modified On : Mon Feb  5 23:40:04 2018
+// Update Count     : 17
 //
 
@@ -88 +88 @@
 
 void sigHandler_segv ( __CFA_SIGPARMS__ );
-void sigHandler_ill  ( __CFA_SIGPARMS__ );
-void sigHandler_fpe  ( __CFA_SIGPARMS__ );
 void sigHandler_abort( __CFA_SIGPARMS__ );
 
@@ -100 +98 @@
                 INIT_REALRTN( exit, version );
 
-                __cfaabi_sigaction( SIGSEGV, sigHandler_segv , SA_SIGINFO ); // Failure handler
-                __cfaabi_sigaction( SIGBUS , sigHandler_segv , SA_SIGINFO ); // Failure handler
-                __cfaabi_sigaction( SIGILL , sigHandler_ill  , SA_SIGINFO ); // Failure handler
-                __cfaabi_sigaction( SIGFPE , sigHandler_fpe  , SA_SIGINFO ); // Failure handler
-                __cfaabi_sigaction( SIGABRT, sigHandler_abort, SA_SIGINFO ); // Failure handler
+                __kernel_sigaction( SIGSEGV, sigHandler_segv , SA_SIGINFO ); // Failure handler
+                __kernel_sigaction( SIGBUS , sigHandler_segv , SA_SIGINFO ); // Failure handler
+                __kernel_sigaction( SIGABRT, sigHandler_abort, SA_SIGINFO ); // Failure handler
         }
 }
@@ -122 +118 @@
 }
 
-void abort( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
-        va_list argp;
-        va_start( argp, fmt );
+void abort( const char *fmt, va_list argp ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
         abortf( fmt, argp );
-        va_end( argp );
 }
 
 void * kernel_abort    ( void ) __attribute__ ((__nothrow__, __leaf__, __weak__)) { return NULL; }
 void   kernel_abort_msg( void * data, char * buffer, int size ) __attribute__ ((__nothrow__, __leaf__, __weak__)) {}
-int kernel_abort_lastframe( void ) __attribute__ ((__nothrow__, __leaf__, __weak__)) { return 4; }
 
 enum { abort_text_size = 1024 };
 static char abort_text[ abort_text_size ];
-static int abort_lastframe;
 
 extern "C" {
         void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
-                void * kernel_data = kernel_abort();                    // must be done here to lock down kernel
+                void * kernel_data = kernel_abort();
+
                 int len;
-
-                abort_lastframe = kernel_abort_lastframe();
-                len = snprintf( abort_text, abort_text_size, "Cforall Runtime error (UNIX pid:%ld) ", (long int)getpid() ); // use UNIX pid (versus getPid)
-                __cfaabi_dbg_bits_write( abort_text, len );
 
                 if ( fmt ) {
@@ -151 +139 @@
 
                         len = vsnprintf( abort_text, abort_text_size, fmt, args );
+
                         va_end( args );
+
                         __cfaabi_dbg_bits_write( abort_text, len );
-
-                        if ( fmt[strlen( fmt ) - 1] != '\n' ) {         // add optional newline if missing at the end of the format text
-                                __cfaabi_dbg_bits_write( "\n", 1 );
-                        }
-                }
+                        //__cfaabi_dbg_bits_write( "\n", 1 );
+                }
+
+                len = snprintf( abort_text, abort_text_size, "Cforall Runtime error (UNIX pid:%ld)\n", (long int)getpid() ); // use UNIX pid (versus getPid)
+                __cfaabi_dbg_bits_write( abort_text, len );
+
 
                 kernel_abort_msg( kernel_data, abort_text, abort_text_size );
+
                 libc_abort();
         }
 }
 
-static void __cfaabi_backtrace() {
-        enum {
-                Frames = 50,                                                                    // maximum number of stack frames
-                Start = 8,                                                                              // skip first N stack frames
-        };
-
+// skip first 6 stack frames by default
+static void __kernel_backtrace() {
+        // skip first N stack frames
+        int start = 6;
+
+        enum { Frames = 50 };
         void * array[Frames];
         size_t size = backtrace( array, Frames );
@@ -178 +170 @@
         __cfaabi_dbg_bits_print_nolock( "Stack back trace for: %s\n", messages[0]);
 
-        for ( int i = Start; i < size - abort_lastframe && messages != NULL; i += 1 ) {
-                char * name = NULL, * offset_begin = NULL, * offset_end = NULL;
-
-                for ( char * p = messages[i]; *p; ++p ) {
+        // skip last 2 stack frames after main
+        for ( int i = start; i < size && messages != NULL; i += 1 ) {
+                char * name = NULL;
+                char * offset_begin = NULL;
+                char * offset_end = NULL;
+
+                for ( char *p = messages[i]; *p; ++p ) {
                         //__cfaabi_dbg_bits_print_nolock( "X %s\n", p);
                         // find parantheses and +offset
@@ -197 +192 @@
 
                 // if line contains symbol print it
-                int frameNo = i - Start;
+                int frameNo = i - start;
                 if ( name && offset_begin && offset_end && name < offset_begin ) {
                         // delimit strings
@@ -211 +206 @@
                 }
         }
+
         free( messages );
 }
 
 void sigHandler_segv( __CFA_SIGPARMS__ ) {
-        abortf( "Addressing invalid memory at location %p\n"
-                        "Possible cause is reading outside the address space or writing to a protected area within the address space with an invalid pointer or subscript.\n",
-                        sfp->si_addr );
-}
-
-void sigHandler_ill( __CFA_SIGPARMS__ ) {
-        abortf( "Executing illegal instruction at location %p.\n"
-                        "Possible cause is stack corruption.\n",
-                        sfp->si_addr );
-}
-
-void sigHandler_fpe( __CFA_SIGPARMS__ ) {
-        const char * msg;
-
-        choose( sfp->si_code ) {
-          case FPE_INTDIV, FPE_FLTDIV: msg = "divide by zero";
-          case FPE_FLTOVF: msg = "overflow";
-          case FPE_FLTUND: msg = "underflow";
-          case FPE_FLTRES: msg = "inexact result";
-          case FPE_FLTINV: msg = "invalid operation";
-          default: msg = "unknown";
-        } // choose
-        abortf( "Computation error %s at location %p.\n", msg, sfp->si_addr );
+        // skip first only 1 stack frames in case of segfault.
+        abortf( "*CFA runtime error* program cfa-cpp terminated with %s\n", sig == SIGSEGV ? "segment fault." : "bus error." );
 }
 
 void sigHandler_abort( __CFA_SIGPARMS__ ) {
-        __cfaabi_backtrace();
+        __kernel_backtrace();
 
         // reset default signal handler
-        __cfaabi_sigdefault( SIGABRT );
+        __kernel_sigdefault( SIGABRT );
 
         raise( SIGABRT );