Changeset 95dab9e for libcfa/src/interpose.cfa

Timestamp:

Sep 21, 2022, 11:56:16 AM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

9cd5bd2

Parents:

7f6a7c9

Message:

Changed real_pthread symbols (now cfaabi_pthread) to be protected in libcfathread

File:

• libcfa/src/interpose.cfa (modified) (6 diffs)

libcfa/src/interpose.cfa

@@ -42 +42 @@
 
 typedef void (* generic_fptr_t)(void);
+static generic_fptr_t do_interpose_symbol( void * library, const char symbol[], const char version[] ) {
+        const char * error;
+
+        union { generic_fptr_t fptr; void * ptr; } originalFunc;
+
+        #if defined( _GNU_SOURCE )
+                if ( version ) {
+                        originalFunc.ptr = dlvsym( library, symbol, version );
+                } else {
+                        originalFunc.ptr = dlsym( library, symbol );
+                }
+        #else
+                originalFunc.ptr = dlsym( library, symbol );
+        #endif // _GNU_SOURCE
+
+        error = dlerror();
+        if ( error ) abort( "interpose_symbol : internal error, %s\n", error );
+
+        return originalFunc.fptr;
+}
+
 static generic_fptr_t interpose_symbol( const char symbol[], const char version[] ) {
         const char * error;
@@ -72 +93 @@
         } // if
 
-        union { generic_fptr_t fptr; void * ptr; } originalFunc;
-
-        #if defined( _GNU_SOURCE )
-                if ( version ) {
-                        originalFunc.ptr = dlvsym( library, symbol, version );
-                } else {
-                        originalFunc.ptr = dlsym( library, symbol );
-                }
-        #else
-                originalFunc.ptr = dlsym( library, symbol );
-        #endif // _GNU_SOURCE
-
-        error = dlerror();
-        if ( error ) {
-                originalFunc.ptr = dlsym( pthread_library, symbol );
-                error = dlerror();
-                if (error){
-                        abort( "interpose_symbol : internal error, %s\n", error );
-                }       // if
-        }       // if
-
-        return originalFunc.fptr;
+        return do_interpose_symbol(library, symbol, version);
 }
 
@@ -111 +111 @@
         void (* exit)( int ) __attribute__(( __noreturn__ ));
         void (* abort)( void ) __attribute__(( __noreturn__ ));
-        typeof(pthread_create) pthread_create;
-        typeof(pthread_join) pthread_join;
-        typeof(pthread_self) pthread_self;
-        typeof(pthread_attr_init) pthread_attr_init;
-        typeof(pthread_attr_setstack ) pthread_attr_setstack;
-        typeof(pthread_attr_destroy) pthread_attr_destroy;
-        typeof(pthread_attr_getstacksize) pthread_attr_getstacksize;
-        typeof(pthread_sigmask) pthread_sigmask;
-        typeof(pthread_sigqueue) pthread_sigqueue;
+        int (*pthread_create)(pthread_t *_thread, const pthread_attr_t *attr, void *(*start_routine) (void *), void *arg);
+        int (*pthread_join)(pthread_t _thread, void **retval);
+        pthread_t (*pthread_self)(void);
+        int (*pthread_attr_init)(pthread_attr_t *attr);
+        int (*pthread_attr_destroy)(pthread_attr_t *attr);
+        int (*pthread_attr_setstack)( pthread_attr_t *attr, void *stackaddr, size_t stacksize );
+        int (*pthread_attr_getstacksize)( const pthread_attr_t *attr, size_t *stacksize );
+        int (*pthread_sigmask)(int how, const sigset_t *set, sigset_t *oldset);
+        int (*pthread_sigqueue)(pthread_t _thread, int sig, const union sigval value);
 } __cabi_libc;
 
@@ -125 +125 @@
 
 extern "C" {
+        void __cfathreadabi_interpose_startup( generic_fptr_t (*do_interpose_symbol)( void * library, const char symbol[], const char version[] ) ) __attribute__((weak));
         void __cfaabi_interpose_startup( void ) {
                 const char *version = 0p;
@@ -135 +136 @@
                 INTERPOSE_LIBC( abort, version );
                 INTERPOSE_LIBC( exit , version );
-                INTERPOSE_LIBC( pthread_create , version );
-                INTERPOSE_LIBC( pthread_join , version );
-                INTERPOSE_LIBC( pthread_self , version );
-                INTERPOSE_LIBC( pthread_attr_init , version );
-                INTERPOSE_LIBC( pthread_attr_destroy , version );
-                INTERPOSE_LIBC( pthread_attr_setstack , version );
-                INTERPOSE_LIBC( pthread_attr_getstacksize , version );
-                INTERPOSE_LIBC( pthread_sigmask , version );
-                INTERPOSE_LIBC( pthread_sigqueue , version );
 #pragma GCC diagnostic pop
+
+                if(__cfathreadabi_interpose_startup) __cfathreadabi_interpose_startup( do_interpose_symbol );
 
                 // As a precaution (and necessity), errors that result in termination are delivered on a separate stack because
@@ -204 +198 @@
         libcfa_public void exit( int status ) __attribute__(( __nothrow__, __leaf__, __noreturn__ )) {
                 __cabi_libc.exit( status );
-        }
-
-        libcfa_public int real_pthread_create(pthread_t *_thread, const pthread_attr_t *attr, void *(*start_routine) (void *), void *arg){
-                return __cabi_libc.pthread_create(_thread, attr, start_routine, arg);
-        }
-
-        libcfa_public int real_pthread_join(pthread_t _thread, void **retval){
-                return __cabi_libc.pthread_join(_thread, retval);
-        }
-
-        libcfa_public pthread_t real_pthread_self(void){
-                return __cabi_libc.pthread_self();
-        }
-        libcfa_public int real_pthread_attr_init(pthread_attr_t *attr){
-                return __cabi_libc.pthread_attr_init(attr);
-        }
-        libcfa_public int real_pthread_attr_destroy(pthread_attr_t *attr){
-                return __cabi_libc.pthread_attr_destroy(attr);
-        }
-        libcfa_public int real_pthread_attr_setstack( pthread_attr_t *attr, void *stackaddr, size_t stacksize ){
-                return __cabi_libc.pthread_attr_setstack(attr, stackaddr, stacksize);
-        }
-        libcfa_public int read_pthread_attr_getstacksize( const pthread_attr_t *attr, size_t *stacksize ){
-                return __cabi_libc.pthread_attr_getstacksize(attr, stacksize);
-        }
-        libcfa_public int real_pthread_sigmask(int how, const sigset_t *set, sigset_t *oldset){
-                return __cabi_libc.pthread_sigmask(how, set, oldset);
-        }
-        libcfa_public int real_pthread_sigqueue(pthread_t _thread, int sig, const union sigval value){
-                return __cabi_libc.pthread_sigqueue(_thread, sig, value);
         }
 }