sr-dev January 2010

sr-dev@lists.kamailio.org

28 participants
289 discussions

git:kamailio_3.0: core: init the len of sock_str attribute

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: f0d89fb89d1b588f253f048ab8fc22e0db7fff66 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f0d89fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 10 19:02:42 2010 +0100 core: init the len of sock_str attribute --- socket_info.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/socket_info.c b/socket_info.c index 3fa648b..6627d70 100644 --- a/socket_info.c +++ b/socket_info.c @@ -363,6 +363,7 @@ static int fix_sock_str(struct socket_info* si) return -1; } si->sock_str.s[len] = '\0'; + si->sock_str.len = len; return 0; }

14 years, 5 months

git:kamailio_3.0: ctl: added parameters to control buffer size

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: acfc2142ed5ef3e61138792136eb32616502229d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=acfc214… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 10 16:56:54 2010 +0100 ctl: added parameters to control buffer size - new parameters to control binrpc buffers size: - binrpc_max_body_size - binrpc_struct_max_body_size --- modules/ctl/README | 28 +++++++++++++++++++++++++--- modules/ctl/binrpc_run.c | 7 ++++--- modules/ctl/ctl.c | 13 ++++++++++++- modules/ctl/doc/params.xml | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 7 deletions(-) diff --git a/modules/ctl/README b/modules/ctl/README index 12850b3..7b5c876 100644 --- a/modules/ctl/README +++ b/modules/ctl/README @@ -19,6 +19,8 @@ Andrei Pelinescu-Onciul 1.3.4. group (integer or string) 1.3.5. fifo (integer) 1.3.6. autoconversion (integer) + 1.3.7. binrpc_max_body_size (integer) + 1.3.8. binrpc_struct_max_body_size (integer) 1.4. RPC Functions @@ -180,6 +182,26 @@ modparam("ctl", "fifo", "tcp:*:2050") # fifo over tcp Example 7. Set the autoconversion parameter modparam("ctl", "autoconversion", 1) +1.3.7. binrpc_max_body_size (integer) + + Set the size of binrpc buffer for RPC reply. Value represents + kilobytes. + + Default: 4 (meaning 4KB); + + Example 8. Set the binrpc_max_body_size parameter +modparam("ctl", "binrpc_max_body_size", 10) + +1.3.8. binrpc_struct_max_body_size (integer) + + Set the size of binrpc structure buffer for RPC reply. Value represents + kilobytes. + + Default: 1 (meaning 1KB); + + Example 9. Set the binrpc_struct_max_body_size parameter +modparam("ctl", "binrpc_struct_max_body_size", 3) + 1.4. RPC Functions Revision History @@ -189,7 +211,7 @@ modparam("ctl", "autoconversion", 1) List all the sockets on which the ctl module listens. - Example 8. print usage + Example 10. print usage $ sercmd -f"[%v] %v:%v %v\n" ctl.listen [binrpc] unix_stream:/tmp/ser_ctl @@ -199,7 +221,7 @@ modparam("ctl", "autoconversion", 1) Returns the number of open binrpc connections (to the ctl module). - Example 9. ctl.connections usage + Example 11. ctl.connections usage $ sercmd ctl.connections 1 @@ -207,7 +229,7 @@ modparam("ctl", "autoconversion", 1) List open binrpc connections (to the ctl module). - Example 10. ctl.who usage + Example 12. ctl.who usage $ sercmd -f"[%v] %v: %v %v -> %v %v\n" ctl.who [binrpc] unix_stream: <anonymous unix socket> -> /tmp/ser_ctl diff --git a/modules/ctl/binrpc_run.c b/modules/ctl/binrpc_run.c index 8ad914f..989f889 100644 --- a/modules/ctl/binrpc_run.c +++ b/modules/ctl/binrpc_run.c @@ -46,9 +46,10 @@ rpc->scan (default: not set) */ int autoconvert=0; - -#define BINRPC_MAX_BODY 4096 /* maximum body for send */ -#define STRUCT_MAX_BODY 1024 +int binrpc_max_body_size = 4; /* multiplied by 1024 in mod init */ +int binrpc_struct_max_body_size = 1; /* multiplied by 1024 in mod init */ +#define BINRPC_MAX_BODY binrpc_max_body_size /* maximum body for send */ +#define STRUCT_MAX_BODY binrpc_struct_max_body_size #define MAX_MSG_CHUNKS 96 #define BINRPC_GC_IBSIZE 4 /* initial gc block size (pointers no.) */ diff --git a/modules/ctl/ctl.c b/modules/ctl/ctl.c index 8e50e51..bd675f8 100644 --- a/modules/ctl/ctl.c +++ b/modules/ctl/ctl.c @@ -70,6 +70,8 @@ static int usock_gid=-1; /* if set try to automatically convert values to the requested type in rpc->scan (default: not set) */ extern int autoconvert; +extern int binrpc_max_body_size; +extern int binrpc_struct_max_body_size; static int add_binrpc_socket(modparam_t type, void * val); #ifdef USE_FIFO @@ -104,6 +106,8 @@ static param_export_t params[]={ {"user", PARAM_STRING|PARAM_USE_FUNC, fix_user }, {"group", PARAM_STRING|PARAM_USE_FUNC, fix_group }, {"autoconversion", PARAM_INT, &autoconvert }, + {"binrpc_max_body_size", PARAM_INT, &binrpc_max_body_size }, + {"binrpc_struct_max_body_size", PARAM_INT, &binrpc_struct_max_body_size }, {0,0,0} }; /* no params */ @@ -224,7 +228,14 @@ error: static int mod_init(void) { struct id_list* l; - + + if(binrpc_max_body_size<=0) + binrpc_max_body_size = 4; + if(binrpc_struct_max_body_size<=0) + binrpc_struct_max_body_size = 1; + binrpc_max_body_size *= 1024; + binrpc_struct_max_body_size *= 1024; + if (listen_lst==0) { add_binrpc_socket(PARAM_STRING, DEFAULT_CTL_SOCKET); } diff --git a/modules/ctl/doc/params.xml b/modules/ctl/doc/params.xml index c2b06c2..a61e013 100644 --- a/modules/ctl/doc/params.xml +++ b/modules/ctl/doc/params.xml @@ -192,4 +192,40 @@ modparam("ctl", "autoconversion", 1) </example> </section> + <section id="binrpc_max_body_size"> + <title><varname>binrpc_max_body_size</varname> (integer)</title> + <para> + Set the size of binrpc buffer for RPC reply. Value represents + kilobytes. + </para> + <para> + Default: 4 (meaning 4KB); + </para> + <example> + <title>Set the <varname>binrpc_max_body_size</varname> parameter + </title> + <programlisting> +modparam("ctl", "binrpc_max_body_size", 10) + </programlisting> + </example> + </section> + + <section id="binrpc_struct_max_body_size"> + <title><varname>binrpc_struct_max_body_size</varname> (integer)</title> + <para> + Set the size of binrpc structure buffer for RPC reply. Value represents + kilobytes. + </para> + <para> + Default: 1 (meaning 1KB); + </para> + <example> + <title>Set the <varname>binrpc_struct_max_body_size</varname> parameter + </title> + <programlisting> +modparam("ctl", "binrpc_struct_max_body_size", 3) + </programlisting> + </example> + </section> + </section>

