sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
387 discussions

git:master:1eafbaf5: mem/tlsf_malloc: updates to use new api names for module stats
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 1eafbaf5b2d25879225b8e4c4797285dba2d460f URL: https://github.com/kamailio/kamailio/commit/1eafbaf5b2d25879225b8e4c4797285… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-27T14:24:00+02:00 mem/tlsf_malloc: updates to use new api names for module stats --- Modified: mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/1eafbaf5b2d25879225b8e4c4797285… Patch: https://github.com/kamailio/kamailio/commit/1eafbaf5b2d25879225b8e4c4797285… --- diff --git a/mem/tlsf_malloc.c b/mem/tlsf_malloc.c index 534b2e2..85afcff 100644 --- a/mem/tlsf_malloc.c +++ b/mem/tlsf_malloc.c @@ -1358,8 +1358,8 @@ int tlsf_malloc_init_pkg_manager(void) ma.xavailable = tlsf_available; ma.xsums = tlsf_sums; ma.xdestroy = tlsf_malloc_destroy_pkg_manager; - ma.xstats = tlsf_mod_get_stats; - ma.xfstats = tlsf_mod_free_stats; + ma.xmodstats = tlsf_mod_get_stats; + ma.xfmodstats = tlsf_mod_free_stats; return pkg_init_api(&ma); } @@ -1508,8 +1508,8 @@ int tlsf_malloc_init_shm_manager(void) ma.xavailable = tlsf_shm_available; ma.xsums = tlsf_shm_sums; ma.xdestroy = tlsf_malloc_destroy_shm_manager; - ma.xstats = tlsf_mod_get_stats; - ma.xfstats = tlsf_mod_free_stats; + ma.xmodstats = tlsf_mod_get_stats; + ma.xfmodstats = tlsf_mod_free_stats; if(shm_init_api(&ma)<0) { LM_ERR("cannot initialize the core shm api\n");

1 0

git:master:8f2864b1: mem/q_malloc: updates to use new api names for module stats
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 8f2864b1845cfa2b520c0886e30d1f5df285eef6 URL: https://github.com/kamailio/kamailio/commit/8f2864b1845cfa2b520c0886e30d1f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-27T14:23:46+02:00 mem/q_malloc: updates to use new api names for module stats --- Modified: mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/8f2864b1845cfa2b520c0886e30d1f5… Patch: https://github.com/kamailio/kamailio/commit/8f2864b1845cfa2b520c0886e30d1f5… --- diff --git a/mem/q_malloc.c b/mem/q_malloc.c index 9826828..36cc15a 100644 --- a/mem/q_malloc.c +++ b/mem/q_malloc.c @@ -1032,8 +1032,8 @@ int qm_malloc_init_pkg_manager(void) ma.xavailable = qm_available; ma.xsums = qm_sums; ma.xdestroy = qm_malloc_destroy_pkg_manager; - ma.xstats = qm_mod_get_stats; - ma.xfstats = qm_mod_free_stats; + ma.xmodstats = qm_mod_get_stats; + ma.xfmodstats = qm_mod_free_stats; return pkg_init_api(&ma); } @@ -1183,8 +1183,8 @@ int qm_malloc_init_shm_manager(void) ma.xavailable = qm_shm_available; ma.xsums = qm_shm_sums; ma.xdestroy = qm_malloc_destroy_shm_manager; - ma.xstats = qm_mod_get_stats; - ma.xfstats = qm_mod_free_stats; + ma.xmodstats = qm_mod_get_stats; + ma.xfmodstats = qm_mod_free_stats; if(shm_init_api(&ma)<0) { LM_ERR("cannot initialize the core shm api\n");

1 0

