sr-dev November 2013

sr-dev@lists.kamailio.org

29 participants
220 discussions

by Juha Heinanen

> > wheezy control file has build dependency on liblua5.1-0-dev. wheezy > > also has liblua5.2-dev. is there some reason that prevents upgrading > > the version to 5.2? > perhaps you can try to compile and if goes fine, then should be no problem i tried, but looks like app_lua Makefile has 5.1 hard wired. -- juha

11 years

git:master: app_perl: docs updated with reset_cycles parameter and rpc commands

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b1f4dbeef93511563164de2f030f510f5a2cf2d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b1f4dbe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 15 10:08:12 2013 +0100 app_perl: docs updated with reset_cycles parameter and rpc commands --- modules/app_perl/README | 176 +++++++++++++++++++++---------- modules/app_perl/doc/app_perl_admin.xml | 79 +++++++++++++-- 2 files changed, 190 insertions(+), 65 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b1f…

11 years

git:master: app_perl: added mechanism to avoid leaks specific to persistent perl interpreter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b5527627601c9e41ebbfaccb98bc2cf0bc003bdb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b552762… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 15 09:28:25 2013 +0100 app_perl: added mechanism to avoid leaks specific to persistent perl interpreter - it is not easy to track the scope of variables, especially in libs, the solution being to re-init the interpreter - new module parameter reset_cycles to specify the number of execution cycles after which the interpreter is reset. Default is 0 - don't reset at all --- modules/app_perl/app_perl_mod.c | 95 ++++++++++++++++++++++++++++++++------ modules/app_perl/perlfunc.c | 3 + modules/app_perl/perlfunc.h | 2 + 3 files changed, 85 insertions(+), 15 deletions(-) diff --git a/modules/app_perl/app_perl_mod.c b/modules/app_perl/app_perl_mod.c index a27e503..c35ece4 100644 --- a/modules/app_perl/app_perl_mod.c +++ b/modules/app_perl/app_perl_mod.c @@ -31,9 +31,11 @@ #include <stdlib.h> #include <string.h> #include <dlfcn.h> +#include <sys/time.h> #include "../../sr_module.h" #include "../../mem/mem.h" +#include "../../mem/shm_mem.h" #include "../../lib/kmi/mi.h" #include "../../modules/rr/api.h" #include "../../modules/sl/sl.h" @@ -61,6 +63,11 @@ char *modpath = NULL; * memory leaks, the variable thus is not documented! */ int unsafemodfnc = 0; +/* number of execution cycles after which perl interpreter is reset */ +int _ap_reset_cycles_init = 0; +int _ap_exec_cycles = 0; +int *_ap_reset_cycles = 0; + /* Reference to the running Perl interpreter instance */ PerlInterpreter *my_perl = NULL; @@ -115,6 +122,7 @@ static param_export_t params[] = { {"filename", STR_PARAM, &filename}, {"modpath", STR_PARAM, &modpath}, {"unsafemodfnc", INT_PARAM, &unsafemodfnc}, + {"reset_cycles", INT_PARAM, &_ap_reset_cycles_init}, { 0, 0, 0 } }; @@ -275,7 +283,8 @@ int unload_perl(PerlInterpreter *p) { * Reinitializes the interpreter. Works, but execution for _all_ * children is difficult. */ -int perl_reload(struct sip_msg *m, char *a, char *b) { +int perl_reload(void) +{ PerlInterpreter *new_perl; @@ -291,9 +300,9 @@ int perl_reload(struct sip_msg *m, char *a, char *b) { #warning This binary will be unsupported. PL_exit_flags |= PERL_EXIT_EXPECTED; #endif - return 1; - } else { return 0; + } else { + return -1; } } @@ -305,10 +314,10 @@ int perl_reload(struct sip_msg *m, char *a, char *b) { */ struct mi_root* perl_mi_reload(struct mi_root *cmd_tree, void *param) { - if (perl_reload(NULL, NULL, NULL)) { - return init_mi_tree( 200, MI_OK_S, MI_OK_LEN); - } else { + if (perl_reload()<0) { return init_mi_tree( 500, "Perl reload failed", 18); + } else { + return init_mi_tree( 200, MI_OK_S, MI_OK_LEN); } } @@ -324,6 +333,8 @@ static int mod_init(void) { int argc = 1; char *argt[] = { MOD_NAME, NULL }; char **argv; + struct timeval t1; + struct timeval t2; if(register_mi_mod(exports.name, mi_cmds)!=0) { @@ -342,22 +353,39 @@ static int mod_init(void) { return -1; } + _ap_reset_cycles = shm_malloc(sizeof(int)); + if(_ap_reset_cycles == NULL) { + LM_ERR("no more shared memory\n"); + return -1; + } + *_ap_reset_cycles = _ap_reset_cycles_init; + argv = argt; PERL_SYS_INIT3(&argc, &argv, &environ); - if ((my_perl = parser_init())) { - ret = 0; + gettimeofday(&t1, NULL); + my_perl = parser_init(); + gettimeofday(&t2, NULL); + + if (my_perl==NULL) + goto error; + + LM_INFO("perl interpreter has been initialized (%d.%06d => %d.%06d)\n", + (int)t1.tv_sec, (int)t1.tv_usec, + (int)t2.tv_sec, (int)t2.tv_usec); + #ifdef PERL_EXIT_DESTRUCT_END - PL_exit_flags |= PERL_EXIT_DESTRUCT_END; + PL_exit_flags |= PERL_EXIT_DESTRUCT_END; #else - PL_exit_flags |= PERL_EXIT_EXPECTED; + PL_exit_flags |= PERL_EXIT_EXPECTED; #endif + return 0; - } else { - ret = -1; - } - - return ret; +error: + if(_ap_reset_cycles!=NULL) + shm_free(_ap_reset_cycles); + _ap_reset_cycles = NULL; + return -1; } /* @@ -372,3 +400,40 @@ static void destroy(void) PERL_SYS_TERM(); my_perl = NULL; } + + +/** + * count executions and rest interpreter + * + */ +int app_perl_reset_interpreter(void) +{ + struct timeval t1; + struct timeval t2; + + if(*_ap_reset_cycles==0) + return 0; + + _ap_exec_cycles++; + LM_DBG("perl interpreter exec cycle [%d/%d]\n", + _ap_exec_cycles, *_ap_reset_cycles); + + if(_ap_exec_cycles<=*_ap_reset_cycles) + return 0; + + gettimeofday(&t1, NULL); + if (perl_reload()<0) { + LM_ERR("perl interpreter cannot be reset [%d/%d]\n", + _ap_exec_cycles, *_ap_reset_cycles); + return -1; + } + gettimeofday(&t2, NULL); + + LM_INFO("perl interpreter has been reset [%d/%d] (%d.%06d => %d.%06d)\n", + _ap_exec_cycles, *_ap_reset_cycles, + (int)t1.tv_sec, (int)t1.tv_usec, + (int)t2.tv_sec, (int)t2.tv_usec); + _ap_exec_cycles = 0; + + return 0; +} diff --git a/modules/app_perl/perlfunc.c b/modules/app_perl/perlfunc.c index 06d3314..e67c81f 100644 --- a/modules/app_perl/perlfunc.c +++ b/modules/app_perl/perlfunc.c @@ -58,6 +58,7 @@ int perl_checkfnc(char *fnc) { int perl_exec_simple(char* fnc, char* args[], int flags) { + app_perl_reset_interpreter(); if (perl_checkfnc(fnc)) { LM_DBG("running perl function \"%s\"", fnc); @@ -94,6 +95,8 @@ int perl_exec2(struct sip_msg* _msg, char* fnc, char* mystr) { SV *m; str reason; + app_perl_reset_interpreter(); + dSP; if (!perl_checkfnc(fnc)) { diff --git a/modules/app_perl/perlfunc.h b/modules/app_perl/perlfunc.h index 2d380b9..9f40ce8 100644 --- a/modules/app_perl/perlfunc.h +++ b/modules/app_perl/perlfunc.h @@ -42,4 +42,6 @@ int perl_exec_simple2(struct sip_msg* _msg, char* fnc, char* str2); int perl_exec1(struct sip_msg* _msg, char* fnc, char *foobar); int perl_exec2(struct sip_msg* _msg, char* fnc, char* mystr); +int app_perl_reset_interpreter(void); + #endif /* PERL_FUNC_H */

