sr-dev

sr-dev@lists.kamailio.org

15 participants
44244 discussions

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: */

15 years

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;

15 years

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

15 years

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");

15 years

git:andrei/shm_early_init: core: early shm init while parsing the cfg

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/shm_early_init Commit: 6f72234400e119e981d5aa42e20c4432bb562524 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f72234… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> 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 --- cfg.y | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 115 insertions(+), 13 deletions(-) diff --git a/cfg.y b/cfg.y index 234b2d0..ac07fc1 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");

15 years

git:andrei/shm_early_init: core: shm mem size can now be set in the config script

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/shm_early_init Commit: 647cc9832560590adc6e20685c2d53350a932fb2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=647cc98… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> 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. --- 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 61e694e..0f7deec 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) */ @@ -430,6 +431,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" @@ -818,6 +820,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 ac07fc1..9a71817 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;

15 years

git:andrei/shm_early_init: NEWS: notes about the shm related changes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/shm_early_init Commit: 3d3d38e63a55e549e1707fce0fa1c2c189906338 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d3d38e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Jan 10 13:15:57 2010 +0100 NEWS: notes about the shm related changes --- 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

15 years

git:andrei/shm_early_init: core: moved shm init into separate files

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/shm_early_init Commit: 2c4ae148162c7a36f25d9a7b10fe64c7667ced31 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c4ae14… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> 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). --- 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: */

15 years

git:kamailio_3.0: sanity: print From hdr in warning message

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 195cdf43e8eea385330376184f8b78b7d0322780 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=195cdf4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 10 12:09:20 2010 +0100 sanity: print From hdr in warning message - when parsing of the header fails --- modules/sanity/sanity.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sanity/sanity.c b/modules/sanity/sanity.c index 9df37a2..76f71f4 100644 --- a/modules/sanity/sanity.c +++ b/modules/sanity/sanity.c @@ -691,7 +691,7 @@ int check_parse_uris(struct sip_msg* _msg, int checks) { parse_to(_msg->from->body.s, _msg->from->body.s + \ _msg->from->body.len + 1, ft_body); if (ft_body->error == PARSE_ERROR) { - LOG(L_WARN, "sanity_check(): check_parse_uris(): failed to parse From header\n"); + LOG(L_WARN, "sanity_check(): check_parse_uris(): failed to parse From header [%.*s]\n", _msg->from->body.len, _msg->from->body.s); pkg_free(ft_body); if (_msg->REQ_METHOD != METHOD_ACK) { if (sl.reply(_msg, 400, "Bad From header") == -1) {

15 years

git:kamailio_3.0: nathelper(k): print bad contact uri

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: a93f7ad1ce21413d0e2a00e4c8579f6bfe0a8a3f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a93f7ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 10 12:08:45 2010 +0100 nathelper(k): print bad contact uri - help in troubleshooting bad sip clients --- modules_k/nathelper/nhelpr_funcs.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/nathelper/nhelpr_funcs.c b/modules_k/nathelper/nhelpr_funcs.c index 50ec7d5..07271f2 100644 --- a/modules_k/nathelper/nhelpr_funcs.c +++ b/modules_k/nathelper/nhelpr_funcs.c @@ -406,7 +406,8 @@ get_contact_uri(struct sip_msg* _m, struct sip_uri *uri, contact_t** _c) return -1; if (parse_uri((*_c)->uri.s, (*_c)->uri.len, uri) < 0 || uri->host.len <= 0) { - LM_ERR("failed to parse Contact URI\n"); + LM_ERR("failed to parse Contact URI [%.*s]\n", + (*_c)->uri.len, ((*_c)->uri.s)?(*_c)->uri.s:""); return -1; } return 0;

15 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev