sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
387 discussions

git:master:93c11cab: Makefile.defs: build commands updated to support many memory managers
by Daniel-Constantin Mierla 14 Sep '15

14 Sep '15

Module: kamailio Branch: master Commit: 93c11cab7a56377de4db80cd559a0a59b5a23528 URL: https://github.com/kamailio/kamailio/commit/93c11cab7a56377de4db80cd559a0a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T10:22:46+02:00 Makefile.defs: build commands updated to support many memory managers - following defines can be set: - F_MALLOC - compile f_malloc (enabled) - Q_MALLOC - compile q_malloc (enabled) - DBG_SR_MEMORY - enable debugging mode for all memory mangers - all memory managers must be in same debugging mode - MEMDBG=1 turns now DBG_SR_MEMORY on - MEMMNG is no longer used, many memory managers can be enabled at the same time --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/93c11cab7a56377de4db80cd559a0a5… Patch: https://github.com/kamailio/kamailio/commit/93c11cab7a56377de4db80cd559a0a5… --- diff --git a/Makefile.defs b/Makefile.defs index da19e0e..10a4e2b 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -503,6 +503,8 @@ data_target = $(prefix)/$(data_dir) # additional option to PKG_MALLOC which utilizes a fater then # qm version # (not true anymore, q_malloc performs approx. the same) +# -DQ_MALLOC +# custom quick malloc, recommended for debugging # -DF_MALLOC # an even faster malloc, not recommended for debugging # -DTLSF_MALLOC=1 @@ -661,26 +663,13 @@ C_DEFS= $(extra_defs) \ # use make mode=debug all instead. Anyway no by default ser is compiled w/ # debugging symbols in all cases (-g). --andrei -# set memory manager and its debug mode -ifeq ($(MEMMNG), 1) -# use q_malloc +# memory managers and related debug mode +# enable f_malloc +C_DEFS+= -DF_MALLOC +# enable q_malloc +C_DEFS+= -DQ_MALLOC ifeq ($(MEMDBG), 1) - C_DEFS+= -DDBG_QM_MALLOC -endif - C_DEFS+= -DMEM_JOIN_FREE -else ifeq ($(MEMMNG), 2) -# use tlsf malloc - C_DEFS+= -DTLSF_MALLOC=1 -ifeq ($(MEMDBG), 1) - C_DEFS+= -DDBG_TLSF_MALLOC -endif -else -# use f_malloc - C_DEFS+= -DF_MALLOC -ifeq ($(MEMDBG), 1) - C_DEFS+= -DDBG_F_MALLOC -endif - C_DEFS+= -DMEM_JOIN_FREE + C_DEFS+= -DDBG_SR_MEMORY endif ifneq ($(PKG_MEM_SIZE),)

1 0

git:master:4c2ef7f3: core: new command line options for memory managers selections
by Daniel-Constantin Mierla 14 Sep '15

14 Sep '15

