core: revert tls_threads_mode=1

src/core/globals.h

@@ -112,7 +112,8 @@ extern int ksr_tcp_script_mode;
 extern int tls_disable;
 extern unsigned short tls_port_no;
 #define KSR_TLS_THREADS_MNONE 0 /* no set of set thread-local variables */
-#define KSR_TLS_THREADS_MTEMP 1 /* set thread-local variables in temp thread */
+#define KSR_TLS_THREADS_MTEMP \
+	1 /* set thread-local variables in temp thread; deprecated and unused for 6.x */
 #define KSR_TLS_THREADS_MFORK 2 /* set thread-local variables in at-fork */
 extern int ksr_tls_threads_mode;
 #endif

src/core/rthreads.h

@@ -1,308 +0,0 @@
-/*
- * Copyright (C) 2024 Chan Shih-Ping
- *
- * This file is part of Kamailio, a free SIP server.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * A set of helpers to run functions in threads.
- *
- * This is not a thread pool implementation -
- * - it runs functions in a run-once thread to avoid
- * creating thread-locals in the calling thread.
- *
- * Primary use case: to init libssl in a separate thread
- */
-#include <pthread.h>
-
-#include "./globals.h"
-/*
- * prototype: void *fn(void *arg) { ... }
- */
-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 = NULL;
-
-	if(likely(ksr_tls_threads_mode == KSR_TLS_THREADS_MNONE
-			   || ksr_tls_threads_mode == KSR_TLS_THREADS_MFORK
-			   || (ksr_tls_threads_mode == KSR_TLS_THREADS_MTEMP
-					   && process_no > 0))) {
-		return fn(arg);
-	}
-
-	pthread_create(&tid, NULL, fn, arg);
-	pthread_join(tid, &ret);
-
-	return ret;
-#else
-	return fn(arg);
-#endif /* USE_TLS */
-}
-#endif
-
-/*
- * prototype: void *fn(void *arg1, int arg2) { ... }
- */
-#ifdef KSR_RTHREAD_NEED_PI
-typedef void *(*_thread_protoPI)(void *, int);
-struct _thread_argsPI
-{
-	_thread_protoPI fn;
-	void *tptr;
-	int tint;
-};
-static void *run_thread_wrapPI(struct _thread_argsPI *args)
-{
-	return (*args->fn)(args->tptr, args->tint);
-}
-
-static void *run_threadPI(_thread_protoPI fn, void *arg1, int arg2)
-{
-#ifdef USE_TLS
-	pthread_t tid;
-	void *ret = NULL;
-
-	if(likely(ksr_tls_threads_mode == KSR_TLS_THREADS_MNONE
-			   || ksr_tls_threads_mode == KSR_TLS_THREADS_MFORK
-			   || (ksr_tls_threads_mode == KSR_TLS_THREADS_MTEMP
-					   && process_no > 0))) {
-		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
-}
-#endif
-
-/*
- * prototype: void fn(void) { ... }
- */
-#ifdef KSR_RTHREAD_NEED_V
-typedef void (*_thread_protoV)(void);
-struct _thread_argsV
-{
-	_thread_protoV fn;
-};
-static void *run_thread_wrapV(struct _thread_argsV *args)
-{
-	(*args->fn)();
-	return NULL;
-}
-
-static void run_threadV(_thread_protoV fn)
-{
-#ifdef USE_TLS
-	pthread_t tid;
-
-	if(likely(ksr_tls_threads_mode == KSR_TLS_THREADS_MNONE
-			   || ksr_tls_threads_mode == KSR_TLS_THREADS_MFORK
-			   || (ksr_tls_threads_mode == KSR_TLS_THREADS_MTEMP
-					   && process_no > 0))) {
-		fn();
-		return;
-	}
-
-	pthread_create(&tid, NULL, (_thread_proto)run_thread_wrapV,
-			&(struct _thread_argsV){fn});
-	pthread_join(tid, NULL);
-#else
-	fn();
-#endif
-}
-#endif
-
-/*
- * prototype: int fn(void *, void *) { ... }
- */
-#ifdef KSR_RTHREAD_NEED_4PP
-typedef int (*_thread_proto4PP)(void *, void *);
-struct _thread_args4PP
-{
-	_thread_proto4PP fn;
-	void *arg1;
-	void *arg2;
-	int *ret;
-};
-static void *run_thread_wrap4PP(struct _thread_args4PP *args)
-{
-	*args->ret = (*args->fn)(args->arg1, args->arg2);
-	return NULL;
-}
-
-static int run_thread4PP(_thread_proto4PP fn, void *arg1, void *arg2)
-{
-#ifdef USE_TLS
-	pthread_t tid;
-	int ret = 0;
-
-	if(likely(ksr_tls_threads_mode == KSR_TLS_THREADS_MNONE
-			   || ksr_tls_threads_mode == KSR_TLS_THREADS_MFORK
-			   || (ksr_tls_threads_mode == KSR_TLS_THREADS_MTEMP
-					   && process_no > 0))) {
-		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
-
-/*
- * prototype: void fn(void *) { ... }
- */
-#ifdef KSR_RTHREAD_NEED_0P
-typedef void (*_thread_proto0P)(void *);
-struct _thread_args0P
-{
-	_thread_proto0P fn;
-	void *arg1;
-};
-static void *run_thread_wrap0P(struct _thread_args0P *args)
-{
-	(*args->fn)(args->arg1);
-	return NULL;
-}
-
-static void run_thread0P(_thread_proto0P fn, void *arg1)
-{
-#ifdef USE_TLS
-	pthread_t tid;
-
-	if(likely(ksr_tls_threads_mode == KSR_TLS_THREADS_MNONE
-			   || ksr_tls_threads_mode == KSR_TLS_THREADS_MFORK
-			   || (ksr_tls_threads_mode == KSR_TLS_THREADS_MTEMP
-					   && process_no > 0))) {
-		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
-}
-#endif
-
-/*
- * prototype:
- * db_unixodbc_query(const db1_con_t *_h, const db_key_t *_k,
- *    const db_op_t *_op, const db_val_t *_v, const db_key_t *_c,
- *    const int _n, const int _nc, const db_key_t _o, db1_res_t **_r)
- */
-#ifdef KSR_RTHREAD_NEED_4P5I2P2
-typedef int (*_thread_proto4P5I2P2)(
-		void *, void *, void *, void *, void *, int, int, void *, void *);
-struct _thread_args4P5I2P2
-{
-	_thread_proto4P5I2P2 fn;
-	void *arg1;
-	void *arg2;
-	void *arg3;
-	void *arg4;
-	void *arg5;
-	int arg6;
-	int arg7;
-	void *arg8;
-	void *arg9;
-	int *ret;
-};
-static void *run_thread_wrap4P5I2P2(struct _thread_args4P5I2P2 *args)
-{
-	*args->ret = (*args->fn)(args->arg1, args->arg2, args->arg3, args->arg4,
-			args->arg5, args->arg6, args->arg7, args->arg8, args->arg9);
-	return NULL;
-}
-
-static int run_thread4P5I2P2(_thread_proto4P5I2P2 fn, void *arg1, void *arg2,
-		void *arg3, void *arg4, void *arg5, int arg6, int arg7, void *arg8,
-		void *arg9)
-{
-#ifdef USE_TLS
-	pthread_t tid;
-	int ret = 0;
-
-	if(likely(ksr_tls_threads_mode == KSR_TLS_THREADS_MNONE
-			   || ksr_tls_threads_mode == KSR_TLS_THREADS_MFORK
-			   || (ksr_tls_threads_mode == KSR_TLS_THREADS_MTEMP
-					   && process_no > 0))) {
-		return fn(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-	}
-	pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4P5I2P2,
-			&(struct _thread_args4P5I2P2){fn, arg1, arg2, arg3, arg4, arg5,
-					arg6, arg7, arg8, arg9, &ret});
-	pthread_join(tid, NULL);
-	return ret;
-#else
-	return fn(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-#endif
-}
-#endif
-
-/*
- * prototype: CURLcode curl_global_init(long flags) { ... }
- */
-#ifdef KSR_RTHREAD_NEED_4L
-typedef int (*_thread_proto4L)(long);
-struct _thread_args4L
-{
-	_thread_proto4L fn;
-	long arg1;
-	int *ret;
-};
-static void *run_thread_wrap4L(struct _thread_args4L *args)
-{
-	*args->ret = (*args->fn)(args->arg1);
-	return NULL;
-}
-
-static int run_thread4L(_thread_proto4L fn, long arg1)
-{
-#ifdef USE_TLS
-	pthread_t tid;
-	int ret = 0;
-
-	if(likely(ksr_tls_threads_mode == KSR_TLS_THREADS_MNONE
-			   || ksr_tls_threads_mode == KSR_TLS_THREADS_MFORK
-			   || (ksr_tls_threads_mode == KSR_TLS_THREADS_MTEMP
-					   && process_no > 0))) {
-		return fn(arg1);
-	}
-	pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap4L,
-			&(struct _thread_args4L){fn, arg1, &ret});
-	pthread_join(tid, NULL);
-
-	return ret;
-#else
-	return fn(arg1)
-#endif
-}
-#endif