Changes in src/libcfa/interpose.c [de94a60:94dea96]

File:

• src/libcfa/interpose.c (modified) (10 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 : Sat May  5 11:37:35 2018
-// Update Count     : 111
-//
-
-#include <stdarg.h>                                                                             // va_start, va_end
-#include <string.h>                                                                             // strlen
-#include <unistd.h>                                                                             // _exit, getpid
+// Last Modified On : Tue May  1 15:05:35 2018
+// Update Count     : 83
+//
+
+#include <stdarg.h>
+#include <stddef.h>
+
+extern "C" {
+#include <stdio.h>
+#include <string.h>
+#include <dlfcn.h>
+#include <unistd.h>
 #define __USE_GNU
 #include <signal.h>
 #undef __USE_GNU
-extern "C" {
-#include <dlfcn.h>                                                                              // dlopen, dlsym
-#include <execinfo.h>                                                                   // backtrace, messages
+#include <execinfo.h>
 }
 
 #include "bits/debug.h"
 #include "bits/defs.h"
-#include "bits/signal.h"                                                                // sigHandler_?
-#include "startup.h"                                                                    // STARTUP_PRIORITY_CORE
+#include "bits/signal.h"
+#include "startup.h"
 
 //=============================================================================================
@@ -34 +37 @@
 //=============================================================================================
 
-typedef void (* generic_fptr_t)(void);
-generic_fptr_t interpose_symbol( const char * symbol, const char * version ) {
+typedef void (*generic_fptr_t)(void);
+generic_fptr_t interpose_symbol( const char* symbol, const char *version ) {
         const char * error;
 
@@ -52 +55 @@
         } // if
 
-        union { generic_fptr_t fptr; void * ptr; } originalFunc;
+        union { generic_fptr_t fptr; void* ptr; } originalFunc;
 
         #if defined( _GNU_SOURCE )
@@ -70 +73 @@
 }
 
-#define INTERPOSE_LIBC( x, ver ) __cabi_libc.x = (typeof(__cabi_libc.x))interpose_symbol( #x, ver )
-
-//=============================================================================================
-// Interposition Startup logic
+forall(dtype T)
+static inline void ptr_from_symbol( T** symbol_ptr, const char * symbol_name, const char * version) {
+        union {
+                generic_fptr_t gp;
+                T* tp;
+        } u;
+
+        u.gp = interpose_symbol( symbol_name, version );
+
+        *symbol_ptr = u.tp;
+}
+
+#define INTERPOSE_LIBC( x, ver ) ptr_from_symbol( (void**)&__cabi_libc.x, #x, ver)
+
+//=============================================================================================
+// Terminating Signals logic
 //=============================================================================================
 
@@ -83 +98 @@
 
 struct {
-        void (* exit)( int ) __attribute__(( __noreturn__ ));
-        void (* abort)( void ) __attribute__(( __noreturn__ ));
+        void (* exit)( int ) __attribute__ (( __noreturn__ ));
+        void (* abort)( void ) __attribute__ (( __noreturn__ ));
 } __cabi_libc;
 
@@ -92 +107 @@
                 const char *version = NULL;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
                 INTERPOSE_LIBC( abort, version );
                 INTERPOSE_LIBC( exit , version );
-#pragma GCC diagnostic pop
-
-                // Failure handler
-                __cfaabi_sigaction( SIGSEGV, sigHandler_segv , SA_SIGINFO );
-                __cfaabi_sigaction( SIGBUS , sigHandler_segv , SA_SIGINFO );
-                __cfaabi_sigaction( SIGILL , sigHandler_ill  , SA_SIGINFO );
-                __cfaabi_sigaction( SIGFPE , sigHandler_fpe  , SA_SIGINFO );
-                __cfaabi_sigaction( SIGABRT, sigHandler_abort, SA_SIGINFO | SA_RESETHAND);
-                __cfaabi_sigaction( SIGTERM, sigHandler_term , SA_SIGINFO );
-                __cfaabi_sigaction( SIGINT , sigHandler_term , SA_SIGINFO );
+
+                __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
+                __cfaabi_sigaction( SIGTERM, sigHandler_term , SA_SIGINFO ); // Failure handler
+                __cfaabi_sigaction( SIGINT , sigHandler_term , SA_SIGINFO ); // Failure handler
         }
 }
@@ -114 +125 @@
 
 // Forward declare abort after the __typeof__ call to avoid ambiguities
-void exit( int status, const char fmt[], ... ) __attribute__(( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ ));
-void abort( const char fmt[], ... ) __attribute__(( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ ));
+void exit( int status, const char fmt[], ... ) __attribute__ (( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ ));
+void abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ ));
 
 extern "C" {
-        void abort( void ) __attribute__(( __nothrow__, __leaf__, __noreturn__ )) {
+        void abort( void ) __attribute__ (( __nothrow__, __leaf__, __noreturn__ )) {
                 abort( NULL );
         }
 
-        void __cabi_abort( const char fmt[], ... ) __attribute__(( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )) {
+        void __cabi_abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )) {
                 va_list argp;
                 va_start( argp, fmt );
@@ -129 +140 @@
         }
 
-        void exit( int status ) __attribute__(( __nothrow__, __leaf__, __noreturn__ )) {
+        void exit( int status ) __attribute__ (( __nothrow__, __leaf__, __noreturn__ )) {
                 __cabi_libc.exit( status );
         }
 }
 
-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; }
+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 };
@@ -142 +153 @@
 static int abort_lastframe;
 
-void exit( int status, const char fmt[], ... ) __attribute__(( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ )) {
+void exit( int status, const char fmt[], ... ) __attribute__ (( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ )) {
     va_list args;
     va_start( args, fmt );
@@ -150 +161 @@
 }
 
-void abort( const char fmt[], ... ) __attribute__(( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )) {
+void abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )) {
         void * kernel_data = kernel_abort();                    // must be done here to lock down kernel
         int len;