sr-dev February 2024

sr-dev@lists.kamailio.org

19 participants
243 discussions

[kamailio/kamailio] kamailio.cfg with MySQL/PostgreSQL: audit for all libssl calls (PR #3748)
by space88man 08 Feb '24

08 Feb '24

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Audit of libssl calls with default kamailio.cfg + database using MariaDB and PostgreSQL and add libssl thread guards. Debian 12: for the default kamailio.cfg we build db_mysql / db_postgres / db_unixodbc and enable database with SSL 1. mariadb-client, libmariadb-dev, odbc-mariadb 2. postgresql-15, postgresql-client-15, odbc-postgresql This PR adds thread guards for all function calls that touch thread-locals in process#0thread1 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3748 -- Commit Summary -- * core/rthreads.h: thread wrapper for db_XXXX_query * db_postgres: libssl thread guard for db_postgres_close * db_unixodbc: libssl thread guards for db_unixodbc_(close|free_result|query) * db_mysql: libssl thread guard for db_mysql_close -- File Changes -- M src/core/rthreads.h (53) M src/modules/db_mysql/km_dbase.c (8) M src/modules/db_postgres/km_dbase.c (8) M src/modules/db_unixodbc/dbase.c (27) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3748.patch https://github.com/kamailio/kamailio/pull/3748.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3748 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3748(a)github.com>

1 1

git:master:4baa76cd: core/rthreads.h: thread wrapper for db_XXXX_query
by S-P Chan 08 Feb '24

08 Feb '24

Module: kamailio Branch: master Commit: 4baa76cd3e0d4052baf037c663a898fd11c54514 URL: https://github.com/kamailio/kamailio/commit/4baa76cd3e0d4052baf037c663a898f… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-09T07:05:17+08:00 core/rthreads.h: thread wrapper for db_XXXX_query --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/4baa76cd3e0d4052baf037c663a898f… Patch: https://github.com/kamailio/kamailio/commit/4baa76cd3e0d4052baf037c663a898f… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index 2f922be5a75..e96f45c9395 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -201,3 +201,56 @@ static void run_thread0P(_thread_proto0P fn, void *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; + + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && 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

1 0

git:master:5844207c: influxdbc: functions for kemi framework
by Daniel-Constantin Mierla 08 Feb '24

08 Feb '24

Module: kamailio Branch: master Commit: 5844207ce42ef830fe560e408c6e807184c8d31e URL: https://github.com/kamailio/kamailio/commit/5844207ce42ef830fe560e408c6e807… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-08T16:31:19+01:00 influxdbc: functions for kemi framework --- Modified: src/modules/influxdbc/influxdbc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5844207ce42ef830fe560e408c6e807… Patch: https://github.com/kamailio/kamailio/commit/5844207ce42ef830fe560e408c6e807… --- diff --git a/src/modules/influxdbc/influxdbc_mod.c b/src/modules/influxdbc/influxdbc_mod.c index 0ec502a7d71..90f6107ac68 100644 --- a/src/modules/influxdbc/influxdbc_mod.c +++ b/src/modules/influxdbc/influxdbc_mod.c @@ -165,6 +165,16 @@ static int w_influxdbc_measure(sip_msg_t *msg, char *pname, char *p2) return 1; } +/** + * + */ +static int ki_influxdbc_measure(sip_msg_t *msg, str *name) +{ + ic_measure(name->s); + + return 1; +} + /** * */ @@ -175,6 +185,16 @@ static int w_influxdbc_measureend(sip_msg_t *msg, char *p1, char *p2) return 1; } +/** + * + */ +static int ki_influxdbc_measureend(sip_msg_t *msg) +{ + ic_measureend(); + + return 1; +} + /** * */ @@ -212,6 +232,16 @@ static int w_influxdbc_push(sip_msg_t *msg, char *p1, char *p2) return 1; } +/** + * + */ +static int ki_influxdbc_push(sip_msg_t *msg) +{ + ic_push(); + + return 1; +} + /** * */ @@ -234,6 +264,16 @@ static int w_influxdbc_long(sip_msg_t *msg, char *pname, char *pvalue) return 1; } +/** + * + */ +static int ki_influxdbc_long(sip_msg_t *msg, str *name, int val) +{ + ic_long(name->s, val); + + return 1; +} + /** * */ @@ -288,6 +328,27 @@ static int w_influxdbc_double(sip_msg_t *msg, char *pname, char *pvalue) */ /* clang-format off */ static sr_kemi_t sr_kemi_influxdbc_exports[] = { + { str_init("influxdbc"), str_init("measure"), + SR_KEMIP_INT, ki_influxdbc_measure, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("influxdbc"), str_init("measureend"), + SR_KEMIP_INT, ki_influxdbc_measureend, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("influxdbc"), str_init("ic_long"), + SR_KEMIP_INT, ki_influxdbc_long, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("influxdbc"), str_init("push"), + SR_KEMIP_INT, ki_influxdbc_push, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; /* clang-format on */

1 0

git:master:c8306ceb: influxdb: added missing for sub start and end
by Daniel-Constantin Mierla 08 Feb '24

08 Feb '24

Module: kamailio Branch: master Commit: c8306ceb46c201172f84f72e5566922c22578fc2 URL: https://github.com/kamailio/kamailio/commit/c8306ceb46c201172f84f72e5566922… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-08T08:02:49+01:00 influxdb: added missing for sub start and end --- Modified: src/modules/influxdbc/influxdbc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c8306ceb46c201172f84f72e5566922… Patch: https://github.com/kamailio/kamailio/commit/c8306ceb46c201172f84f72e5566922… --- diff --git a/src/modules/influxdbc/influxdbc_mod.c b/src/modules/influxdbc/influxdbc_mod.c index 2c2f8804bb4..0ec502a7d71 100644 --- a/src/modules/influxdbc/influxdbc_mod.c +++ b/src/modules/influxdbc/influxdbc_mod.c @@ -47,6 +47,8 @@ static char *_infdbc_tags = NULL; static int w_influxdbc_measure(sip_msg_t *msg, char *pname, char *p2); static int w_influxdbc_measureend(sip_msg_t *msg, char *p1, char *p2); +static int w_influxdbc_sub(sip_msg_t *msg, char *pname, char *p2); +static int w_influxdbc_subend(sip_msg_t *msg, char *p1, char *p2); static int w_influxdbc_push(sip_msg_t *msg, char *p1, char *p2); static int w_influxdbc_long(sip_msg_t *msg, char *pname, char *pvalue); static int w_influxdbc_string(sip_msg_t *msg, char *pname, char *pvalue); @@ -62,6 +64,10 @@ static cmd_export_t cmds[] = { 1, fixup_spve_null, 0, ANY_ROUTE}, {"influxdbc_measureend", (cmd_function)w_influxdbc_measureend, 0, 0, 0, ANY_ROUTE}, + {"influxdbc_sub", (cmd_function)w_influxdbc_sub, + 1, fixup_spve_null, 0, ANY_ROUTE}, + {"influxdbc_subend", (cmd_function)w_influxdbc_subend, + 0, 0, 0, ANY_ROUTE}, {"influxdbc_push", (cmd_function)w_influxdbc_push, 0, 0, 0, ANY_ROUTE}, {"influxdbc_long", (cmd_function)w_influxdbc_long, @@ -169,6 +175,33 @@ static int w_influxdbc_measureend(sip_msg_t *msg, char *p1, char *p2) return 1; } +/** + * + */ +static int w_influxdbc_sub(sip_msg_t *msg, char *pname, char *p2) +{ + str sname; + + if(fixup_get_svalue(msg, (gparam_t *)pname, &sname) != 0) { + LM_ERR("unable to get name parameter\n"); + return -1; + } + + ic_sub(sname.s); + + return 1; +} + +/** + * + */ +static int w_influxdbc_subend(sip_msg_t *msg, char *p1, char *p2) +{ + ic_subend(); + + return 1; +} + /** * */

1 0

[kamailio/kamailio] topos: add compatiblity for early in-dialog NOTIFY (PR #3627)
by Maurits de Ruiter 07 Feb '24

07 Feb '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description After enabling the Topos module, we ran into a bit of trouble with early in-dialog notifies. We use the `event: talk` package from Cisco Broadsoft to be able to do call control, as described in chapter 6 here: https://pubhub.devnetcloud.com/media/broadsoft-docs/docs/pdf/BW-SIPAccessSi… This will send a NOTIFY with a header `Event: talk` before the first `200 OK`. Currently this doesn't work with the topos module, since the NOTIFY method without a B-side contact will not check the INVITE record. When added to those methods in `tps_msg.c`, it tries to check the SUBSCRIBE for all NOTIFY's in `tps_storage.c`. The NOTIFY with `Event: talk` will follow on an INVITE, so there was a small change needed there. I've limited it to just the NOTIFY's with the `Event: talk` header, to minimize any impact. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3627 -- Commit Summary -- * topos: add compatiblity for early in-dialog NOTIFY -- File Changes -- M src/modules/topos/tps_msg.c (5) M src/modules/topos/tps_storage.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3627.patch https://github.com/kamailio/kamailio/pull/3627.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3627 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3627(a)github.com>

3 19

Working with arrays in MongoDB documents
by mario.pereira＠quobis.com 07 Feb '24

07 Feb '24

Hi everybody, I normally use MongoDB as DB engine in my projects and I would like to get all MongoDB advantages when working with Kamailio. For this reason, I need to deal with arrays of information inside a document (for example, an array of contacts inside a document). And now the question: is it possible to insert, update and search info in a MongoDB document by using arrays via srdb1 lib? If yes, how? And if not, are you thinking about implementing it in the future? Thank you very much for your time. Regards, Mario

2 3

git:master:fb7c4ec9: core/rthreads.h: fix missing returns
by S-P Chan 07 Feb '24

07 Feb '24

Module: kamailio Branch: master Commit: fb7c4ec9a33d8147094aa664ce3c96b6c3cb7d35 URL: https://github.com/kamailio/kamailio/commit/fb7c4ec9a33d8147094aa664ce3c96b… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-07T14:08:01+08:00 core/rthreads.h: fix missing returns --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/fb7c4ec9a33d8147094aa664ce3c96b… Patch: https://github.com/kamailio/kamailio/commit/fb7c4ec9a33d8147094aa664ce3c96b… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index 897e6b8d9ed..2f922be5a75 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -40,16 +40,17 @@ static void *run_threadP(_thread_proto fn, void *arg) pthread_t tid; void *ret; - if(likely(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && process_no > 0))) { - return fn(arg); - } + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { + return fn(arg); + } pthread_create(&tid, NULL, fn, arg); pthread_join(tid, &ret); return ret; #else - return fn(arg); + return fn(arg); #endif /* USE_TLS */ } #endif @@ -76,9 +77,10 @@ static void *run_threadPI(_thread_protoPI fn, void *arg1, int arg2) pthread_t tid; void *ret; - if(likely(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && process_no > 0))) { - return fn(arg1, arg2); - } + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { + return fn(arg1, arg2); + } pthread_create(&tid, NULL, (_thread_proto)&run_thread_wrapPI, &(struct _thread_argsPI){fn, arg1, arg2}); @@ -86,7 +88,7 @@ static void *run_threadPI(_thread_protoPI fn, void *arg1, int arg2) return ret; #else - return fn(arg1, arg2); + return fn(arg1, arg2); #endif } #endif @@ -111,15 +113,17 @@ static void run_threadV(_thread_protoV fn) #ifdef USE_TLS pthread_t tid; - if(likely(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && process_no > 0))) { - fn(); - } + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && process_no > 0))) { + fn(); + return; + } pthread_create(&tid, NULL, (_thread_proto)run_thread_wrapV, &(struct _thread_argsV){fn}); pthread_join(tid, NULL); #else - fn(); + fn(); #endif } #endif @@ -148,16 +152,17 @@ static int run_thread4PP(_thread_proto4PP fn, void *arg1, void *arg2) pthread_t tid; int ret; - if(likely(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && process_no > 0))) { - return fn(arg1, arg2); - } + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && 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); + return fn(arg1, arg2); #endif } #endif @@ -183,14 +188,16 @@ static void run_thread0P(_thread_proto0P fn, void *arg1) #ifdef USE_TLS pthread_t tid; - if(likely(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && process_no > 0))) { - fn(arg1); - } + if(likely(ksr_tls_threads_mode == 0 + || (ksr_tls_threads_mode == 1 && 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) + fn(arg1) #endif } #endif

1 0

git:master:1a2993ca: core/rthreads.h: fix missing return
by S-P Chan 06 Feb '24

06 Feb '24

Module: kamailio Branch: master Commit: 1a2993ca370da35c34abae1cb44086492faa0ade URL: https://github.com/kamailio/kamailio/commit/1a2993ca370da35c34abae1cb440864… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-07T05:54:35+08:00 core/rthreads.h: fix missing return --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/1a2993ca370da35c34abae1cb440864… Patch: https://github.com/kamailio/kamailio/commit/1a2993ca370da35c34abae1cb440864… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index 084f463261b..897e6b8d9ed 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -49,7 +49,7 @@ static void *run_threadP(_thread_proto fn, void *arg) return ret; #else - fn(arg); + return fn(arg); #endif /* USE_TLS */ } #endif

1 0

git:master:e52bc4ba: Sample etc/kamailio.cfg: add tls_threads_mode to config
by S-P Chan 06 Feb '24

06 Feb '24

Module: kamailio Branch: master Commit: e52bc4ba41417362c79da1cd3d41b283aabc4eb8 URL: https://github.com/kamailio/kamailio/commit/e52bc4ba41417362c79da1cd3d41b28… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-07T05:49:14+08:00 Sample etc/kamailio.cfg: add tls_threads_mode to config --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/e52bc4ba41417362c79da1cd3d41b28… Patch: https://github.com/kamailio/kamailio/commit/e52bc4ba41417362c79da1cd3d41b28… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index cc043fad58b..2d68f7692e1 100755 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -220,6 +220,13 @@ enable_tls=yes /* upper limit for TLS connections */ tls_max_connections=2048 + +/* For OpenSSL 3 integration + * functions calling libssl3 can be invoked in a transient thread + * 0: disable threaded calls + * 1: use threads for process#0 only + * 2: use threads for all processes */ +tls_threads_mode=1 #!endif /* set it to yes to enable sctp and load sctp.so module */

1 0

git:master:aa15489f: core/rthreads.h: use global ksr_tls_threads_mode to constrain thread
by S-P Chan 06 Feb '24

06 Feb '24

Module: kamailio Branch: master Commit: aa15489f0a8de4a27197602d771fe02cf5745287 URL: https://github.com/kamailio/kamailio/commit/aa15489f0a8de4a27197602d771fe02… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-07T05:24:30+08:00 core/rthreads.h: use global ksr_tls_threads_mode to constrain thread wrapping - 0: run wrapped function directly - 1: run wrapped function in thread for process#0 else run directly - 2: always run wrapped function in thread --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/aa15489f0a8de4a27197602d771fe02… Patch: https://github.com/kamailio/kamailio/commit/aa15489f0a8de4a27197602d771fe02… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index a416ad2ca50..084f463261b 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -27,6 +27,7 @@ */ #include <pthread.h> +#include "./globals.h" /* * prototype: void *fn(void *arg) { ... } */ @@ -35,13 +36,21 @@ 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(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && process_no > 0))) { + return fn(arg); + } + pthread_create(&tid, NULL, fn, arg); pthread_join(tid, &ret); return ret; +#else + fn(arg); +#endif /* USE_TLS */ } #endif @@ -63,14 +72,22 @@ 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(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && 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 @@ -91,11 +108,19 @@ static void *run_thread_wrapV(struct _thread_argsV *args) static void run_threadV(_thread_protoV fn) { +#ifdef USE_TLS pthread_t tid; + if(likely(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && process_no > 0))) { + fn(); + } + pthread_create(&tid, NULL, (_thread_proto)run_thread_wrapV, &(struct _thread_argsV){fn}); pthread_join(tid, NULL); +#else + fn(); +#endif } #endif @@ -119,14 +144,21 @@ 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(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && 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 @@ -148,10 +180,17 @@ 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(ksr_tls_threads_mode == 0 || (ksr_tls_threads_mode == 1 && process_no > 0))) { + fn(arg1); + } pthread_create(&tid, NULL, (_thread_proto)run_thread_wrap0P, &(struct _thread_args0P){fn, arg1}); pthread_join(tid, NULL); +#else + fn(arg1) +#endif } #endif

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2024