14 years, 5 months

git:kamailio_3.0: htable(k): rpc commad to dump htable

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 5997048fdbefee51aebb8c996178ceb44120a482 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5997048… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 10 15:56:10 2010 +0100 htable(k): rpc commad to dump htable - htable can get big, rpc behaves better than MI --- modules_k/htable/htable.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index 2d49864..d2d1b5f 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -33,6 +33,8 @@ #include "../../route.h" #include "../../dprint.h" #include "../../ut.h" +#include "../../rpc.h" +#include "../../rpc_lookup.h" #include "../../lib/kmi/mi.h" #include "../../lib/kcore/faked_msg.h" @@ -46,6 +48,8 @@ MODULE_VERSION int ht_timer_interval = 20; +static int htable_init_rpc(void); + /** module functions */ static int ht_print(struct sip_msg*, char*, char*); static int mod_init(void); @@ -134,6 +138,11 @@ static int mod_init(void) LM_ERR("failed to register MI commands\n"); return -1; } + if(htable_init_rpc()!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } if(ht_shm_init()!=0) return -1; @@ -444,3 +453,95 @@ error: return 0; } +static const char* htable_dump_doc[2] = { + "Dump the contents of hash table.", + 0 +}; + +static void htable_rpc_dump(rpc_t* rpc, void* c) +{ + str htname; + ht_t *ht; + ht_cell_t *it; + int i; + void* th; + void* ih; + void* vh; + + if (rpc->scan(c, "S", &htname) < 1) + { + rpc->fault(c, 500, "No htable name given"); + return; + } + ht = ht_get_table(&htname); + if(ht==NULL) + { + rpc->fault(c, 500, "No such htable"); + return; + } + for(i=0; i<ht->htsize; i++) + { + lock_get(&ht->entries[i].lock); + it = ht->entries[i].first; + if(it) + { + /* add entry node */ + if (rpc->add(c, "{", &th) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return; + } + if(rpc->struct_add(th, "dd{", + "entry", i, + "size", (int)ht->entries[i].esize, + "slot", &ih)<0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return; + } + while(it) + { + if(rpc->struct_add(ih, "{", + "item", &vh)<0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return; + } + if(it->flags&AVP_VAL_STR) { + if(rpc->struct_add(vh, "SS", + "name", &it->name.s, + "value", &it->value.s)<0) + { + rpc->fault(c, 500, "Internal error adding item"); + return; + } + } else { + if(rpc->struct_add(vh, "Sd", + "name", &it->name.s, + "value", (int)it->value.n)) + { + rpc->fault(c, 500, "Internal error adding item"); + return; + } + } + it = it->next; + } + } + lock_release(&ht->entries[i].lock); + } +} + +rpc_export_t htable_rpc[] = { + {"htable.dump", htable_rpc_dump, htable_dump_doc, 0}, + {0, 0, 0, 0} +}; + +static int htable_init_rpc(void) +{ + if (rpc_register_array(htable_rpc)!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + return 0; +}