Module: kamailio Branch: master Commit: 4c2ef7f3eac3c7d18c8d8fc248b5372886c4c12a URL: https://github.com/kamailio/kamailio/commit/4c2ef7f3eac3c7d18c8d8fc248b5372… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T10:22:46+02:00 core: new command line options for memory managers selections - -x name: select the memory manager for shm - -X name: select the memory manager for pkg - -f -x is provided but -X is not provided, then pkg uses same memory manager as shm - name can be: - fm - fast malloc (f_malloc) - qm - quick malloc (q_malloc) - default memory manager is fm - other changes: adjustments to init pkg and shm using new memory management api --- Modified: main.c --- Diff: https://github.com/kamailio/kamailio/commit/4c2ef7f3eac3c7d18c8d8fc248b5372… Patch: https://github.com/kamailio/kamailio/commit/4c2ef7f3eac3c7d18c8d8fc248b5372… --- diff --git a/main.c b/main.c index 1ff7f6a..4fd168d 100644 --- a/main.c +++ b/main.c @@ -497,6 +497,12 @@ char* pid_file = 0; /* filename as asked by use */ char* pgid_file = 0; +/* memory manager */ +#define SR_MEMMNG_DEFAULT "fm" + +char *sr_memmng_pkg = NULL; +char *sr_memmng_shm = NULL; + /* call it before exiting; if show_status==1, mem status is displayed */ void cleanup(show_status) { @@ -504,7 +510,7 @@ void cleanup(show_status) /*clean-up*/ #ifndef SHM_SAFE_MALLOC - if (mem_lock) + if (_shm_lock) shm_unlock(); /* hack: force-unlock the shared memory lock in case some process crashed and let it locked; this will allow an almost gracious shutdown */ @@ -571,12 +577,12 @@ void cleanup(show_status) } } /* zero all shmem alloc vars that we still use */ - shm_mem_destroy(); + shm_destroy_manager(); #endif destroy_lock_ops(); if (pid_file) unlink(pid_file); if (pgid_file) unlink(pgid_file); - destroy_pkg_mallocs(); + pkg_destroy_manager(); } @@ -1807,7 +1813,7 @@ int main(int argc, char** argv) dprint_init_colors(); /* command line options */ - options= ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:" + options= ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:" #ifdef STATS "s:" #endif @@ -1841,6 +1847,12 @@ int main(int argc, char** argv) goto error; }; break; + case 'x': + sr_memmng_shm = optarg; + break; + case 'X': + sr_memmng_pkg = optarg; + break; default: if (c == 'h' || (optarg && strcmp(optarg, "-h") == 0)) { printf("version: %s\n", full_version); @@ -1850,11 +1862,26 @@ int main(int argc, char** argv) break; } } - + + if(sr_memmng_pkg==NULL) { + if(sr_memmng_shm!=NULL) { + sr_memmng_pkg = sr_memmng_shm; + } else { + sr_memmng_pkg = SR_MEMMNG_DEFAULT; + } + } + if(sr_memmng_shm==NULL) { + sr_memmng_shm = SR_MEMMNG_DEFAULT; + } + shm_set_mname(sr_memmng_shm); + if (pkg_mem_size == 0) { + pkg_mem_size = PKG_MEM_POOL_SIZE; + } + /*init pkg mallocs (before parsing cfg or the rest of the cmd line !)*/ if (pkg_mem_size) LM_INFO("private (per process) memory: %ld bytes\n", pkg_mem_size ); - if (init_pkg_mallocs()==-1) + if (pkg_init_manager(sr_memmng_pkg)<0) goto error; #ifdef DBG_MSG_QA @@ -1873,6 +1900,11 @@ int main(int argc, char** argv) /* switches required before script processing */ while((c=getopt(argc,argv,options))!=-1) { switch(c) { + case 'M': + case 'x': + case 'X': + /* ignore, they were parsed immediately after startup */ + break; case 'f': cfg_file=optarg; break; @@ -1893,10 +1925,6 @@ int main(int argc, char** argv) }; LM_INFO("shared memory: %ld bytes\n", shm_mem_size ); break; - case 'M': - /* ignore it, it was parsed immediately after startup, - the pkg mem. is already initialized at this point */ - break; case 'd': /* ignore it, was parsed immediately after startup */ break; @@ -1997,6 +2025,9 @@ int main(int argc, char** argv) abort(); } } + if (shm_mem_size == 0) { + shm_mem_size = SHM_MEM_POOL_SIZE; + } if (endianness_sanity_check() != 0){ fprintf(stderr, "BUG: endianness sanity tests failed\n"); @@ -2357,6 +2388,8 @@ int main(int argc, char** argv) if (!shm_initialized() && init_shm()<0) goto error; #endif /* SHM_MEM */ + pkg_print_manager(); + shm_print_manager(); if (init_atomic_ops()==-1) goto error; if (init_basex() != 0){

1 0

git:master:5ba10ca7: mem: prototypes of exporting memory managers implemented in core
by Daniel-Constantin Mierla 14 Sep '15

14 Sep '15

Module: kamailio Branch: master Commit: 5ba10ca7715e91508d747203bec048d0ddc0f902 URL: https://github.com/kamailio/kamailio/commit/5ba10ca7715e91508d747203bec048d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T10:22:45+02:00 mem: prototypes of exporting memory managers implemented in core --- Added: mem/memcore.h --- Diff: https://github.com/kamailio/kamailio/commit/5ba10ca7715e91508d747203bec048d… Patch: https://github.com/kamailio/kamailio/commit/5ba10ca7715e91508d747203bec048d… --- diff --git a/mem/memcore.h b/mem/memcore.h new file mode 100644 index 0000000..86c30aa --- /dev/null +++ b/mem/memcore.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2015 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * 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. + */ + + +#ifndef _sr_memcore_h_ +#define _sr_memcore_h_ + +/* memory managers implemented in core */ + +#ifdef F_MALLOC +/* fast malloc - implemented in f_malloc.c */ +int fm_malloc_init_pkg_manager(void); +int fm_malloc_init_shm_manager(void); +#endif + +#ifdef Q_MALLOC +/* quick malloc - implemented in q_malloc.c */ +int qm_malloc_init_pkg_manager(void); +int qm_malloc_init_shm_manager(void); +#endif + +#endif

