sr-dev September 2009

sr-dev@lists.kamailio.org

32 participants
207 discussions

git:master: cpl-c(k): append_branch() api changes
by Andrei Pelinescu-Onciul 29 Sep '09

29 Sep '09

Module: sip-router Branch: master Commit: 2a791567ae8697c171a9584c2a10e7d6a16253c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a79156… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 29 20:03:35 2009 +0200 cpl-c(k): append_branch() api changes --- modules_k/cpl-c/cpl_sig.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules_k/cpl-c/cpl_sig.c b/modules_k/cpl-c/cpl_sig.c index d77c1fc..8f84e77 100644 --- a/modules_k/cpl-c/cpl_sig.c +++ b/modules_k/cpl-c/cpl_sig.c @@ -87,9 +87,8 @@ int cpl_proxy_to_loc_set( struct sip_msg *msg, struct location **locs, bflags = ((*locs)->flags&CPL_LOC_NATED) ? cpl_fct.ulb.nat_flag : 0 ; LM_DBG("appending branch <%.*s>, flags %d\n", (*locs)->addr.uri.len, (*locs)->addr.uri.s, bflags); - if(append_branch(msg, (*locs)->addr.uri.s, (*locs)->addr.uri.len, - (*locs)->addr.received.s, (*locs)->addr.received.len, - Q_UNSPECIFIED, 0)==-1){ + if(append_branch(msg, &(*locs)->addr.uri, &(*locs)->addr.received, 0, + Q_UNSPECIFIED, bflags, 0)==-1){ LM_ERR("failed when appending branch <%s>\n",(*locs)->addr.uri.s); goto error; }

1 0

git:master: exec(k): append_branch() api changes
by Andrei Pelinescu-Onciul 29 Sep '09

29 Sep '09

Module: sip-router Branch: master Commit: 820c58ec91c147548bcfcaca1a2786f46a1e7456 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=820c58e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 29 20:05:24 2009 +0200 exec(k): append_branch() api changes --- modules_k/exec/exec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/exec/exec.c b/modules_k/exec/exec.c index fd7ce02..2ce7895 100644 --- a/modules_k/exec/exec.c +++ b/modules_k/exec/exec.c @@ -167,7 +167,7 @@ int exec_str(struct sip_msg *msg, char *cmd, char *param, int param_len) { goto error02; } } else { - if (append_branch(msg, uri.s, uri.len, 0, 0, Q_UNSPECIFIED, 0)==-1) { + if (append_branch(msg, &uri, 0, 0, Q_UNSPECIFIED, 0, 0)==-1) { LM_ERR("append_branch failed; too many or too long URIs?\n"); goto error02; }

1 0

git:master: drouting(k): typo fix
by Andrei Pelinescu-Onciul 29 Sep '09

29 Sep '09

Module: sip-router Branch: master Commit: 140d0a351d8dd0779610f53ec97809b1edacfb52 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=140d0a3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 29 20:04:32 2009 +0200 drouting(k): typo fix --- modules_k/drouting/routing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/drouting/routing.c b/modules_k/drouting/routing.c index 618f413..1ff7629 100644 --- a/modules_k/drouting/routing.c +++ b/modules_k/drouting/routing.c @@ -351,7 +351,7 @@ add_dst( } /* note we discard the port discovered by the resolve function - we are interested only in the port that was actually configured. */ - if ( (he=sip_resolvehost( &uri.host, NULL, (char*)(void*)&uri.proto)==0 )) { + if ((he=sip_resolvehost( &uri.host, NULL, (char*)(void*)&uri.proto))==0 ) { if(dr_force_dns) { LM_ERR("cannot resolve <%.*s>\n",

1 0

git:master: alias_db(k): append_branch() api changes
by Andrei Pelinescu-Onciul 29 Sep '09

29 Sep '09

Module: sip-router Branch: master Commit: b23a7ab13046347a70ffb1be19a9896d0ff3fc61 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b23a7ab… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 29 20:02:09 2009 +0200 alias_db(k): append_branch() api changes --- modules_k/alias_db/alookup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/alias_db/alookup.c b/modules_k/alias_db/alookup.c index 48909e9..33bb65a 100644 --- a/modules_k/alias_db/alookup.c +++ b/modules_k/alias_db/alookup.c @@ -207,7 +207,7 @@ int alias_db_lookup(struct sip_msg* _msg, char* _table, char* _str2) break; } else { user_s.s = useruri_buf; - if (append_branch(_msg, useruri_buf, 0, 0, MIN_Q, 0, 0) == -1) + if (append_branch(_msg, &user_s, 0, 0, MIN_Q, 0, 0) == -1) { LM_ERR("error while appending branches\n"); goto err_server;

1 0

git:master: makefile: use -fno_strict-overflow on gcc 4.2+
by Andrei Pelinescu-Onciul 29 Sep '09

29 Sep '09

Module: sip-router Branch: master Commit: 9558980b9087ce3ff227941d33e7e5224568226e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9558980… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 29 18:38:32 2009 +0200 makefile: use -fno_strict-overflow on gcc 4.2+ For gcc versions >= 4.2, use the -fno_strict_overflow compile option. This is needed to avoid gcc optimizations that assume signed overflow is undefined and does not wrap around (some parts of the code assume using two complement arithmetic and -fstrict-overflow might break them). --- Makefile.defs | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 98 insertions(+), 4 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index f262f43..e46aa03 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -69,6 +69,7 @@ # 2009-03-10 replaced DEFS with C_DEFS and INCLUDES with C_INCLUDES (DEFS # and INCLUDES are now used only for "temporary" defines/includes # inside modules or libs) (andrei) +# 2009-09-20 for gcc 4.2+ use -fno-strict-overflow (andrei) # check if already included/exported @@ -305,8 +306,9 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) sed -e 's/[^0-9]*-$.*$/\1/'| \ sed -e 's/2\.9.*/2.9x/' -e 's/3\.[0-3]\..*/3.0/' -e \ 's/3\.[0-3]/3.0/' -e 's/3\.[4-9]\..*/3.4/' -e \ - 's/3\.[4-9]/3.4/' -e 's/4\.[0-9]\..*/4.x/' -e \ - 's/4\.[0-9]/4.x/' ) + 's/3\.[4-9]/3.4/' -e 's/4\.[0-1]\..*/4.x/' -e \ + 's/4\.[0-1]/4.x/' -e 's/4\.[2-9]\..*/4.2+/' -e \ + 's/4\.[2-9]$$/4.2+/') endif ifneq (, $(findstring Sun, $(CC_LONGVER))) @@ -670,6 +672,15 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) + #if gcc 4.2+ +ifeq ($(CC_SHORTVER), 4.2+) + CPU ?= athlon64 + CFLAGS+=-minline-all-stringops \ + -falign-loops \ + -ftree-vectorize \ + -fno-strict-overflow \ + -mtune=$(CPU) +else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) CPU ?= athlon64 @@ -707,6 +718,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x +endif # CC_SHORTVER, 4.2+ else # CC_NAME, gcc ifeq ($(CC_NAME), icc) @@ -732,6 +744,15 @@ ifeq ($(CC_NAME), gcc) #common stuff CFLAGS=-m64 -g -O9 -funroll-loops -Wcast-align $(PROFILE) LDFLAGS+=-m64 + #if gcc 4.2+ +ifeq ($(CC_SHORTVER), 4.2+) + CPU ?= opteron + CFLAGS+=-minline-all-stringops \ + -falign-loops \ + -ftree-vectorize \ + -fno-strict-overflow \ + -mtune=$(CPU) +else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) CPU ?= opteron @@ -769,6 +790,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x +endif # CC_SHORTVER, 4.2+ else # CC_NAME, gcc ifeq ($(CC_NAME), icc) @@ -800,6 +822,15 @@ ifeq ($(CC_NAME), gcc) # -m32 for 32 bit (default on solaris), # nothing for arch. default LDFLAGS+=-m64 + #if gcc 4.2+ +ifeq ($(CC_SHORTVER), 4.2+) + CPU ?= ultrasparc + #use 32bit for now + CFLAGS+=-mcpu=ultrasparc \ + -mtune=$(CPU) \ + -fno-strict-overflow \ + -ftree-vectorize +else #if gcc 4.x ifeq ($(CC_SHORTVER), 4.x) CPU ?= ultrasparc @@ -849,6 +880,7 @@ endif #CC_SHORTVER, 2.9x endif #CC_SHORTVER, 3.0 endif #CC_SHORTVER, 3.4 endif #CC_SHORTVER, 4.x +endif #CC_SHORTVER, 4.2+ else #CC_NAME, gcc ifeq ($(CC_NAME), suncc) @@ -872,6 +904,15 @@ ifeq ($(CC_NAME), gcc) CFLAGS=-g -O9 -funroll-loops $(PROFILE) \ #-Wcast-align \ #-Wmissing-prototypes + #if gcc 4.2+ +ifeq ($(CC_SHORTVER), 4.2+) + CPU ?= v8 + #use 32bit for now + CFLAGS+= -minline-all-stringops \ + -mtune=$(CPU) \ + -fno-strict-overflow \ + -ftree-vectorize +else #if gcc 4.x ifeq ($(CC_SHORTVER), 4.x) CPU ?= v8 @@ -907,6 +948,7 @@ endif #CC_SHORTVER, 2.9x endif #CC_SHORTVER, 3.0 endif #CC_SHORTVER, 3.4 endif #CC_SHORTVER, 4.x +endif #CC_SHORTVER, 4.2+ else #CC_NAME, gcc ifeq ($(CC_NAME), suncc) @@ -927,6 +969,11 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS=-O9 -funroll-loops $(PROFILE) + #if gcc 4.2+ +ifeq ($(CC_SHORTVER), 4.2+) + CFLAGS+= -ftree-vectorize -fno-strict-overflow + # not supported on arm: -minline-all-stringops +else #if gcc 4.x+ ifeq ($(CC_SHORTVER), 4.x) CFLAGS+= -ftree-vectorize @@ -954,7 +1001,8 @@ $(warning You are using an old and unsupported gcc \ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 -endif # CC_SHORTVER, 4.0 +endif # CC_SHORTVER, 4.x +endif # CC_SHORTVER, 4.2+ else # CC_NAME, gcc #other compilers @@ -970,6 +1018,10 @@ ifeq ($(CC_NAME), gcc) #common stuff CFLAGS=-march=armv6 -O9 -funroll-loops \ $(PROFILE) + #if gcc 4.2+ +ifeq ($(CC_SHORTVER), 4.2+) + CFLAGS+= -ftree-vectorize -fno-strict-overflow +else #if gcc 4.x+ ifeq ($(CC_SHORTVER), 4.x) CFLAGS+= -ftree-vectorize @@ -996,7 +1048,8 @@ $(warning You are using an old and unsupported gcc \ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 -endif # CC_SHORTVER, 4.0 +endif # CC_SHORTVER, 4.x +endif # CC_SHORTVER, 4.2+ else # CC_NAME, gcc #other compilers @@ -1011,6 +1064,11 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS=-O9 -funroll-loops $(PROFILE) + #if gcc 4.2+ +ifeq ($(CC_SHORTVER), 4.2+) + CFLAGS+=-march=r3000 -minline-all-stringops \ + -ftree-vectorize -fno-strict-overflow +else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) CFLAGS+=-march=r3000 -minline-all-stringops \ @@ -1038,6 +1096,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x +endif # CC_SHORTVER, 4.2+ else # CC_NAME, gcc #other compilers @@ -1052,6 +1111,11 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS= -mips2 -O9 -funroll-loops $(PROFILE) + #if gcc 4.2+ +ifeq ($(CC_SHORTVER), 4.2+) + CFLAGS+=-minline-all-stringops -ftree-vectorize \ + -fno-strict-overflow +else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) CFLAGS+=-minline-all-stringops -ftree-vectorize @@ -1077,6 +1141,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x +endif # CC_SHORTVER, 4.2+ else # CC_NAME, gcc #other compilers @@ -1091,6 +1156,11 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS= -mips64 -O9 -funroll-loops $(PROFILE) + #if gcc 4.2+ +ifeq ($(CC_SHORTVER), 4.2+) + CFLAGS+=-minline-all-stringops -ftree-vectorize \ + -fno-strict-overflow +else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) CFLAGS+=-minline-all-stringops -ftree-vectorize @@ -1116,6 +1186,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x +endif # CC_SHORTVER, 4.2+ else # CC_NAME, gcc #other compilers @@ -1130,6 +1201,11 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS= -O9 -funroll-loops $(PROFILE) + #if gcc 4.2+ +ifeq ($(CC_SHORTVER), 4.2+) + CFLAGS+= -fno-strict-overflow + # not supported: -minline-all-stringops +else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) CFLAGS+= @@ -1156,6 +1232,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x +endif # CC_SHORTVER, 4.2+ else # CC_NAME, gcc #other compilers @@ -1170,6 +1247,13 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS= -O9 -funroll-loops $(PROFILE) + #if gcc 4.2+ +ifeq ($(CC_SHORTVER), 4.2+) + CPU ?= powerpc + CFLAGS+=-ftree-vectorize \ + -fno-strict-overflow \ + -mtune=$(CPU) -maltivec +else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) CPU ?= powerpc @@ -1197,6 +1281,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x +endif # CC_SHORTVER, 4.2+ else # CC_NAME, gcc #other compilers @@ -1211,6 +1296,14 @@ ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS= -O9 -funroll-loops $(PROFILE) + #if gcc 4.2+ +ifeq ($(CC_SHORTVER), 4.2+) + CPU ?= powerpc64 + CFLAGS+=-ftree-vectorize \ + -fno-strict-overflow \ + -mtune=$(CPU) -maltivec +else + #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) CPU ?= powerpc64 CFLAGS+=-ftree-vectorize \ @@ -1237,6 +1330,7 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x +endif # CC_SHORTVER, 4.2+ else # CC_NAME, gcc #other compilers

1 0

git:master: core: mem dbg options updates + cleanups
by Andrei Pelinescu-Onciul 29 Sep '09

29 Sep '09

Module: sip-router Branch: master Commit: e4f42ce1ded4bc0b6b7142f496119178f8cba15a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4f42ce… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 29 15:25:50 2009 +0200 core: mem dbg options updates + cleanups - memlog and memdbg can now be changed at runtime - double define warning fix for fm_malloc (when compiled with -DF_MALLOC) - nicer qm_status() & qm_sums() output - BSD licence for mem/* --- cfg.y | 4 +- cfg_core.c | 9 +++++- cfg_core.h | 2 + main.c | 13 ++++++-- mem/f_malloc.c | 34 ++++++++++------------ mem/f_malloc.h | 35 ++++++++++------------- mem/ll_malloc.c | 3 ++ mem/mem.c | 33 ++++++++------------- mem/mem.h | 29 +++++++------------ mem/memdbg.h | 7 +++- mem/meminfo.h | 29 +++++++------------ mem/memtest.c | 29 +++++++------------ mem/q_malloc.c | 83 ++++++++++++++++++++++++++++++++---------------------- mem/q_malloc.h | 29 +++++++------------ mem/sf_malloc.c | 3 ++ mem/shm_mem.c | 29 +++++++------------ mem/shm_mem.h | 29 +++++++------------ pt.c | 16 ++++++++-- 18 files changed, 203 insertions(+), 213 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e4f…

1 0

git:master: core: remove VQ_MALLOC memory manager
by Andrei Pelinescu-Onciul 29 Sep '09

29 Sep '09

Module: sip-router Branch: master Commit: f92113d8e16d6e59c170dfa703d9db30980b6877 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f92113d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Mar 17 13:24:42 2009 +0100 core: remove VQ_MALLOC memory manager attached patch removes the VQ_MALLOC memory manager from the sip-router core. As discussed some time ago, this memory manager doesn't provide a realloc implementation, and is thus not really usable for the modules, as some of them needs this. We removed this in kamailio in the last year, so far nobody missed it. Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> --- mem/f_malloc.c | 2 +- mem/f_malloc.h | 2 +- mem/mem.c | 14 +-- mem/mem.h | 22 +-- mem/memtest.c | 21 +-- mem/q_malloc.c | 2 +- mem/q_malloc.h | 2 +- mem/shm_mem.c | 18 -- mem/shm_mem.h | 11 -- mem/vq_malloc.c | 477 ------------------------------------------------------- mem/vq_malloc.h | 154 ------------------ version.h | 8 +- 12 files changed, 18 insertions(+), 715 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f92…

1 0

git:master: core: added mem_summary config option
by Andrei Pelinescu-Onciul 29 Sep '09

29 Sep '09

Module: sip-router Branch: master Commit: d740c34e417acd84d0ccad47fc65af2668d09654 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d740c34… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 29 13:32:48 2009 +0200 core: added mem_summary config option - added mem_summary which controls the memory debugging info logged on exit or on SIGUSR1. Its value is a combination of flags: 0 - off, 1 - dump all used memory blocks and some statistics (lots of output), 2 - dump a summary of the used memory blocks (works only if compiled with DBG_QM_MALLOC or DBG_F_MALLOC). The default value is 1 (same behaviour as older versions). - fix: don't call the memory status/summary functions if memlog > debug level (since nothing will be logged anyway). --- NEWS | 7 +++++++ cfg.lex | 2 ++ cfg.y | 3 +++ cfg_core.c | 6 +++++- cfg_core.h | 1 + main.c | 57 +++++++++++++++++++++++++++++++++++++++++++++------------ 6 files changed, 63 insertions(+), 13 deletions(-) diff --git a/NEWS b/NEWS index 7cd7fff..3cd2de4 100644 --- a/NEWS +++ b/NEWS @@ -72,6 +72,13 @@ new config variables: - max_while_loops - maximum iterations allowed for a while (can be changed at runtime). Default 100. - log_name - set the application name used when printing to syslog. + - mem_summary - memory debugging info logged on exit or on SIGUSR1. + The value is a combination of flags: 0 - off, + 1 - dump all used memory blocks and some statistics (lots of output), + 2 - dump a summary of the used memory blocks (works only if + compiled with DBG_QM_MALLOC or DBG_F_MALLOC). + Default: 1. + Can be changed at runtime. new script commands: add_local_rport() - adds the rport parameter to the added via header diff --git a/cfg.lex b/cfg.lex index bedf79c..8490364 100644 --- a/cfg.lex +++ b/cfg.lex @@ -353,6 +353,7 @@ PHONE2TEL phone2tel SYN_BRANCH syn_branch MEMLOG "memlog"|"mem_log" MEMDBG "memdbg"|"mem_dbg" +MEMSUM "mem_summary" SIP_WARNING sip_warning SERVER_SIGNATURE server_signature SERVER_HEADER server_header @@ -688,6 +689,7 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{SYN_BRANCH} { count(); yylval.strval=yytext; return SYN_BRANCH; } <INITIAL>{MEMLOG} { count(); yylval.strval=yytext; return MEMLOG; } <INITIAL>{MEMDBG} { count(); yylval.strval=yytext; return MEMDBG; } +<INITIAL>{MEMSUM} { count(); yylval.strval=yytext; return MEMSUM; } <INITIAL>{SIP_WARNING} { count(); yylval.strval=yytext; return SIP_WARNING; } <INITIAL>{USER} { count(); yylval.strval=yytext; return USER; } <INITIAL>{GROUP} { count(); yylval.strval=yytext; return GROUP; } diff --git a/cfg.y b/cfg.y index fe8cbf2..ff56515 100644 --- a/cfg.y +++ b/cfg.y @@ -408,6 +408,7 @@ extern char *finame; %token SYN_BRANCH %token MEMLOG %token MEMDBG +%token MEMSUM %token SIP_WARNING %token SERVER_SIGNATURE %token SERVER_HEADER @@ -863,6 +864,8 @@ assign_stm: | MEMLOG EQUAL error { yyerror("int value expected"); } | MEMDBG EQUAL intno { memdbg=$3; } | MEMDBG EQUAL error { yyerror("int value expected"); } + | MEMSUM EQUAL intno { default_core_cfg.mem_summary=$3; } + | 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; } diff --git a/cfg_core.c b/cfg_core.c index 778a4dd..ce0ae50 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -92,7 +92,8 @@ struct cfg_group_core default_core_cfg = { DEFAULT_MAX_WHILE_LOOPS, /* max_while_loops */ 0, /* udp_mtu (disabled by default) */ 0, /* udp_mtu_try_proto -> default disabled */ - 0 /* force_rport */ + 0, /* force_rport */ + 1 /* mem_summary -flags: 0 off, 1 shm/pkg_status, 2 shm/pkg_sums */ }; void *core_cfg = &default_core_cfg; @@ -191,5 +192,8 @@ cfg_def_t core_cfg_def[] = { "if send size > udp_mtu use proto (1 udp, 2 tcp, 3 tls, 4 sctp)"}, {"force_rport", CFG_VAR_INT, 0, 1, 0, fix_global_req_flags, "force rport for all the received messages" }, + {"mem_summary", CFG_VAR_INT|CFG_ATOMIC, 0, 3, 0, 0, + "memory debugging information displayed on exit (flags): " + " 0 - off, 1 - dump all used blocks, 2 - summary of used blocks" }, {0, 0, 0, 0, 0, 0} }; diff --git a/cfg_core.h b/cfg_core.h index 4f493ef..dd5d7af 100644 --- a/cfg_core.h +++ b/cfg_core.h @@ -89,6 +89,7 @@ struct cfg_group_core { int udp_mtu; /**< maximum send size for udp, if > try another protocol*/ int udp_mtu_try_proto; /**< if packet> udp_mtu, try proto (e.g. TCP) */ int force_rport; /**< if set rport will always be forced*/ + int mem_summary; /**< display memory status/summary info on exit */ }; extern struct cfg_group_core default_core_cfg; diff --git a/main.c b/main.c index 6d85a57..0965051 100644 --- a/main.c +++ b/main.c @@ -529,21 +529,29 @@ void cleanup(show_status) destroy_routes(); destroy_atomic_ops(); #ifdef PKG_MALLOC - if (show_status){ - LOG(memlog, "Memory status (pkg):\n"); - pkg_status(); - LOG(memlog, "Memory still-in-use summary (pkg):\n"); - pkg_sums(); + if (show_status && memlog <= cfg_get(core, core_cfg, debug)){ + if (cfg_get(core, core_cfg, mem_summary) & 1) { + LOG(memlog, "Memory status (pkg):\n"); + pkg_status(); + } + if (cfg_get(core, core_cfg, mem_summary) & 2) { + LOG(memlog, "Memory still-in-use summary (pkg):\n"); + pkg_sums(); + } } #endif #ifdef SHM_MEM if (pt) shm_free(pt); pt=0; - if (show_status){ + if (show_status && memlog <= cfg_get(core, core_cfg, debug)){ + if (cfg_get(core, core_cfg, mem_summary) & 1) { LOG(memlog, "Memory status (shm):\n"); shm_status(); + } + if (cfg_get(core, core_cfg, mem_summary) & 2) { LOG(memlog, "Memory still-in-use summary (shm):\n"); shm_sums(); + } } /* zero all shmem alloc vars that we still use */ shm_mem_destroy(); @@ -664,12 +672,28 @@ void handle_sigs() dump_all_statistic(); #endif #ifdef PKG_MALLOC - LOG(memlog, "Memory status (pkg):\n"); - pkg_status(); + if (memlog <= cfg_get(core, core_cfg, debug)){ + if (cfg_get(core, core_cfg, mem_summary) & 1) { + LOG(memlog, "Memory status (pkg):\n"); + pkg_status(); + } + if (cfg_get(core, core_cfg, mem_summary) & 2) { + LOG(memlog, "Memory still-in-use summary (pkg):\n"); + pkg_sums(); + } + } #endif #ifdef SHM_MEM - LOG(memlog, "Memory status (shm):\n"); - shm_status(); + if (memlog <= cfg_get(core, core_cfg, debug)){ + if (cfg_get(core, core_cfg, mem_summary) & 1) { + LOG(memlog, "Memory status (shm):\n"); + shm_status(); + } + if (cfg_get(core, core_cfg, mem_summary) & 2) { + LOG(memlog, "Memory still-in-use summary (shm):\n"); + shm_sums(); + } + } #endif break; @@ -747,8 +771,17 @@ void sig_usr(int signo) LOG(L_INFO, "INFO: signal %d received\n", signo); /* print memory stats for non-main too */ #ifdef PKG_MALLOC - LOG(memlog, "Memory status (pkg):\n"); - pkg_status(); + if (memlog <= cfg_get(core, core_cfg, debug)){ + if (cfg_get(core, core_cfg, mem_summary) & 1) { + LOG(memlog, "Memory status (pkg):\n"); + pkg_status(); + } + if (cfg_get(core, core_cfg, mem_summary) & 2) { + LOG(memlog, "Memory still-in-use summary (pkg):" + "\n"); + pkg_sums(); + } + } #endif #endif _exit(0);

1 0

git:master: mem: summarize in-use memory on exit
by Andrei Pelinescu-Onciul 29 Sep '09

29 Sep '09

Module: sip-router Branch: master Commit: ed20ee1dd197ecaead7549f762e5d331a14db34e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed20ee1… Author: Dragos Vingarzan <dragos.vingarzan(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Sep 28 22:01:17 2009 +0200 mem: summarize in-use memory on exit Additional qm_sums and fm_sums as extension to qm_status/fm_status, with summarized values per allocation source. Slightly modified SER-224 patch version (no locking, sr changes --andrei). Closes SER-224. Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> --- main.c | 4 +++ mem/f_malloc.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ mem/f_malloc.h | 6 ++++ mem/mem.h | 5 +++ mem/q_malloc.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ mem/q_malloc.h | 6 ++++ mem/shm_mem.h | 16 +++++++++++ 7 files changed, 189 insertions(+), 0 deletions(-) diff --git a/main.c b/main.c index 78c8fb5..6d85a57 100644 --- a/main.c +++ b/main.c @@ -532,6 +532,8 @@ void cleanup(show_status) if (show_status){ LOG(memlog, "Memory status (pkg):\n"); pkg_status(); + LOG(memlog, "Memory still-in-use summary (pkg):\n"); + pkg_sums(); } #endif #ifdef SHM_MEM @@ -540,6 +542,8 @@ void cleanup(show_status) if (show_status){ LOG(memlog, "Memory status (shm):\n"); shm_status(); + LOG(memlog, "Memory still-in-use summary (shm):\n"); + shm_sums(); } /* zero all shmem alloc vars that we still use */ shm_mem_destroy(); diff --git a/mem/f_malloc.c b/mem/f_malloc.c index d157fc9..8be84e7 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -40,6 +40,7 @@ * 2006-04-07 s/DBG/MDBG (andrei) * 2007-02-23 added fm_available() (andrei) * 2007-06-23 added hash bitmap (andrei) + * 2009-09-28 added fm_sums() (patch from Dragos Vingarzan) */ @@ -711,4 +712,85 @@ unsigned long fm_available(struct fm_block* qm) #endif } + +#ifdef DBG_F_MALLOC + +typedef struct _mem_counter{ + const char *file; + const char *func; + unsigned long line; + + unsigned long size; + int count; + + struct _mem_counter *next; +} mem_counter; + +static mem_counter* get_mem_counter(mem_counter **root,struct fm_frag* f) +{ + mem_counter *x; + + if (!*root) goto make_new; + for(x=*root;x;x=x->next) + if (x->file == f->file && x->func == f->func && x->line == f->line) + return x; +make_new: + x = malloc(sizeof(mem_counter)); + x->file = f->file; + x->func = f->func; + x->line = f->line; + x->count = 0; + x->size = 0; + x->next = *root; + *root = x; + return x; +} + + + +void fm_sums(struct fm_block* qm) +{ + struct fm_frag* f; + struct fm_frag* free_frag; + int i, hash; + mem_counter *root,*x; + + root=0; + if (!qm) return; + + LOG(memlog, "summarizing all alloc'ed. fragments:\n"); + + for (f=qm->first_frag, i=0; (char*)f<(char*)qm->last_frag; + f=FRAG_NEXT(f), i++){ + if (f->u.nxt_free==0){ + /* it might be in-use or the last free fragm. in a free list + => search the free frags of the same size for a possible + match --andrei*/ + hash=GET_HASH(f->size); + for(free_frag=qm->free_hash[hash].first; + free_frag && (free_frag!=f); + free_frag=free_frag->u.nxt_free); + if (free_frag==0){ /* not found among the free frag */ + x = get_mem_counter(&root,f); + x->count++; + x->size+=f->size; + } + } + } + x = root; + while(x){ + LOG(memlog, " count=%6d size=%10lu bytes from %s: %s(%ld)\n", + x->count,x->size, + x->file, x->func, x->line + ); + root = x->next; + free(x); + x = root; + } + LOG(memlog, "-----------------------------\n"); +} +#endif /* DBG_F_MALLOC */ + + + #endif diff --git a/mem/f_malloc.h b/mem/f_malloc.h index 9704441..8b30352 100644 --- a/mem/f_malloc.h +++ b/mem/f_malloc.h @@ -155,4 +155,10 @@ void fm_info(struct fm_block*, struct mem_info*); unsigned long fm_available(struct fm_block*); +#ifdef DBG_F_MALLOC +void fm_sums(struct fm_block*); +#else +#define fm_sums(v) do{}while(0) +#endif /* DBG_F_MALLOC */ + #endif diff --git a/mem/mem.h b/mem/mem.h index 7cb79a8..905200e 100644 --- a/mem/mem.h +++ b/mem/mem.h @@ -120,20 +120,24 @@ # define pkg_status() fm_status(mem_block) # define pkg_info(mi) fm_info(mem_block, mi) # define pkg_available() fm_available(mem_block) +# define pkg_sums() fm_sums(mem_block) # elif defined DL_MALLOC # define pkg_status() 0 # define pkg_info(mi) 0 # define pkg_available() 0 +# define pkg_sums() 0 # else # define pkg_status() qm_status(mem_block) # define pkg_info(mi) qm_info(mem_block, mi) # define pkg_available() qm_available(mem_block) +# define pkg_sums() qm_sums(mem_block) # endif #elif defined(SHM_MEM) && defined(USE_SHM_MEM) # include "shm_mem.h" # define pkg_malloc(s) shm_malloc((s)) # define pkg_free(p) shm_free((p)) # define pkg_status() shm_status() +# define pkg_sums() shm_sums() #else # include <stdlib.h> # include "memdbg.h" @@ -147,6 +151,7 @@ ____v123; } ) # define pkg_free(p) do{ MDBG("free %p\n", (p)); free((p)); }while(0); # define pkg_status() +# define pkg_sums() #endif int init_pkg_mallocs(); diff --git a/mem/q_malloc.c b/mem/q_malloc.c index 7df06db..ab24249 100644 --- a/mem/q_malloc.c +++ b/mem/q_malloc.c @@ -40,6 +40,7 @@ * 2006-02-03 fixed realloc out of mem. free bug (andrei) * 2006-04-07 s/DBG/MDBG (andrei) * 2007-02-23 added fm_available() (andrei) + * 2009-09-28 added fm_sums() (patch from Dragos Vingarzan) */ @@ -779,4 +780,73 @@ unsigned long qm_available(struct qm_block* qm) } + +#ifdef DBG_QM_MALLOC + +typedef struct _mem_counter{ + const char *file; + const char *func; + unsigned long line; + + unsigned long size; + int count; + + struct _mem_counter *next; +} mem_counter; + +static mem_counter* get_mem_counter(mem_counter **root, struct qm_frag* f) +{ + mem_counter *x; + if (!*root) goto make_new; + for(x=*root;x;x=x->next) + if (x->file == f->file && x->func == f->func && x->line == f->line) + return x; +make_new: + x = malloc(sizeof(mem_counter)); + x->file = f->file; + x->func = f->func; + x->line = f->line; + x->count = 0; + x->size = 0; + x->next = *root; + *root = x; + return x; +} + + + +void qm_sums(struct qm_block* qm) +{ + struct qm_frag* f; + int i; + mem_counter *root, *x; + + root=0; + if (!qm) return; + + LOG(memlog, "summarizing all alloc'ed. fragments:\n"); + + for (f=qm->first_frag, i=0;(char*)f<(char*)qm->last_frag_end; + f=FRAG_NEXT(f),i++){ + if (! f->u.is_free){ + x = get_mem_counter(&root,f); + x->count++; + x->size+=f->size; + } + } + x = root; + while(x){ + LOG(memlog, " count=%6d size=%10lu bytes from %s: %s(%ld)\n", + x->count,x->size, + x->file, x->func, x->line + ); + root = x->next; + free(x); + x = root; + } + LOG(memlog, "-----------------------------\n"); +} +#endif /* DBG_QM_MALLOC */ + + #endif diff --git a/mem/q_malloc.h b/mem/q_malloc.h index 7963cff..6ebd7f6 100644 --- a/mem/q_malloc.h +++ b/mem/q_malloc.h @@ -153,4 +153,10 @@ void qm_info(struct qm_block*, struct mem_info*); unsigned long qm_available(struct qm_block* qm); +#ifdef DBG_QM_MALLOC +void qm_sums(struct qm_block* qm); +#else +#define qm_sums(v) do{}while(0) +#endif /*DBQ_QM_MALLOC */ + #endif diff --git a/mem/shm_mem.h b/mem/shm_mem.h index a489bba..fd6b7f3 100644 --- a/mem/shm_mem.h +++ b/mem/shm_mem.h @@ -98,6 +98,7 @@ # define shm_free_unsafe shm_free # define shm_available sfm_available(shm_block) # define shm_status() sfm_status(shm_block) +# define shm_sums() do{}while(0) # define shm_malloc_init sfm_malloc_init # define shm_malloc_destroy(b) sfm_malloc_destroy(b) # define shm_malloc_on_fork() sfm_pool_reset() @@ -124,6 +125,7 @@ # define shm_free_unsafe shm_free # define shm_available sfm_available(shm_block) # define shm_status() sfm_status(shm_block) +# define shm_sums() do{}while(0) # define shm_malloc_init sfm_malloc_init # define shm_malloc_destroy(b) sfm_malloc_destroy(b) # define shm_malloc_on_fork() sfm_pool_reset() @@ -133,6 +135,7 @@ # define MY_MALLOC vqm_malloc # define MY_FREE vqm_free # define MY_STATUS vqm_status +# define MY_SUMS do{}while(0) # define shm_malloc_init vqm_malloc_init # define shm_malloc_destroy(b) do{}while(0) # define shm_malloc_on_fork() do{}while(0) @@ -145,6 +148,7 @@ # define MY_REALLOC fm_realloc # define MY_STATUS fm_status # define MY_MEMINFO fm_info +# define MY_SUMS fm_sums # define shm_malloc_init fm_malloc_init # define shm_malloc_destroy(b) do{}while(0) # define shm_available() fm_available(shm_block) @@ -156,6 +160,7 @@ # define MY_FREE mspace_free # define MY_REALLOC mspace_realloc # define MY_STATUS(...) 0 +# define MY_SUMS do{}while(0) # define MY_MEMINFO mspace_info # define shm_malloc_init(buf, len) create_mspace_with_base(buf, len, 0) # define shm_malloc_destroy(b) do{}while(0) @@ -168,6 +173,7 @@ # define MY_REALLOC qm_realloc # define MY_STATUS qm_status # define MY_MEMINFO qm_info +# define MY_SUMS qm_sums # define shm_malloc_init qm_malloc_init # define shm_malloc_destroy(b) do{}while(0) # define shm_available() qm_available(shm_block) @@ -318,6 +324,16 @@ do{\ shm_unlock(); \ }while(0) +#ifdef MY_SUMS +#define shm_sums() \ + do { \ + shm_lock(); \ + MY_SUMS(shm_block); \ + shm_unlock(); \ + }while(0) + +#endif /* MY_SUMS */ + #endif /* ! SHM_SAFE_MALLOC */ #endif /* shm_mem_h */

1 0

Crash dump. openser 1.3.2
by Andrew O. Zhukov 29 Sep '09

29 Sep '09

Is it some sense upgrade to 1.3.4 ? Core was generated by `openser -P /var/run/openser/openser.pid -m 32 -u openser -g openser -w /var/run'. Program terminated with signal 6, Aborted. #0 0x0000003840430ec5 in raise () from /lib64/libc.so.6 (gdb) backtrace #0 0x0000003840430ec5 in raise () from /lib64/libc.so.6 #1 0x0000003840432970 in abort () from /lib64/libc.so.6 #2 0x00000000004906a4 in qm_debug_frag (qm=0x73c9e0, f=0x7cc040) at mem/q_malloc.c:155 #3 0x0000000000490d9b in qm_free (qm=0x73c9e0, p=0x7cc070, file=0x4f8332 "parser/digest/digest.c", func=0x4f8430 "free_credentials", line=95) at mem/q_malloc.c:438 #4 0x00000000004b3929 in free_credentials (_b=0x2aaaae7dc8e0) at parser/digest/digest.c:95 #5 0x000000000049269f in clean_hdr_field (hf=0x2aaaae7dc8b0) at parser/hf.c:111 #6 0x00002aaaab1191a6 in run_trans_callbacks (type=<value optimized out>, trans=<value optimized out>, req=0x2aaaae7db8b0, rpl=0x7f09e8, code=<value optimized out>) at sip_msg.h:49 #7 0x00002aaaab122902 in t_reply_matching (p_msg=0x7f09e8, p_branch=<value optimized out>) at t_lookup.c:840 #8 0x00002aaaab122d20 in t_check (p_msg=0x7f09e8, param_branch=0x7fff7a2c191c) at t_lookup.c:911 #9 0x00002aaaab132993 in reply_received (p_msg=0x3e27) at t_reply.c:1285 #10 0x000000000041d90c in forward_reply (msg=0x7f09e8) at forward.c:499 #11 0x000000000044d85c in receive_msg ( buf=0x72b960 "SIP/2.0 200 OK\r\nVia: SIP/2.0/UDP 193.28.184.13;branch=z9hG4bKd61b.a988a001.0;received=193.28.184.13\r\nVia: SIP/2.0/UDP 192.168.1.239:5060;received=212.82.211.35;branch=z9hG4bK14b072a5;rport=57642\r\nReco"..., len=620, rcv_info=0x7fff7a2c1a00) at receive.c:194 #12 0x000000000048ab8e in udp_rcv_loop () at udp_server.c:438 #13 0x0000000000425d63 in main (argc=11, argv=0x7fff7a2c1c18) at main.c:834 (gdb) quit [root@ipshka sbin]# ./openser -V version: openser 1.3.2-notls (x86_64/linux) flags: STATS: Off, USE_IPV6, USE_TCP, DISABLE_NAGLE, USE_MCAST, SHM_MEM, SHM_MMAP, PKG_MALLOC, DBG_QM_MALLOC, FAST_LOCK-ADAPTIVE_WAIT ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535 poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. svnrevision: unknown @(#) $Id: main.c 3590 2008-01-28 17:46:56Z bogdan_iancu $ main.c compiled on 23:22:34 Aug 24 2009 with gcc 4.1.2

1 0

← Newer
1
2
3
4
5
6
7
...
21
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2009