11 years

git:master: app_perl: added rpc commands to set/ get the value for reset_cycles

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: de2c39a1857d74443c6b1fa4f06cbb18d3dd8026 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de2c39a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 15 09:52:29 2013 +0100 app_perl: added rpc commands to set/get the value for reset_cycles --- modules/app_perl/app_perl_mod.c | 102 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 101 insertions(+), 1 deletions(-) diff --git a/modules/app_perl/app_perl_mod.c b/modules/app_perl/app_perl_mod.c index c35ece4..3948bbe 100644 --- a/modules/app_perl/app_perl_mod.c +++ b/modules/app_perl/app_perl_mod.c @@ -40,6 +40,9 @@ #include "../../modules/rr/api.h" #include "../../modules/sl/sl.h" +#include "../../rpc.h" +#include "../../rpc_lookup.h" + /* lock_ops.h defines union semun, perl does not need to redefine it */ #ifdef USE_SYSV_SEM # define HAS_UNION_SEMUN @@ -74,6 +77,8 @@ PerlInterpreter *my_perl = NULL; /** SL API structure */ sl_api_t slb; +static int ap_init_rpc(void); + /* * Module destroy function prototype */ @@ -329,7 +334,6 @@ struct mi_root* perl_mi_reload(struct mi_root *cmd_tree, void *param) */ static int mod_init(void) { - int ret = 0; int argc = 1; char *argt[] = { MOD_NAME, NULL }; char **argv; @@ -342,6 +346,12 @@ static int mod_init(void) { return -1; } + if(ap_init_rpc()<0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + if (!filename) { LM_ERR("insufficient module parameters. Module not loaded.\n"); return -1; @@ -394,6 +404,10 @@ error: */ static void destroy(void) { + if(_ap_reset_cycles!=NULL) + shm_free(_ap_reset_cycles); + _ap_reset_cycles = NULL; + if(my_perl==NULL) return; unload_perl(my_perl); @@ -437,3 +451,89 @@ int app_perl_reset_interpreter(void) return 0; } + +/*** RPC implementation ***/ + +static const char* app_perl_rpc_set_reset_cycles_doc[3] = { + "Set the value for reset_cycles", + "Has one parmeter with int value", + 0 +}; + + +/* + * RPC command to set the value for reset_cycles + */ +static void app_perl_rpc_set_reset_cycles(rpc_t* rpc, void* ctx) +{ + int rsv; + + if(rpc->scan(ctx, "d", &rsv)<1) + { + rpc->fault(ctx, 500, "Invalid Parameters"); + return; + } + if(rsv<=0) + rsv = 0; + + LM_DBG("new reset cycle value is %d\n", rsv); + + *_ap_reset_cycles = rsv; + + return; +} + +static const char* app_perl_rpc_get_reset_cycles_doc[2] = { + "Get the value for reset_cycles", + 0 +}; + + +/* + * RPC command to set the value for reset_cycles + */ +static void app_perl_rpc_get_reset_cycles(rpc_t* rpc, void* ctx) +{ + int rsv; + void* th; + + rsv = *_ap_reset_cycles; + + /* add entry node */ + if (rpc->add(ctx, "{", &th) < 0) + { + rpc->fault(ctx, 500, "Internal error root reply"); + return; + } + + if(rpc->struct_add(th, "d", "reset_cycles", rsv)<0) + { + rpc->fault(ctx, 500, "Internal error adding reset cycles"); + return; + } + LM_DBG("reset cycle value is %d\n", rsv); + + return; +} + + +rpc_export_t app_perl_rpc_cmds[] = { + {"app_perl.set_reset_cycles", app_perl_rpc_set_reset_cycles, + app_perl_rpc_set_reset_cycles_doc, 0}, + {"app_perl.get_reset_cycles", app_perl_rpc_get_reset_cycles, + app_perl_rpc_get_reset_cycles_doc, 0}, + {0, 0, 0, 0} +}; + +/** + * register RPC commands + */ +static int ap_init_rpc(void) +{ + if (rpc_register_array(app_perl_rpc_cmds)!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + return 0; +}