1 0

git:master:549c24f0: core: defines printed in version string adjusted for new memory manager
by Daniel-Constantin Mierla 14 Sep '15

14 Sep '15

Module: kamailio Branch: master Commit: 549c24f0b11d84dfa7c9cc829ced2298dd871bd2 URL: https://github.com/kamailio/kamailio/commit/549c24f0b11d84dfa7c9cc829ced229… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T10:22:46+02:00 core: defines printed in version string adjusted for new memory manager --- Modified: ver_defs.h --- Diff: https://github.com/kamailio/kamailio/commit/549c24f0b11d84dfa7c9cc829ced229… Patch: https://github.com/kamailio/kamailio/commit/549c24f0b11d84dfa7c9cc829ced229… --- diff --git a/ver_defs.h b/ver_defs.h index a0717ae..0ea87b9 100644 --- a/ver_defs.h +++ b/ver_defs.h @@ -135,6 +135,12 @@ #define F_MALLOC_STR "" #endif +#ifdef Q_MALLOC +#define Q_MALLOC_STR ", Q_MALLOC" +#else +#define Q_MALLOC_STR "" +#endif + #ifdef DL_MALLOC #define DL_MALLOC_STR ", DL_MALLOC" #else @@ -165,6 +171,12 @@ #define USE_SHM_MEM_STR "" #endif +#ifdef DBG_SR_MEMORY +#define DBG_SR_MEMORY_STR ", DBG_SR_MEMORY" +#else +#define DBG_SR_MEMORY_STR "" +#endif + #ifdef DBG_QM_MALLOC #define DBG_QM_MALLOC_STR ", DBG_QM_MALLOC" #else @@ -177,12 +189,6 @@ #define DBG_F_MALLOC_STR "" #endif -#ifdef DEBUG_DMALLOC -#define DEBUG_DMALLOC_STR ", DEBUG_DMALLOC" -#else -#define DEBUG_DMALLOC_STR "" -#endif - #ifdef DBG_SF_MALLOC #define DBG_SF_MALLOC_STR ", DBG_SF_MALLOC" #else @@ -332,15 +338,14 @@ #define SER_COMPILE_FLAGS \ STATS_STR EXTRA_DEBUG_STR USE_TCP_STR USE_TLS_STR \ - USE_SCTP_STR CORE_TLS_STR TLS_HOOKS_STR USE_RAW_SOCKS_STR \ + USE_SCTP_STR CORE_TLS_STR TLS_HOOKS_STR USE_RAW_SOCKS_STR \ DISABLE_NAGLE_STR USE_MCAST_STR NO_DEBUG_STR NO_LOG_STR \ - NO_SIG_DEBUG_STR DNS_IP_HACK_STR SHM_MEM_STR SHM_MMAP_STR PKG_MALLOC_STR \ - F_MALLOC_STR DL_MALLOC_STR SF_MALLOC_STR LL_MALLOC_STR TLSF_MALLOC_STR \ - USE_SHM_MEM_STR \ - DBG_QM_MALLOC_STR \ - DBG_F_MALLOC_STR DEBUG_DMALLOC_STR DBG_SF_MALLOC_STR DBG_LL_MALLOC_STR DBG_TLSF_MALLOC_STR \ - TIMER_DEBUG_STR \ - USE_FUTEX_STR \ + NO_SIG_DEBUG_STR DNS_IP_HACK_STR \ + USE_SHM_MEM_STR SHM_MEM_STR SHM_MMAP_STR PKG_MALLOC_STR \ + Q_MALLOC_STR F_MALLOC_STR DL_MALLOC_STR SF_MALLOC_STR LL_MALLOC_STR TLSF_MALLOC_STR \ + DBG_SR_MEMORY_STR DBG_QM_MALLOC_STR DBG_F_MALLOC_STR \ + DBG_SF_MALLOC_STR DBG_LL_MALLOC_STR DBG_TLSF_MALLOC_STR \ + TIMER_DEBUG_STR USE_FUTEX_STR \ FAST_LOCK_STR NOSMP_STR USE_PTHREAD_MUTEX_STR USE_POSIX_SEM_STR \ USE_SYSV_SEM_STR USE_COMP_STR USE_DNS_CACHE_STR USE_DNS_FAILOVER_STR \ DNS_WATCHDOG_SUPPORT_STR USE_NAPTR_STR USE_DST_BLACKLIST_STR \