git:master:ec15fc65: mem/f_malloc: updates to use new api names for module stats
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: ec15fc65bc6d38e74fdcf6a1fa6ef10053452365 URL: https://github.com/kamailio/kamailio/commit/ec15fc65bc6d38e74fdcf6a1fa6ef10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-27T14:23:02+02:00 mem/f_malloc: updates to use new api names for module stats --- Modified: mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/ec15fc65bc6d38e74fdcf6a1fa6ef10… Patch: https://github.com/kamailio/kamailio/commit/ec15fc65bc6d38e74fdcf6a1fa6ef10… --- diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 59f809e..6afe7f7 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -1067,8 +1067,8 @@ int fm_malloc_init_pkg_manager(void) ma.xavailable = fm_available; ma.xsums = fm_sums; ma.xdestroy = fm_malloc_destroy_pkg_manager; - ma.xstats = fm_mod_get_stats; - ma.xfstats = fm_mod_free_stats; + ma.xmodstats = fm_mod_get_stats; + ma.xfmodstats = fm_mod_free_stats; return pkg_init_api(&ma); } @@ -1218,8 +1218,8 @@ int fm_malloc_init_shm_manager(void) ma.xavailable = fm_shm_available; ma.xsums = fm_shm_sums; ma.xdestroy = fm_malloc_destroy_shm_manager; - ma.xstats = fm_mod_get_stats; - ma.xfstats = fm_mod_free_stats; + ma.xmodstats = fm_mod_get_stats; + ma.xfmodstats = fm_mod_free_stats; if(shm_init_api(&ma)<0) { LM_ERR("cannot initialize the core shm api\n");

1 0

git:master:26dbc87a: core: mem/shm - use module stats fields for init of managers
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 26dbc87aac8d117bf0928eb2124ecc91e512e20f URL: https://github.com/kamailio/kamailio/commit/26dbc87aac8d117bf0928eb2124ecc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-27T14:22:37+02:00 core: mem/shm - use module stats fields for init of managers --- Modified: mem/shm.c --- Diff: https://github.com/kamailio/kamailio/commit/26dbc87aac8d117bf0928eb2124ecc9… Patch: https://github.com/kamailio/kamailio/commit/26dbc87aac8d117bf0928eb2124ecc9… --- diff --git a/mem/shm.c b/mem/shm.c index 94a9915..e4f4ad6 100644 --- a/mem/shm.c +++ b/mem/shm.c @@ -221,8 +221,8 @@ int shm_init_api(sr_shm_api_t *ap) _shm_root.xavailable = ap->xavailable; _shm_root.xsums = ap->xsums; _shm_root.xdestroy = ap->xdestroy; - _shm_root.xstats = ap->xstats; - _shm_root.xfstats = ap->xfstats; + _shm_root.xmodstats = ap->xmodstats; + _shm_root.xfmodstats = ap->xfmodstats; return 0; }

1 0

git:master:b568c653: core: mem/pkg - use module stats fields for init of managers
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: b568c6533670b1400f7c12bd13169d41542c351a URL: https://github.com/kamailio/kamailio/commit/b568c6533670b1400f7c12bd13169d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-27T14:21:55+02:00 core: mem/pkg - use module stats fields for init of managers q --- Modified: mem/pkg.c --- Diff: https://github.com/kamailio/kamailio/commit/b568c6533670b1400f7c12bd13169d4… Patch: https://github.com/kamailio/kamailio/commit/b568c6533670b1400f7c12bd13169d4… --- diff --git a/mem/pkg.c b/mem/pkg.c index a4f0906..53166ac 100644 --- a/mem/pkg.c +++ b/mem/pkg.c @@ -46,8 +46,8 @@ int pkg_init_api(sr_pkg_api_t *ap) _pkg_root.xavailable = ap->xavailable; _pkg_root.xsums = ap->xsums; _pkg_root.xdestroy = ap->xdestroy; - _pkg_root.xstats = ap->xstats; - _pkg_root.xfstats = ap->xfstats; + _pkg_root.xmodstats = ap->xmodstats; + _pkg_root.xfmodstats = ap->xfmodstats; return 0; }

1 0