11 years

git:master: app_perl: declare extern environ variable

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 34ad8c295b45bc52cc5a071bf2b5651865389f94 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=34ad8c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 14 23:00:32 2013 +0100 app_perl: declare extern environ variable - without it doesn't compile on darwin and it is recommended way to do - provide some fake argc and argv to PERL_SYS_INIT3() to avoid compile warnings --- modules/app_perl/app_perl_mod.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules/app_perl/app_perl_mod.c b/modules/app_perl/app_perl_mod.c index eb303ca..a27e503 100644 --- a/modules/app_perl/app_perl_mod.c +++ b/modules/app_perl/app_perl_mod.c @@ -72,6 +72,8 @@ sl_api_t slb; */ static void destroy(void); +/* environment pointer needed to init perl interpreter */ +extern char **environ; /* * Module initialization function prototype @@ -319,6 +321,9 @@ struct mi_root* perl_mi_reload(struct mi_root *cmd_tree, void *param) static int mod_init(void) { int ret = 0; + int argc = 1; + char *argt[] = { MOD_NAME, NULL }; + char **argv; if(register_mi_mod(exports.name, mi_cmds)!=0) { @@ -337,7 +342,8 @@ static int mod_init(void) { return -1; } - PERL_SYS_INIT3(NULL, NULL, &environ); + argv = argt; + PERL_SYS_INIT3(&argc, &argv, &environ); if ((my_perl = parser_init())) { ret = 0;