1 0

git:master:e91bcf01: core: define to keep default shm memory pool size
by Daniel-Constantin Mierla 14 Sep '15

14 Sep '15

Module: kamailio Branch: master Commit: e91bcf01099fe97ecd09b49d7a441793ba67b5df URL: https://github.com/kamailio/kamailio/commit/e91bcf01099fe97ecd09b49d7a44179… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T10:22:45+02:00 core: define to keep default shm memory pool size --- Modified: config.h --- Diff: https://github.com/kamailio/kamailio/commit/e91bcf01099fe97ecd09b49d7a44179… Patch: https://github.com/kamailio/kamailio/commit/e91bcf01099fe97ecd09b49d7a44179… --- diff --git a/config.h b/config.h index 2bde88d..4083099 100644 --- a/config.h +++ b/config.h @@ -142,7 +142,7 @@ #define PKG_MEM_POOL_SIZE PKG_MEM_SIZE*1024*1024 /*!< used only if PKG_MALLOC is defined*/ #define SHM_MEM_SIZE 64 /*!< used if SH_MEM is defined*/ - +#define SHM_MEM_POOL_SIZE SHM_MEM_SIZE*1024*1024 /* dimensioning buckets in q_malloc */ /*! \brief size of the size2bucket table; everything beyond that asks for

1 0

git:master:0987dc72: core: share memory initialization updated for new memory management api
by Daniel-Constantin Mierla 14 Sep '15

14 Sep '15

Module: kamailio Branch: master Commit: 0987dc72474aea838592341e661b86cadad5a57b URL: https://github.com/kamailio/kamailio/commit/0987dc72474aea838592341e661b86c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T10:22:45+02:00 core: share memory initialization updated for new memory management api --- Modified: shm_init.c Modified: shm_init.h --- Diff: https://github.com/kamailio/kamailio/commit/0987dc72474aea838592341e661b86c… Patch: https://github.com/kamailio/kamailio/commit/0987dc72474aea838592341e661b86c… --- diff --git a/shm_init.c b/shm_init.c index 19e6117..a02eb04 100644 --- a/shm_init.c +++ b/shm_init.c @@ -22,11 +22,19 @@ */ #include "shm_init.h" -#include "mem/mem.h" +#include "mem/shm.h" #include "globals.h" static int shm_init = 0; +static char *shm_mname = 0; +/** + * + */ +void shm_set_mname(char *mname) +{ + shm_mname = mname; +} /** check if shm is initialized. * @return 1 if initialized, 0 if not @@ -62,9 +70,7 @@ int init_shm() goto error; } } - if (shm_mem_size == 0) - shm_mem_size=SHM_MEM_SIZE * 1024 * 1024; - if (init_shm_mallocs(shm_force_alloc)==-1) + if (shm_init_manager(shm_mname)<0) goto error; shm_init=1; return 0; diff --git a/shm_init.h b/shm_init.h index 60b233f..178800b 100644 --- a/shm_init.h +++ b/shm_init.h @@ -26,6 +26,7 @@ int shm_initialized(void); int init_shm(void); +void shm_set_mname(char *mname); #endif /*__shm_init_h*/

1 0

git:master:faa50860: mem: q_malloc updated to implement new pkg/shm management api
by Daniel-Constantin Mierla 14 Sep '15

14 Sep '15

Module: kamailio Branch: master Commit: faa50860320aa1cca5e9886ca58745eee7227c25 URL: https://github.com/kamailio/kamailio/commit/faa50860320aa1cca5e9886ca58745e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T10:22:45+02:00 mem: q_malloc updated to implement new pkg/shm management api --- Modified: mem/q_malloc.c Modified: mem/q_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/faa50860320aa1cca5e9886ca58745e… Patch: https://github.com/kamailio/kamailio/commit/faa50860320aa1cca5e9886ca58745e…

