Changes in src/libcfa/interpose.c [3d5f2ef1:a424315d]

File:

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

src/libcfa/interpose.c

@@ -28 +28 @@
 }
 
-#define __NO_ABORT_OVERLOAD // no abort overload avoid ambiguities
 #include "bits/debug.h"
 #include "bits/defs.h"
 #include "bits/signal.h"
 #include "startup.h"
-
-//=============================================================================================
-// Interposing helpers
-//=============================================================================================
 
 typedef void (*generic_fptr_t)(void);
@@ -74 +69 @@
 }
 
+
+__typeof__( exit ) libc_exit __attribute__(( noreturn ));
+__typeof__( abort ) libc_abort __attribute__(( noreturn ));
+
 forall(dtype T)
-static inline void ptr_from_symbol( T** symbol_ptr, const char * symbol_name, const char * version) {
+static inline void assign_ptr( T** symbol_ptr, const char * symbol_name, const char * version) {
         union {
                 generic_fptr_t gp;
@@ -86 +85 @@
 }
 
-#define INTERPOSE_LIBC( x, ver ) ptr_from_symbol( (void**)&__cabi_libc.x, #x, ver)
-
-//=============================================================================================
-// Terminating Signals logic
-//=============================================================================================
+#define INIT_REALRTN( x, ver ) assign_ptr( (void**)&libc_##x, #x, ver)
 
 void sigHandler_segv ( __CFA_SIGPARMS__ );
@@ -97 +92 @@
 void sigHandler_abort( __CFA_SIGPARMS__ );
 
-struct {
-        __typeof__( exit  ) exit  __attribute__(( noreturn ));
-        __typeof__( abort ) abort __attribute__(( noreturn ));
-} __cabi_libc;
-
 extern "C" {
         void __cfaabi_interpose_startup(void)  __attribute__(( constructor( STARTUP_PRIORITY_CORE ) ));
@@ -107 +97 @@
                 const char *version = NULL;
 
-                INTERPOSE_LIBC( abort, version );
-                INTERPOSE_LIBC( exit , version );
+                INIT_REALRTN( abort, version );
+                INIT_REALRTN( exit, version );
 
                 __cfaabi_sigaction( SIGSEGV, sigHandler_segv , SA_SIGINFO ); // Failure handler
@@ -122 +112 @@
 //=============================================================================================
 
-// Forward declare abort after the __typeof__ call to avoid ambiguities
-void abort ( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__));
-
 extern "C" {
         void abort( void ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
@@ -130 +117 @@
         }
 
-        void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
-                va_list argp;
-                va_start( argp, fmt );
-                abort( fmt, argp );
-                va_end( argp );
-        }
-
         void exit( int __status ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
-                __cabi_libc.exit(__status);
-        }
+                libc_exit(__status);
+        }
+}
+
+void abort( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
+        va_list argp;
+        va_start( argp, fmt );
+        abortf( fmt, argp );
+        va_end( argp );
 }
 
@@ -150 +137 @@
 static int abort_lastframe;
 
-void abort( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
-        void * kernel_data = kernel_abort();                    // must be done here to lock down kernel
-        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 ) {
-                va_list args;
-                va_start( args, fmt );
-
-                len = vsnprintf( abort_text, abort_text_size, fmt, args );
-                va_end( args );
+extern "C" {
+        void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
+                void * kernel_data = kernel_abort();                    // must be done here to lock down kernel
+                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[strlen( fmt ) - 1] != '\n' ) {         // add optional newline if missing at the end of the format text
-                        __cfaabi_dbg_bits_write( "\n", 1 );
-                }
-        }
-
-        kernel_abort_msg( kernel_data, abort_text, abort_text_size );
-        __cabi_libc.abort();
+                if ( fmt ) {
+                        va_list args;
+                        va_start( args, fmt );
+
+                        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 );
+                        }
+                }
+
+                kernel_abort_msg( kernel_data, abort_text, abort_text_size );
+                libc_abort();
+        }
 }