14 years, 5 months

[tracker] Task changed: check symbol conflicts

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#12 - check symbol conflicts User who did this: Daniel-Constantin Mierla (miconda) Severity: High -> Medium More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=12 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.

14 years, 5 months

[tracker] Comment added: $shv problems

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#22 - $shv problems User who did this - Daniel-Constantin Mierla (miconda) ---------- Should be fixed now.Let me know if works. Thanks to Andrei for addition of early shm initialisation. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=22#comment25 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.

14 years, 5 months

git:kamailio_3.0: pv(k): fixed $shv engine

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: b69e1c96bf65a4c4f8fa6bec28699607ea03e24d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b69e1c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 10 14:25:54 2010 +0100 pv(k): fixed $shv engine - shv relies on early shm initialization - got rid of hacks to define first in pkg and move in shm at mod_init - fixes 3.0 specific issues reported by Andrey 'Krieger' Utkin - closes FS#22 --- modules_k/pv/pv.c | 5 - modules_k/pv/pv_shv.c | 201 ++++++++++-------------------------------------- modules_k/pv/pv_shv.h | 1 - 3 files changed, 42 insertions(+), 165 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 700267e..53cf407 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -433,11 +433,6 @@ static int mod_init(void) return -1; } - if(init_shvars()<0) - { - LM_ERR("init shvars failed\n"); - return -1; - } return 0; } diff --git a/modules_k/pv/pv_shv.c b/modules_k/pv/pv_shv.c index b32874f..548ab04 100644 --- a/modules_k/pv/pv_shv.c +++ b/modules_k/pv/pv_shv.c @@ -28,6 +28,8 @@ #include "../../dprint.h" #include "../../mem/mem.h" +#include "../../mem/shm_mem.h" +#include "../../shm_init.h" #include "../../ut.h" #include "../../pvar.h" @@ -38,9 +40,6 @@ gen_lock_set_t* shvar_locks=0; static sh_var_t *sh_vars = 0; static str shv_cpy = {0, 0}; -static script_var_t *sh_local_vars = 0; -static pv_spec_list_t *sh_pv_list = 0; -static int shvar_initialized = 0; /* * Initialize locks @@ -48,6 +47,11 @@ static int shvar_initialized = 0; int shvar_init_locks(void) { int i; + + /* already initialized */ + if(shvar_locks!=0) + return 0; + i = shvar_locks_no; do { if ((( shvar_locks=lock_set_alloc(i))!=0)&& @@ -146,6 +150,18 @@ sh_var_t* add_shvar(str *name) if(name==0 || name->s==0 || name->len<=0) return 0; + if(!shm_initialized()) + { + LM_ERR("shm not intialized - cannot define shm now\n"); + return 0; + } + + if(shvar_init_locks()!=0) + { + LM_ERR("cannot init shv locks\n"); + return 0; + } + for(sit=sh_vars; sit; sit=sit->next) { if(sit->name.len==name->len @@ -189,131 +205,6 @@ sh_var_t* add_shvar(str *name) return sit; } -script_var_t* add_local_shvar(str *name) -{ - script_var_t *it; - - if(name==0 || name->s==0 || name->len<=0) - return 0; - - for(it=sh_local_vars; it; it=it->next) - { - if(it->name.len==name->len - && strncmp(name->s, it->name.s, name->len)==0) - return it; - } - it = (script_var_t*)pkg_malloc(sizeof(script_var_t)); - if(it==0) - { - LM_ERR("out of pkg mem\n"); - return 0; - } - memset(it, 0, sizeof(script_var_t)); - it->name.s = (char*)pkg_malloc((name->len+1)*sizeof(char)); - - if(it->name.s==0) - { - LM_ERR("out of pkg mem!\n"); - return 0; - } - it->name.len = name->len; - strncpy(it->name.s, name->s, name->len); - it->name.s[it->name.len] = '\0'; - - it->next = sh_local_vars; - - sh_local_vars = it; - - return it; -} - - -int init_shvars(void) -{ - script_var_t *lit = 0; - sh_var_t *sit = 0; - pv_spec_list_t *pvi = 0; - pv_spec_list_t *pvi0 = 0; - - if(shvar_init_locks()!=0) - return -1; - - LM_DBG("moving shvars in share memory\n"); - for(lit=sh_local_vars; lit; lit=lit->next) - { - sit = (sh_var_t*)shm_malloc(sizeof(sh_var_t)); - if(sit==0) - { - LM_ERR("out of sh mem\n"); - return -1; - } - memset(sit, 0, sizeof(sh_var_t)); - sit->name.s = (char*)shm_malloc((lit->name.len+1)*sizeof(char)); - - if(sit->name.s==0) - { - LM_ERR("out of pkg mem!\n"); - shm_free(sit); - return -1; - } - sit->name.len = lit->name.len; - strncpy(sit->name.s, lit->name.s, lit->name.len); - sit->name.s[sit->name.len] = '\0'; - - if(sh_vars!=0) - sit->n = sh_vars->n + 1; - else - sit->n = 1; - -#ifdef GEN_LOCK_T_PREFERED - sit->lock = &shvar_locks->locks[sit->n%shvar_locks_no]; -#else - sit->lockidx = sit->n%shvar_locks_no; -#endif - - if(set_shvar_value(sit, &lit->v.value, lit->v.flags)==NULL) - { - shm_free(sit->name.s); - shm_free(sit); - return -1; - } - - pvi0 = 0; - pvi = sh_pv_list; - while(pvi!=NULL) - { - if(pvi->spec->pvp.pvn.u.dname == lit) - { - pvi->spec->pvp.pvn.u.dname = (void*)sit; - if(pvi0!=NULL) - { - pvi0->next = pvi->next; - pkg_free(pvi); - pvi = pvi0->next; - } else { - sh_pv_list = pvi->next; - pkg_free(pvi); - pvi = sh_pv_list; - } - } else { - pvi0 = pvi; - pvi = pvi->next; - } - } - - sit->next = sh_vars; - sh_vars = sit; - } - destroy_vars_list(sh_local_vars); - if(sh_pv_list != NULL) - { - LM_ERR("sh_pv_list not null!\n"); - return -1; - } - shvar_initialized = 1; - return 0; -} - /* call it with lock set */ sh_var_t* set_shvar_value(sh_var_t* shv, int_str *value, int flags) { @@ -432,36 +323,18 @@ void destroy_shvars(void) /********* PV functions *********/ int pv_parse_shvar_name(pv_spec_p sp, str *in) { - pv_spec_list_t *pvi = 0; - if(in==NULL || in->s==NULL || sp==NULL) return -1; sp->pvp.pvn.type = PV_NAME_PVAR; - if(shvar_initialized) - sp->pvp.pvn.u.dname = (void*)add_shvar(in); - else - sp->pvp.pvn.u.dname = (void*)add_local_shvar(in); + sp->pvp.pvn.u.dname = (void*)add_shvar(in); + if(sp->pvp.pvn.u.dname==NULL) { - LM_ERR("cannot register shvar [%.*s] (%d)\n", in->len, in->s, - shvar_initialized); + LM_ERR("cannot register shvar [%.*s]\n", in->len, in->s); return -1; } - if(shvar_initialized==0) - { - pvi = (pv_spec_list_t*)pkg_malloc(sizeof(pv_spec_list_t)); - if(pvi == NULL) - { - LM_ERR("cannot index shvar [%.*s]\n", in->len, in->s); - return -1; - } - pvi->spec = sp; - pvi->next = sh_pv_list; - sh_pv_list = pvi; - } - return 0; } @@ -749,10 +622,14 @@ int param_set_xvar( modparam_t type, void* val, int mode) int_str isv; int flags; int ival; - script_var_t *sv; + script_var_t *pkv; + sh_var_t *shv; - if(shvar_initialized!=0) + if(!shm_initialized()!=0) + { + LM_ERR("shm not initialized - cannot set value for PVs\n"); goto error; + } s.s = (char*)val; if(s.s == NULL || s.s[0] == '\0') @@ -785,14 +662,19 @@ int param_set_xvar( modparam_t type, void* val, int mode) goto error; isv.n = ival; } - if(mode==0) - sv = add_var(&s); - else - sv = add_local_shvar(&s); - if(sv==NULL) - goto error; - if(set_var_value(sv, &isv, flags)==NULL) - goto error; + if(mode==0) { + pkv = add_var(&s); + if(pkv==NULL) + goto error; + if(set_var_value(pkv, &isv, flags)==NULL) + goto error; + } else { + shv = add_shvar(&s); + if(shv==NULL) + goto error; + if(set_shvar_value(shv, &isv, flags)==NULL) + goto error; + } return 0; error: @@ -810,3 +692,4 @@ int param_set_shvar( modparam_t type, void* val) return param_set_xvar(type, val, 1); } +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/modules_k/pv/pv_shv.h b/modules_k/pv/pv_shv.h index 789cd36..d47b0ac 100644 --- a/modules_k/pv/pv_shv.h +++ b/modules_k/pv/pv_shv.h @@ -41,7 +41,6 @@ typedef struct sh_var { struct sh_var *next; } sh_var_t, *sh_var_p; -int init_shvars(void); sh_var_t* set_shvar_value(sh_var_t *shv, int_str *value, int flags); sh_var_t* get_shvar_by_name(str *name);

