Module: kamailio Branch: 5.7 Commit: f028972588296858429e28f941a085131af8084c URL: https://github.com/kamailio/kamailio/commit/f028972588296858429e28f941a0851… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-07T17:36:38+08:00 core/rthreads.h: use thread wrappers only for process#0 - for process#0 use threads to avoid initializing libssl thread-locals in thread#1 - for process_no > 0 revert to standard behaviour and reduce overhead of creating threads --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/f028972588296858429e28f941a0851… Patch: https://github.com/kamailio/kamailio/commit/f028972588296858429e28f941a0851… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index a416ad2ca50..add3426d4db 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -35,13 +35,20 @@ typedef void *(*_thread_proto)(void *); #ifndef KSR_RTHREAD_SKIP_P static void *run_threadP(_thread_proto fn, void *arg) { +#ifdef USE_TLS pthread_t tid; void *ret; + if(likely(process_no)) { + return fn(arg); + } pthread_create(&tid, NULL, fn, arg); pthread_join(tid, &ret); return ret; +#else + return fn(arg); +#endif /* USE_TLS */ } #endif @@ -63,14 +70,21 @@ static void *run_thread_wrapPI(struct _thread_argsPI *args) static void *run_threadPI(_thread_protoPI fn, void *arg1, int arg2) { +#ifdef USE_TLS pthread_t tid; void *ret; + if(likely(process_no)) { + return fn(arg1, arg2); + } pthread_create(&tid, NULL, (_thread_proto)&run_thread_wrapPI, &(struct _thread_argsPI){fn, arg1, arg2}); pthread_join(tid, &ret); return ret; +#else + return fn(arg1, arg2); +#endif /* USE_TLS */ } #endif @@ -91,11 +105,20 @@ static void *run_thread_wrapV(struct _thread_argsV *args) static void run_threadV(_thread_protoV fn) { +#ifdef USE_TLS pthread_t tid; + if(likely(process_no)) { + fn(); + return; + } + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrapV, &(struct _thread_argsV){fn}); pthread_join(tid, NULL); +#else + fn(); +#endif /* USE_TLS */ } #endif @@ -119,14 +142,22 @@ static void *run_thread_wrap4PP(struct _thread_args4PP *args) static int run_thread4PP(_thread_proto4PP fn, void *arg1, void *arg2) { +#ifdef USE_TLS pthread_t tid; int ret; + if(likely(process_no)) { + return fn(arg1, arg2); + } + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4PP, &(struct _thread_args4PP){fn, arg1, arg2, &ret}); pthread_join(tid, NULL); return ret; +#else + return fn(arg1, arg2); +#endif } #endif @@ -148,10 +179,19 @@ static void *run_thread_wrap0P(struct _thread_args0P *args) static void run_thread0P(_thread_proto0P fn, void *arg1) { +#ifdef USE_TLS pthread_t tid; + if(likely(process_no)) { + fn(arg1); + return; + } + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap0P, &(struct _thread_args0P){fn, arg1}); pthread_join(tid, NULL); +#else + fn(arg1); +#endif /* USE_TLS */ } #endif