git:master:50ac46bf: core - mem: renamed api fields for module stats to repleft the purpose
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 50ac46bfc233531f9f4be22be4aee07a8faa0325 URL: https://github.com/kamailio/kamailio/commit/50ac46bfc233531f9f4be22be4aee07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-27T14:21:12+02:00 core - mem: renamed api fields for module stats to repleft the purpose --- Modified: mem/memapi.h --- Diff: https://github.com/kamailio/kamailio/commit/50ac46bfc233531f9f4be22be4aee07… Patch: https://github.com/kamailio/kamailio/commit/50ac46bfc233531f9f4be22be4aee07… --- diff --git a/mem/memapi.h b/mem/memapi.h index 9f918f3..28e9f86 100644 --- a/mem/memapi.h +++ b/mem/memapi.h @@ -79,9 +79,9 @@ typedef struct sr_pkg_api { /*memory destroy manager*/ sr_mem_destroy_f xdestroy; /*memory stats per module*/ - sr_mem_mod_get_stats_f xstats; + sr_mem_mod_get_stats_f xmodstats; /*memory stats free per module*/ - sr_mem_mod_free_stats_f xfstats; + sr_mem_mod_free_stats_f xfmodstats; } sr_pkg_api_t; /*shared memory api*/ @@ -115,9 +115,9 @@ typedef struct sr_shm_api { /*memory destroy manager*/ sr_mem_destroy_f xdestroy; /*memory stats per module*/ - sr_mem_mod_get_stats_f xstats; + sr_mem_mod_get_stats_f xmodstats; /*memory stats free per module*/ - sr_mem_mod_free_stats_f xfstats; + sr_mem_mod_free_stats_f xfmodstats; } sr_shm_api_t; #endif

1 0

git:master:5d903fd4: tm: coherent indentation
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 5d903fd40a9e89d601be25df282a008ba8ba421e URL: https://github.com/kamailio/kamailio/commit/5d903fd40a9e89d601be25df282a008… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-27T12:04:47+02:00 tm: coherent indentation - removed historical top comments --- Modified: modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/5d903fd40a9e89d601be25df282a008… Patch: https://github.com/kamailio/kamailio/commit/5d903fd40a9e89d601be25df282a008…

1 0

git:master:b27384a0: p_usrloc: free allocated items in case of no more memory during domain add
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: b27384a0a7c6567a9ecebab3f987079ad0ff7366 URL: https://github.com/kamailio/kamailio/commit/b27384a0a7c6567a9ecebab3f987079… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-27T11:48:33+02:00 p_usrloc: free allocated items in case of no more memory during domain add --- Modified: modules/p_usrloc/dlist.c --- Diff: https://github.com/kamailio/kamailio/commit/b27384a0a7c6567a9ecebab3f987079… Patch: https://github.com/kamailio/kamailio/commit/b27384a0a7c6567a9ecebab3f987079… --- diff --git a/modules/p_usrloc/dlist.c b/modules/p_usrloc/dlist.c index 5c16508..75914f5 100644 --- a/modules/p_usrloc/dlist.c +++ b/modules/p_usrloc/dlist.c @@ -52,7 +52,7 @@ static inline struct domain_list_item * find_dlist (str *name) { for (item = domain_list; item != NULL; item = item->next) { if (item->name.len == name->len - && memcmp (item->name.s, name->s, name->len) == 0) { + && memcmp (item->name.s, name->s, name->len) == 0) { return item; } } @@ -64,16 +64,17 @@ static inline struct domain_list_item * find_dlist (str *name) { static inline struct domain_list_item * add_to_dlist (str *name, int type) { struct domain_list_item *item; - int i; + int i; item = (struct domain_list_item *) - pkg_malloc (sizeof (struct domain_list_item)); + pkg_malloc (sizeof (struct domain_list_item)); if (item == NULL) { - LM_ERR("Out of shared memory.\n"); + LM_ERR("Out of pkg memory.\n"); return NULL; } item->name.s = (char *) pkg_malloc (name->len + 1); if (item->name.s == NULL) { - LM_ERR("Out of shared memory.\n"); + LM_ERR("Out of pkg memory (1).\n"); + pkg_free(item); return NULL; } memcpy (item->name.s, name->s, name->len); @@ -86,7 +87,9 @@ static inline struct domain_list_item * add_to_dlist (str *name, int type) { item->domain.table = (hslot_t*)pkg_malloc(sizeof(hslot_t) * ul_hash_size); if (!item->domain.table) { - LM_ERR("no memory left 2\n"); + LM_ERR("Out of pkg memory (2)\n"); + pkg_free(item->name.s); + pkg_free(item); return NULL; }