14 years, 5 months

git:kamailio_3.0: core: early shm init while parsing the cfg

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 155cb4ad4642f894472e873e4a1df1872cc30474 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=155cb4a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 10 12:54:05 2010 +0100 core: early shm init while parsing the cfg - shm memory is now initialized before the first modparam or the first route block. This allows using shm memory early, in modparam fixups or route block parsing functions. user and shm_force_alloc must be used _before_ any modparam or route block (using them after a modparam or a route block will now generate an error). - the user in the cfg is ignored if already set from the command line (cherry picked from commit 6f72234400e119e981d5aa42e20c4432bb562524) --- cfg.y | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 115 insertions(+), 13 deletions(-) diff --git a/cfg.y b/cfg.y index 0062b0e..bbd5ad3 100644 --- a/cfg.y +++ b/cfg.y @@ -96,6 +96,7 @@ * 2009-01-26 case/switch() support (andrei) * 2009-03-10 added SET_USERPHONE action (Miklos) * 2009-05-04 switched if to rval_expr (andrei) + * 2010-01-10 init shm on first mod_param or route block (andrei) */ %{ @@ -111,6 +112,9 @@ #include <errno.h> #include "route_struct.h" #include "globals.h" +#ifdef SHM_MEM +#include "shm_init.h" +#endif /* SHM_MEM */ #include "route.h" #include "switch.h" #include "dprint.h" @@ -867,8 +871,20 @@ assign_stm: | MEMSUM EQUAL error { yyerror("int value expected"); } | SIP_WARNING EQUAL NUMBER { sip_warning=$3; } | SIP_WARNING EQUAL error { yyerror("boolean value expected"); } - | USER EQUAL STRING { user=$3; } - | USER EQUAL ID { user=$3; } + | USER EQUAL STRING { + if (shm_initialized()) + yyerror("user must be before any modparam or the" + " route blocks"); + else if (user==0) + user=$3; + } + | USER EQUAL ID { + if (shm_initialized()) + yyerror("user must be before any modparam or the" + " route blocks"); + else if (user==0) + user=$3; + } | USER EQUAL error { yyerror("string value expected"); } | GROUP EQUAL STRING { group=$3; } | GROUP EQUAL ID { group=$3; } @@ -1447,7 +1463,13 @@ assign_stm: | DISABLE_CORE EQUAL error { yyerror("boolean value expected"); } | OPEN_FD_LIMIT EQUAL NUMBER { open_files_limit=$3; } | OPEN_FD_LIMIT EQUAL error { yyerror("number expected"); } - | SHM_FORCE_ALLOC EQUAL NUMBER { shm_force_alloc=$3; } + | SHM_FORCE_ALLOC EQUAL NUMBER { + if (shm_initialized()) + yyerror("shm_force_alloc must be before any modparam or the" + " route blocks"); + else + shm_force_alloc=$3; + } | SHM_FORCE_ALLOC EQUAL error { yyerror("boolean value expected"); } | MLOCK_PAGES EQUAL NUMBER { mlock_pages=$3; } | MLOCK_PAGES EQUAL error { yyerror("boolean value expected"); } @@ -1560,11 +1582,23 @@ module_stm: } | LOADPATH EQUAL error { yyerror("string expected"); } | MODPARAM LPAREN STRING COMMA STRING COMMA STRING RPAREN { + #ifdef SHM_MEM + if (!shm_initialized() && init_shm()<0) { + yyerror("Can't initialize shared memory"); + YYABORT; + } + #endif /* SHM_MEM */ if (set_mod_param_regex($3, $5, PARAM_STRING, $7) != 0) { yyerror("Can't set module parameter"); } } - | MODPARAM LPAREN STRING COMMA STRING COMMA NUMBER RPAREN { + | MODPARAM LPAREN STRING COMMA STRING COMMA NUMBER RPAREN { + #ifdef SHM_MEM + if (!shm_initialized() && init_shm()<0) { + yyerror("Can't initialize shared memory"); + YYABORT; + } + #endif /* SHM_MEM */ if (set_mod_param_regex($3, $5, PARAM_INT, (void*)$7) != 0) { yyerror("Can't set module parameter"); } @@ -1645,8 +1679,22 @@ route_name: NUMBER { ; route_stm: - ROUTE LBRACE actions RBRACE { push($3, &main_rt.rlist[DEFAULT_RT]); } + ROUTE LBRACE actions RBRACE { + #ifdef SHM_MEM + if (!shm_initialized() && init_shm()<0) { + yyerror("Can't initialize shared memory"); + YYABORT; + } + #endif /* SHM_MEM */ + push($3, &main_rt.rlist[DEFAULT_RT]); + } | ROUTE LBRACK route_name RBRACK LBRACE actions RBRACE { + #ifdef SHM_MEM + if (!shm_initialized() && init_shm()<0) { + yyerror("Can't initialize shared memory"); + YYABORT; + } + #endif /* SHM_MEM */ i_tmp=route_get(&main_rt, $3); if (i_tmp==-1){ yyerror("internal error"); @@ -1662,9 +1710,21 @@ route_stm: ; failure_route_stm: ROUTE_FAILURE LBRACE actions RBRACE { - push($3, &failure_rt.rlist[DEFAULT_RT]); - } + #ifdef SHM_MEM + if (!shm_initialized() && init_shm()<0) { + yyerror("Can't initialize shared memory"); + YYABORT; + } + #endif /* SHM_MEM */ + push($3, &failure_rt.rlist[DEFAULT_RT]); + } | ROUTE_FAILURE LBRACK route_name RBRACK LBRACE actions RBRACE { + #ifdef SHM_MEM + if (!shm_initialized() && init_shm()<0) { + yyerror("Can't initialize shared memory"); + YYABORT; + } + #endif /* SHM_MEM */ i_tmp=route_get(&failure_rt, $3); if (i_tmp==-1){ yyerror("internal error"); @@ -1680,9 +1740,21 @@ failure_route_stm: ; onreply_route_stm: ROUTE_ONREPLY LBRACE actions RBRACE { - push($3, &onreply_rt.rlist[DEFAULT_RT]); - } + #ifdef SHM_MEM + if (!shm_initialized() && init_shm()<0) { + yyerror("Can't initialize shared memory"); + YYABORT; + } + #endif /* SHM_MEM */ + push($3, &onreply_rt.rlist[DEFAULT_RT]); + } | ROUTE_ONREPLY LBRACK route_name RBRACK LBRACE actions RBRACE { + #ifdef SHM_MEM + if (!shm_initialized() && init_shm()<0) { + yyerror("Can't initialize shared memory"); + YYABORT; + } + #endif /* SHM_MEM */ i_tmp=route_get(&onreply_rt, $3); if (i_tmp==-1){ yyerror("internal error"); @@ -1698,9 +1770,21 @@ onreply_route_stm: ; branch_route_stm: ROUTE_BRANCH LBRACE actions RBRACE { - push($3, &branch_rt.rlist[DEFAULT_RT]); - } + #ifdef SHM_MEM + if (!shm_initialized() && init_shm()<0) { + yyerror("Can't initialize shared memory"); + YYABORT; + } + #endif /* SHM_MEM */ + push($3, &branch_rt.rlist[DEFAULT_RT]); + } | ROUTE_BRANCH LBRACK route_name RBRACK LBRACE actions RBRACE { + #ifdef SHM_MEM + if (!shm_initialized() && init_shm()<0) { + yyerror("Can't initialize shared memory"); + YYABORT; + } + #endif /* SHM_MEM */ i_tmp=route_get(&branch_rt, $3); if (i_tmp==-1){ yyerror("internal error"); @@ -1715,9 +1799,21 @@ branch_route_stm: | ROUTE_BRANCH error { yyerror("invalid branch_route statement"); } ; send_route_stm: ROUTE_SEND LBRACE actions RBRACE { - push($3, &onsend_rt.rlist[DEFAULT_RT]); - } + #ifdef SHM_MEM + if (!shm_initialized() && init_shm()<0) { + yyerror("Can't initialize shared memory"); + YYABORT; + } + #endif /* SHM_MEM */ + push($3, &onsend_rt.rlist[DEFAULT_RT]); + } | ROUTE_SEND LBRACK route_name RBRACK LBRACE actions RBRACE { + #ifdef SHM_MEM + if (!shm_initialized() && init_shm()<0) { + yyerror("Can't initialize shared memory"); + YYABORT; + } + #endif /* SHM_MEM */ i_tmp=route_get(&onsend_rt, $3); if (i_tmp==-1){ yyerror("internal error"); @@ -1732,6 +1828,12 @@ send_route_stm: ROUTE_SEND LBRACE actions RBRACE { | ROUTE_SEND error { yyerror("invalid onsend_route statement"); } ; event_route_stm: ROUTE_EVENT LBRACK EVENT_RT_NAME RBRACK LBRACE actions RBRACE { + #ifdef SHM_MEM + if (!shm_initialized() && init_shm()<0) { + yyerror("Can't initialize shared memory"); + YYABORT; + } + #endif /* SHM_MEM */ i_tmp=route_get(&event_rt, $3); if (i_tmp==-1){ yyerror("internal error");

14 years, 5 months

git:kamailio_3.0: NEWS: notes about the shm related changes

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 836406e324036760573dd5a79a0934fabd397f50 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=836406e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 10 13:15:57 2010 +0100 NEWS: notes about the shm related changes (cherry picked from commit 3d3d38e63a55e549e1707fce0fa1c2c189906338) --- NEWS | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 3cd2de4..225eedc 100644 --- a/NEWS +++ b/NEWS @@ -64,6 +64,8 @@ config script changes: - while() - include file support: include_file "somefile" - event route support: event_route[module_name:eventid] + - user and shm_force_alloc must now appear prior to any modparam() or route + block. build system: - multiple modules directories are now supported (defined in Makefile.dirs) @@ -79,6 +81,9 @@ new config variables: compiled with DBG_QM_MALLOC or DBG_F_MALLOC). Default: 1. Can be changed at runtime. + - shm = number or shm_mem = number - size of shared memory in MB. It's + overwritten if a value is specified on the command line (-m val). + Default: 32 Mb. Must appear prior to any modparam() or route block. new script commands: add_local_rport() - adds the rport parameter to the added via header