1 0

git:master:467a12b7: mem: f_malloc updated to implement new pkg/shm management api
by Daniel-Constantin Mierla 14 Sep '15

14 Sep '15

Module: kamailio Branch: master Commit: 467a12b72d5c107f89291042b578d708837e7a79 URL: https://github.com/kamailio/kamailio/commit/467a12b72d5c107f89291042b578d70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T10:22:45+02:00 mem: f_malloc updated to implement new pkg/shm management api --- Modified: mem/f_malloc.c Modified: mem/f_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/467a12b72d5c107f89291042b578d70… Patch: https://github.com/kamailio/kamailio/commit/467a12b72d5c107f89291042b578d70…

1 0

git:master:bf3e80bd: mem: old shm management disabled
by Daniel-Constantin Mierla 14 Sep '15

14 Sep '15

Module: kamailio Branch: master Commit: bf3e80bdf7110630c5343f2fb2a44a7689343875 URL: https://github.com/kamailio/kamailio/commit/bf3e80bdf7110630c5343f2fb2a44a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T10:22:45+02:00 mem: old shm management disabled --- Modified: mem/shm_mem.c Modified: mem/shm_mem.h --- Diff: https://github.com/kamailio/kamailio/commit/bf3e80bdf7110630c5343f2fb2a44a7… Patch: https://github.com/kamailio/kamailio/commit/bf3e80bdf7110630c5343f2fb2a44a7… --- diff --git a/mem/shm_mem.c b/mem/shm_mem.c index 2c58c44..8395cfd 100644 --- a/mem/shm_mem.c +++ b/mem/shm_mem.c @@ -25,6 +25,8 @@ #ifdef SHM_MEM +#if 0 + #include <stdlib.h> #include "shm_mem.h" @@ -266,3 +268,5 @@ unsigned long shm_available_safe() } #endif + +#endif diff --git a/mem/shm_mem.h b/mem/shm_mem.h index d31ce6b..35d6503 100644 --- a/mem/shm_mem.h +++ b/mem/shm_mem.h @@ -31,6 +31,10 @@ #ifndef shm_mem_h #define shm_mem_h +#include "shm.h" + +#if 0 + #include <string.h> #include <errno.h> #include <sys/types.h> @@ -337,6 +341,7 @@ do{\ */ unsigned long shm_available_safe(); +#endif #endif /* shm_mem_h */

1 0

git:master:50df0fee: mem: old pkg management disabled
by Daniel-Constantin Mierla 14 Sep '15

14 Sep '15

Module: kamailio Branch: master Commit: 50df0feecc34e9f0ec025482406688e1d4e19252 URL: https://github.com/kamailio/kamailio/commit/50df0feecc34e9f0ec025482406688e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-14T10:22:45+02:00 mem: old pkg management disabled --- Modified: mem/mem.c Modified: mem/mem.h --- Diff: https://github.com/kamailio/kamailio/commit/50df0feecc34e9f0ec025482406688e… Patch: https://github.com/kamailio/kamailio/commit/50df0feecc34e9f0ec025482406688e… --- diff --git a/mem/mem.c b/mem/mem.c index 18fb9af..30ba766 100644 --- a/mem/mem.c +++ b/mem/mem.c @@ -42,6 +42,8 @@ #include "shm_mem.h" #endif +#if 0 + #ifdef PKG_MALLOC #ifndef DL_MALLOC char* mem_pool = 0; @@ -130,3 +132,4 @@ int init_shm_mallocs(int force_alloc) #endif return 0; } +#endif diff --git a/mem/mem.h b/mem/mem.h index 432f29a..59d23d1 100644 --- a/mem/mem.h +++ b/mem/mem.h @@ -40,6 +40,9 @@ #include "../config.h" #include "../dprint.h" +#include "pkg.h" + +#if 0 /* fix debug defines, DBG_F_MALLOC <=> DBG_QM_MALLOC */ #ifdef F_MALLOC #ifdef DBG_F_MALLOC @@ -187,6 +190,7 @@ void destroy_pkg_mallocs(void); * \return 0 if the memory allocation was successful, -1 otherwise */ int init_shm_mallocs(int force_alloc); +#endif /** generic logging helper for allocation errors in private memory pool/ system */ #ifdef SYSTEM_MALLOC

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
39
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 2015