Module: kamailio Branch: master Commit: a6c7538cb873aa8ee173eadffecbe3fdefe40bd7 URL: https://github.com/kamailio/kamailio/commit/a6c7538cb873aa8ee173eadffecbe3fd...
Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: 2024-11-27T09:18:06+01:00
core: new parameter to define async_tkv_gname
---
Modified: src/core/async_task.c Modified: src/core/async_task.h Modified: src/core/cfg.lex Modified: src/core/cfg.y
---
Diff: https://github.com/kamailio/kamailio/commit/a6c7538cb873aa8ee173eadffecbe3fd... Patch: https://github.com/kamailio/kamailio/commit/a6c7538cb873aa8ee173eadffecbe3fd...
---
diff --git a/src/core/async_task.c b/src/core/async_task.c index e66205335fa..66b3d2c0b08 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -537,6 +537,16 @@ int async_task_run(async_wgroup_t *awg, int idx) static async_wgroup_t *_async_tkv_awg = NULL; static async_tkv_param_t *_ksr_async_tkv_param = NULL; static int _ksr_async_tkv_ridx = -1; +static str async_tkv_gname = str_init("tkv"); + +/** + * + */ +void async_tkv_gname_set(char *gname) +{ + async_tkv_gname.s = gname; + async_tkv_gname.len = strlen(async_tkv_gname.s); +}
/** * @@ -551,10 +561,12 @@ async_tkv_param_t *ksr_async_tkv_param_get(void) */ void async_tkv_init(void) { - str gname = str_init("tkv"); str evname = str_init("core:tkv");
- _async_tkv_awg = async_task_group_find(&gname); + if(async_tkv_gname.len <= 0) { + return; + } + _async_tkv_awg = async_task_group_find(&async_tkv_gname);
_ksr_async_tkv_ridx = route_lookup(&event_rt, evname.s); if(_ksr_async_tkv_ridx <= 0 diff --git a/src/core/async_task.h b/src/core/async_task.h index 67df94d6169..8319f0b8a46 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -69,5 +69,6 @@ typedef struct async_tkv_param void async_tkv_init(void); int async_tkv_emit(int dtype, char *pkey, char *fmt, ...); async_tkv_param_t *ksr_async_tkv_param_get(void); +void async_tkv_gname_set(char *gname);
#endif diff --git a/src/core/cfg.lex b/src/core/cfg.lex index a557f62754f..91aece447f3 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -381,6 +381,7 @@ ASYNC_WORKERS async_workers ASYNC_USLEEP async_usleep ASYNC_NONBLOCK async_nonblock ASYNC_WORKERS_GROUP async_workers_group +ASYNC_TKV_GNAME async_tkv_gname CHECK_VIA check_via PHONE2TEL phone2tel MEMLOG "memlog"|"mem_log" @@ -874,6 +875,7 @@ IMPORTFILE "import_file" <INITIAL>{ASYNC_USLEEP} { count(); yylval.strval=yytext; return ASYNC_USLEEP; } <INITIAL>{ASYNC_NONBLOCK} { count(); yylval.strval=yytext; return ASYNC_NONBLOCK; } <INITIAL>{ASYNC_WORKERS_GROUP} { count(); yylval.strval=yytext; return ASYNC_WORKERS_GROUP; } +<INITIAL>{ASYNC_TKV_GNAME} { count(); yylval.strval=yytext; return ASYNC_TKV_GNAME; } <INITIAL>{CHECK_VIA} { count(); yylval.strval=yytext; return CHECK_VIA; } <INITIAL>{PHONE2TEL} { count(); yylval.strval=yytext; return PHONE2TEL; } <INITIAL>{MEMLOG} { count(); yylval.strval=yytext; return MEMLOG; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 1033e61cb19..f5544a96ac6 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -397,6 +397,7 @@ extern char *default_routename; %token ASYNC_USLEEP %token ASYNC_NONBLOCK %token ASYNC_WORKERS_GROUP +%token ASYNC_TKV_GNAME %token CHECK_VIA %token PHONE2TEL %token MEMLOG @@ -1088,6 +1089,8 @@ assign_stm: | ASYNC_NONBLOCK EQUAL error { yyerror("number expected"); } | ASYNC_WORKERS_GROUP EQUAL STRING { async_task_set_workers_group($3); } | ASYNC_WORKERS_GROUP EQUAL error { yyerror("string expected"); } + | ASYNC_TKV_GNAME EQUAL STRING { async_tkv_gname_set($3); } + | ASYNC_TKV_GNAME EQUAL error { yyerror("string expected"); } | CHECK_VIA EQUAL NUMBER { check_via=$3; } | CHECK_VIA EQUAL error { yyerror("boolean value expected"); } | PHONE2TEL EQUAL NUMBER { phone2tel=$3; }