14 years, 5 months

git:kamailio_3.0: core: shm mem size can now be set in the config script

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: ecc3fd3f0599cf9fa1bb070970d730f4ab85675e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ecc3fd3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 10 13:10:43 2010 +0100 core: shm mem size can now be set in the config script shm mem size can now be set in the cfg script using shm=size_in_mb, shm_mem=size_in_mb or shm_mem_size=size_in_mb. It must be set prior to any modparam or route block. Specifying the memory size on the command line (-m size_in_mb) will override the size from the config file. (cherry picked from commit 647cc9832560590adc6e20685c2d53350a932fb2) --- cfg.lex | 4 ++++ cfg.y | 12 +++++++++++- main.c | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/cfg.lex b/cfg.lex index e63cebf..3d41477 100644 --- a/cfg.lex +++ b/cfg.lex @@ -80,6 +80,7 @@ * 2009-03-10 added SET_USERPHONE action (Miklos) * 2009-04-24 add strlen, strempty and defined operators (andrei) * 2009-03-07 RETCODE, it's now a core pvar (andrei) + * 2010-01-10 added SHM_MEM_SZ (andrei) */ @@ -444,6 +445,7 @@ ADVERTISED_ADDRESS "advertised_address" ADVERTISED_PORT "advertised_port" DISABLE_CORE "disable_core_dump" OPEN_FD_LIMIT "open_files_limit" +SHM_MEM_SZ "shm"|"shm_mem"|"shm_mem_size" SHM_FORCE_ALLOC "shm_force_alloc" MLOCK_PAGES "mlock_pages" REAL_TIME "real_time" @@ -839,6 +841,8 @@ EAT_ABLE [\ \t\b\r] return DISABLE_CORE; } <INITIAL>{OPEN_FD_LIMIT} { count(); yylval.strval=yytext; return OPEN_FD_LIMIT; } +<INITIAL>{SHM_MEM_SZ} { count(); yylval.strval=yytext; + return SHM_MEM_SZ; } <INITIAL>{SHM_FORCE_ALLOC} { count(); yylval.strval=yytext; return SHM_FORCE_ALLOC; } <INITIAL>{MLOCK_PAGES} { count(); yylval.strval=yytext; diff --git a/cfg.y b/cfg.y index bbd5ad3..9266e2e 100644 --- a/cfg.y +++ b/cfg.y @@ -96,7 +96,8 @@ * 2009-01-26 case/switch() support (andrei) * 2009-03-10 added SET_USERPHONE action (Miklos) * 2009-05-04 switched if to rval_expr (andrei) - * 2010-01-10 init shm on first mod_param or route block (andrei) + * 2010-01-10 init shm on first mod_param or route block; + * added SHM_MEM_SZ (andrei) */ %{ @@ -494,6 +495,7 @@ extern char *finame; %token ADVERTISED_PORT %token DISABLE_CORE %token OPEN_FD_LIMIT +%token SHM_MEM_SZ %token SHM_FORCE_ALLOC %token MLOCK_PAGES %token REAL_TIME @@ -1463,6 +1465,14 @@ assign_stm: | DISABLE_CORE EQUAL error { yyerror("boolean value expected"); } | OPEN_FD_LIMIT EQUAL NUMBER { open_files_limit=$3; } | OPEN_FD_LIMIT EQUAL error { yyerror("number expected"); } + | SHM_MEM_SZ EQUAL NUMBER { + if (shm_initialized()) + yyerror("shm/shm_mem_size must be before any modparam or the" + " route blocks"); + else if (shm_mem_size == 0) + shm_mem_size=$3 * 1024 * 1024; + } + | SHM_MEM_SZ EQUAL error { yyerror("number expected"); } | SHM_FORCE_ALLOC EQUAL NUMBER { if (shm_initialized()) yyerror("shm_force_alloc must be before any modparam or the" diff --git a/main.c b/main.c index 31a4b65..8d0f7e5 100644 --- a/main.c +++ b/main.c @@ -469,7 +469,7 @@ int cfg_warnings=0; /* shared memory (in MB) */ -unsigned long shm_mem_size=SHM_MEM_SIZE * 1024 * 1024; +unsigned long shm_mem_size=0; /* export command-line to anywhere else */ int my_argc;