1 0

git:master:33fe5e38: core: mem - export pkg api even when using system malloc
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 33fe5e38d2eefc2244eccb6279c082a789ed0307 URL: https://github.com/kamailio/kamailio/commit/33fe5e38d2eefc2244eccb6279c082a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-27T11:39:09+02:00 core: mem - export pkg api even when using system malloc --- Modified: Makefile.defs Modified: mem/pkg.h --- Diff: https://github.com/kamailio/kamailio/commit/33fe5e38d2eefc2244eccb6279c082a… Patch: https://github.com/kamailio/kamailio/commit/33fe5e38d2eefc2244eccb6279c082a… --- diff --git a/Makefile.defs b/Makefile.defs index 3f3d830..9613136 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -626,7 +626,6 @@ C_DEFS= $(extra_defs) \ -DSER_VER=$(SER_VER) \ -DCFG_DIR='"$(cfg_target)"'\ -DRUN_DIR='"$(run_target)"'\ - -DPKG_MALLOC \ -DSHM_MEM -DSHM_MMAP \ -DDNS_IP_HACK \ -DUSE_MCAST \ diff --git a/mem/pkg.h b/mem/pkg.h index 82e430a..eb07bd2 100644 --- a/mem/pkg.h +++ b/mem/pkg.h @@ -20,12 +20,17 @@ #ifndef _sr_pkg_h_ #define _sr_pkg_h_ -#ifdef PKG_MALLOC - #include "memapi.h" extern sr_pkg_api_t _pkg_root; +int pkg_init_api(sr_pkg_api_t *ap); +int pkg_init_manager(char *name); +void pkg_destroy_manager(void); +void pkg_print_manager(void); + +#ifdef PKG_MALLOC + #ifdef DBG_SR_MEMORY # define pkg_malloc(s) _pkg_root.xmalloc(_pkg_root.mem_block, (s), _SRC_LOC_, \ _SRC_FUNCTION_, _SRC_LINE_, _SRC_MODULE_) @@ -46,11 +51,6 @@ extern sr_pkg_api_t _pkg_root; # define pkg_mod_get_stats(x) _pkg_root.xstats(_pkg_root.mem_block, x) # define pkg_mod_free_stats(x) _pkg_root.xfstats(x) -int pkg_init_api(sr_pkg_api_t *ap); -int pkg_init_manager(char *name); -void pkg_destroy_manager(void); -void pkg_print_manager(void); - #else /*PKG_MALLOC*/ /* use system allocator */ # include <stdlib.h> @@ -74,6 +74,8 @@ void pkg_print_manager(void); # define pkg_info(mi) do{ memset((mi),0, sizeof(*(mi))); } while(0) # define pkg_available() 0 # define pkg_sums() do{}while(0) +# define pkg_mod_get_stats(x) do{}while(0) +# define pkg_mod_free_stats(x) do{}while(0) #endif /*PKG_MALLOC*/ #endif

1 0

git:master:07dbe369: presence: remove jumping to error from error in update_presentity()
by Daniel-Constantin Mierla 28 Mar '16

28 Mar '16

Module: kamailio Branch: master Commit: 07dbe3697bcad18f5766fc0d71a7fc48ff8a26d0 URL: https://github.com/kamailio/kamailio/commit/07dbe3697bcad18f5766fc0d71a7fc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-27T11:38:17+02:00 presence: remove jumping to error from error in update_presentity() - coherent indentation --- Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/07dbe3697bcad18f5766fc0d71a7fc4… Patch: https://github.com/kamailio/kamailio/commit/07dbe3697bcad18f5766fc0d71a7fc4…

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
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 March 2016