Changes in libcfa/src/interpose_thread.cfa [e10714a:7f81ef4]

File:

• libcfa/src/interpose_thread.cfa (modified) (3 diffs)

libcfa/src/interpose_thread.cfa

@@ -14 +14 @@
 //
 
-// BUG in 32-bit gcc with interpose: fixed in >= gcc-9.5, gcc-10.4, gcc-12.2
-#ifdef __i386__                                                                                 // 32-bit architecture
-#undef _GNU_SOURCE
-#endif // __i386__
-
+#include <stdarg.h>                                                                             // va_start, va_end
+#include <stdio.h>
+#include <string.h>                                                                             // strlen
 #include <signal.h>
 #include <pthread.h>
-#include <signal.h>
 extern "C" {
 #include <dlfcn.h>                                                                              // dlopen, dlsym
+#include <execinfo.h>                                                                   // backtrace, messages
 }
 
+#include "bits/debug.hfa"
 #include "bits/defs.hfa"
+#include <assert.h>
 
 //=============================================================================================
@@ -34 +34 @@
 typedef void (* generic_fptr_t)(void);
 
-generic_fptr_t libcfa_public interpose_symbol(
+generic_fptr_t interpose_symbol(
         generic_fptr_t (*do_interpose_symbol)( void * library, const char symbol[], const char version[] ),
         const char symbol[],
         const char version[]
-) {
-        void * library;
+) libcfa_public {
+        const char * error;
 
-        #if defined( RTLD_NEXT )
-        library = RTLD_NEXT;
-        #else
-        // missing RTLD_NEXT => must hard-code library name, assuming libstdc++
-        library = dlopen( "libpthread.so", RTLD_LAZY );
-        if ( ! library ) {                                                                      // == nullptr
-                abort( "interpose_symbol : failed to open libpthread, %s\n", dlerror() );
+        static void * library;
+        if ( ! library ) {
+                #if defined( RTLD_NEXT )
+                        library = RTLD_NEXT;
+                #else
+                        // missing RTLD_NEXT => must hard-code library name, assuming libstdc++
+                        library = dlopen( "libpthread.so", RTLD_LAZY );
+                        error = dlerror();
+                        if ( error ) {
+                                abort( "interpose_symbol : failed to open libpthread, %s\n", error );
+                        }
+                #endif
         } // if
-        #endif // RTLD_NEXT
 
-        return do_interpose_symbol( library, symbol, version );
+        return do_interpose_symbol(library, symbol, version);
 }
 
@@ -79 +83 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
-                INTERPOSE( pthread_create, version );
-                INTERPOSE( pthread_join, version );
-                INTERPOSE( pthread_self, version );
-                INTERPOSE( pthread_attr_init, version );
-                INTERPOSE( pthread_attr_destroy, version );
-                INTERPOSE( pthread_attr_setstack, version );
-                INTERPOSE( pthread_attr_getstacksize, version );
-                INTERPOSE( pthread_sigmask, version );
-                INTERPOSE( pthread_sigqueue, version );
-                INTERPOSE( pthread_once, version );
+                INTERPOSE( pthread_create , version );
+                INTERPOSE( pthread_join , version );
+                INTERPOSE( pthread_self , version );
+                INTERPOSE( pthread_attr_init , version );
+                INTERPOSE( pthread_attr_destroy , version );
+                INTERPOSE( pthread_attr_setstack , version );
+                INTERPOSE( pthread_attr_getstacksize , version );
+                INTERPOSE( pthread_sigmask , version );
+                INTERPOSE( pthread_sigqueue , version );
+                INTERPOSE( pthread_once , version );
 #pragma GCC diagnostic pop
         }