11 years

[tracker] Comment added: iptrtpproxy compilation error

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#370 - iptrtpproxy compilation error User who did this - Klaus Darilion (klaus3000) ---------- I have no idea about the error, but iptrtpproxy is more or less obsolete. As a workaround you can remove the whole module if you do not need it. If you want to try this module, better take a look at rtpproxy-ng module in combination with https://github.com/sipwise/mediaproxy-ng. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=370#comment1164 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years

GIT Branch 4.1 has been created for release series 4.1.x

by Daniel-Constantin Mierla

Hello, the stable branch from where we are going to package the release series 4.1.x has been created - its name: 4.1 There is now a 'kamailio' alias for the repository name, therefore it can be used instead of 'sip-router' in the git path. Getting the git branch 4.1 with read only access: git clone --depth 1 --no-single-branch git://git.sip-router.org/kamailio kamailio cd kamailio git checkout -b 4.1 origin/4.1 For developers that have write access: git clone --depth 1 --no-single-branch ssh://_USERID_@git.sip-router.org/kamailio kamailio cd kamailio git checkout -b 4.1 origin/4.1 Note that older versions of git application may not have the option --no-single-branch. Just remove it when is the case. I created also the wiki tutorial about installing kamailio 4.1.x from git, it is available at: - http://www.kamailio.org/wiki/install/4.1.x/git After few more days of testing, we can loot at nailing down the release date for v4.1.0. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Trainings - Berlin, Nov 25-28 - more details about Kamailio trainings at http://www.asipto.com -

11 years

Development for v4.2.0 is open

by Daniel-Constantin Mierla

Hello, a dedicated branch 4.1 has been created for upcoming major release. From now on, the master can take again code with new features to be part of future release series 4.2.x. Any new bug fix that is applicable to stable branches has to be committed first in master and then backported. I will follow with another email describing how to use branch 4.1 for those that want to switch testing from master to it. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Trainings - Berlin, Nov 25-28 - more details about Kamailio trainings at http://www.asipto.com -

11 years

git:master: Makefile.defs: version set to 4.2.0-dev0

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e45444bebacd7494ad32854e7031a9efb012edd2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e45444b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 14 16:15:15 2013 +0100 Makefile.defs: version set to 4.2.0-dev0 - start of development cycle for v4.2.x release series --- Makefile.defs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 749b756..d0ce0c8 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -163,9 +163,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 4 -PATCHLEVEL = 1 +PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -pre2 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

11 years

git:4.1: Makefile.defs: version set to 4.1.0-rc1

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 82d4a39a4f7cd81afbcaed8de8bec0e3a7747e53 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82d4a39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 14 16:12:27 2013 +0100 Makefile.defs: version set to 4.1.0-rc1 - dedicated brach 4.1 has been created for release series 4.1.x --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 749b756..ed89257 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -165,7 +165,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -pre2 +EXTRAVERSION = -rc1 # memory manager switcher # 0 - f_malloc (fast malloc)

11 years

← Newer
1
...
8
9
10
11
12
13
14
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2013