14 years, 5 months

git:kamailio_3.0: core: moved shm init into separate files

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 9c657605b8b754b8d633aafb2b5ed771265b782c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c65760… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 10 12:50:15 2010 +0100 core: moved shm init into separate files - shm init moved from main.c into shm_init.c and shm_init.h. - added a function to check if shm was already intialized (shm_intialized()). - make sure the user is set before parsing the config, if present on the command line (the user is needed to initialize the shared memory when sysv semaphores are used as the locking method). (cherry picked from commit 2c4ae148162c7a36f25d9a7b10fe64c7667ced31) --- main.c | 14 ++++++++-- shm_init.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ shm_init.h | 35 ++++++++++++++++++++++++++ 3 files changed, 125 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index fd4b642..31a4b65 100644 --- a/main.c +++ b/main.c @@ -121,7 +121,8 @@ #include "mem/mem.h" #ifdef SHM_MEM #include "mem/shm_mem.h" -#endif +#include "shm_init.h" +#endif /* SHM_MEM */ #include "sr_module.h" #include "timer.h" #include "parser/msg_parser.h" @@ -1720,6 +1721,10 @@ int main(int argc, char** argv) goto error; }; break; + case 'u': + /* user needed for possible shm. pre-init */ + user=optarg; + break; case 'b': case 'l': case 'n': @@ -1732,7 +1737,6 @@ int main(int argc, char** argv) case 'W': case 'w': case 't': - case 'u': case 'g': case 'P': case 'G': @@ -2069,9 +2073,13 @@ try_again: * -it must be also before init_timer and init_tcp * -it must be after we know uid (so that in the SYSV sems case, * the sems will have the correct euid) + * Note: shm can now be initialized when parsing the config script, that's + * why checking for a prior initialization is needed. * --andrei */ - if (init_shm_mallocs(shm_force_alloc)==-1) +#ifdef SHM_MEM + if (!shm_initialized() && init_shm()<0) goto error; +#endif /* SHM_MEM */ if (init_atomic_ops()==-1) goto error; if (init_basex() != 0){ diff --git a/shm_init.c b/shm_init.c new file mode 100644 index 0000000..d981ae5 --- /dev/null +++ b/shm_init.c @@ -0,0 +1,79 @@ +/* + * $Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * 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. + */ +/* + * shm_init.c + */ +/* + * History: + * -------- + * 2010-01-10 initial version (andrei) +*/ + +#include "shm_init.h" +#include "mem/mem.h" +#include "globals.h" + +static int shm_init = 0; + + +/** check if shm is initialized. + * @return 1 if initialized, 0 if not + */ +int shm_initialized() +{ + return shm_init; +} + + + +#ifdef SHM_MEM +/** init shm mem. + * @return 0 on success, < 0 on error + * it _must_ be called: + * - after the shm_mem_size is known + * - after shm_force_alloc is known (mlock_pages should happen at a later + * point so it's not yet needed here) + * - after the user is known (so that in the SYSV sems case the sems will + * have the correct euid) + * - before init_timer and init_tcp + * --andrei + * + * Global vars used: shm_mem_size, shm_force_alloc, user & uid. + * Side effects: it might set uid, gid and shm_mem_size. + */ +int init_shm() +{ + /* set uid if user is set */ + if (user && uid == 0){ + if (user2uid(&uid, &gid, user)<0){ + fprintf(stderr, "bad user name/uid number: -u %s\n", user); + goto error; + } + } + if (shm_mem_size == 0) + shm_mem_size=SHM_MEM_SIZE * 1024 * 1024; + if (init_shm_mallocs(shm_force_alloc)==-1) + goto error; + shm_init=1; + return 0; +error: + return -1; +} +#endif /* SHM_MEM */ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/shm_init.h b/shm_init.h new file mode 100644 index 0000000..b25ab43 --- /dev/null +++ b/shm_init.h @@ -0,0 +1,35 @@ +/* + * $Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * 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. + */ +/* + * shm_init.h + */ +/* + * History: + * -------- + * 2010-01-10 initial version (andrei) +*/ + +#ifndef __shm_init_h +#define __shm_init_h + +int shm_initialized(); +int init_shm(); + +#endif /*__shm_init_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */

14 years, 5 months

← Newer
1
...
17
18
19
20
21
22
23
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2010