sr-dev April 2015

sr-dev@lists.kamailio.org

36 participants
248 discussions

[kamailio] integrate TLSF for pkg mem (#139)
by Camille Oudot 24 Apr '15

24 Apr '15

following patches add TSLF support for pkg memory, and easier TLSF selection at compile time You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/139 -- Commit Summary -- * mem: TLSF integration for pkg memory * mem: TLSF compile-time selection improvement -- File Changes -- M Makefile.defs (6) M mem/mem.c (4) M mem/mem.h (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/139.patch https://github.com/kamailio/kamailio/pull/139.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/139

2 2

git:master:5e045154: mem: TLSF use larger first level bitmap
by Camille Oudot 24 Apr '15

24 Apr '15

Module: kamailio Branch: master Commit: 5e04515410c7d7ebedf6c4bc8c917f736b37acba URL: https://github.com/kamailio/kamailio/commit/5e04515410c7d7ebedf6c4bc8c917f7… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-04-24T11:26:36+02:00 mem: TLSF use larger first level bitmap The current settings on 64 bits arch require a 33 bits wide first level bitmap. Use unsigned long instead of int. --- Modified: mem/tlsf.c --- Diff: https://github.com/kamailio/kamailio/commit/5e04515410c7d7ebedf6c4bc8c917f7… Patch: https://github.com/kamailio/kamailio/commit/5e04515410c7d7ebedf6c4bc8c917f7… --- diff --git a/mem/tlsf.c b/mem/tlsf.c index 124409e..ac76be8 100644 --- a/mem/tlsf.c +++ b/mem/tlsf.c @@ -167,7 +167,15 @@ typedef struct control_t size_t max_fragments; #endif /* Bitmaps for free lists. */ +#if defined (TLSF_64BIT) +# define TLSF_FL_ZERO 0L +# define TLSF_FL_ONE 1L + unsigned long fl_bitmap; +#else +# define TLSF_FL_ZERO 0 +# define TLSF_FL_ONE 1 unsigned int fl_bitmap; +#endif unsigned int sl_bitmap[FL_INDEX_COUNT]; /* Head of free lists. */ @@ -366,7 +374,7 @@ static block_header_t* search_suitable_block(control_t* control, int* fli, int* if (!sl_map) { /* No block exists. Search in the next largest first-level list. */ - const unsigned int fl_map = control->fl_bitmap & (~0 << (fl + 1)); + const unsigned int fl_map = control->fl_bitmap & (~TLSF_FL_ZERO << (fl + 1)); if (!fl_map) { /* No free blocks available, memory has been exhausted. */ @@ -408,7 +416,7 @@ static void remove_free_block(control_t* control, block_header_t* block, int fl, /* If the second bitmap is now empty, clear the fl bitmap. */ if (!control->sl_bitmap[fl]) { - control->fl_bitmap &= ~(1 << fl); + control->fl_bitmap &= ~(TLSF_FL_ONE << fl); } } } @@ -434,7 +442,7 @@ static void insert_free_block(control_t* control, block_header_t* block, int fl, ** and second-level bitmaps appropriately. */ control->blocks[fl][sl] = block; - control->fl_bitmap |= (1 << fl); + control->fl_bitmap |= (TLSF_FL_ONE << fl); control->sl_bitmap[fl] |= (1 << sl); #if defined TLSF_STATS TLSF_INCREASE_FRAGMENTS(control); @@ -613,7 +621,7 @@ static void control_construct(control_t* control) control->block_null.next_free = &control->block_null; control->block_null.prev_free = &control->block_null; - control->fl_bitmap = 0; + control->fl_bitmap = TLSF_FL_ZERO; for (i = 0; i < FL_INDEX_COUNT; ++i) { control->sl_bitmap[i] = 0; @@ -664,7 +672,7 @@ int tlsf_check(tlsf_t tlsf) { for (j = 0; j < SL_INDEX_COUNT; ++j) { - const int fl_map = control->fl_bitmap & (1 << i); + const int fl_map = control->fl_bitmap & (TLSF_FL_ONE << i); const int sl_list = control->sl_bitmap[i]; const int sl_map = sl_list & (1 << j); const block_header_t* block = control->blocks[i][j];

1 0

[kamailio] UAC module - registration not retried if there is no response to request (#124)
by AndyJRobinson 23 Apr '15

23 Apr '15

Running Kamailio 4.2.3. When the UAC module sends a registration request, it sets the UAC_REG_ONGOING flag in reg->flags. If there is no response to the request, the flag is never cleared, so all future calls to uac_reg_update return without ever retrying the request. That is, the registration becomes "stuck" in the UAC_REG_ONGOING state forever. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/124

2 3

Kamailio World for students
by Daniel-Constantin Mierla 23 Apr '15

23 Apr '15

Hello, given the roots and the tight relation of Kamailio project with the academic environment, we are offering three seats at Kamailio World Conference, May 27029, 2015, in Berlin, to students enrolled in universities or research institutes (both bachelor and PhD programs qualify). Last year we tried it locally with the universities in Berlin and this year we want to extend it, as there might be young people interested to travel a bit and attend the event. If you are a student and want to participate, email me directly (miconda(a)gmail.com) or to registration(a)kamailio.org . Participation to all the content of the event (workshops, conference and social event) is free, but you will have to take care of expenses for traveling and accommodation. Write a short description about your interest in real time communications and what is the university or the research institute you are affiliate to. Also, if you are not a student, but you are in touch with some or have access to students forums/mailing lists, it will be very appreciated if you forward these details. More information about Kamailio World is available on the web site: - http://www.kamailioworld.com Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, May 27-29, 2015 Berlin, Germany - http://www.kamailioworld.com

1 0

git:tmp/TLSF_pkg:636c6f96: mem: TLSF compile-time selection improvement
by Camille Oudot 23 Apr '15

23 Apr '15

Module: kamailio Branch: tmp/TLSF_pkg Commit: 636c6f96d84be559a09251ba87322b685e28f9b0 URL: https://github.com/kamailio/kamailio/commit/636c6f96d84be559a09251ba87322b6… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-04-23T17:28:18+02:00 mem: TLSF compile-time selection improvement now use make MEMMNG=2 cfg to switch to TLSF malloc --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/636c6f96d84be559a09251ba87322b6… Patch: https://github.com/kamailio/kamailio/commit/636c6f96d84be559a09251ba87322b6… --- diff --git a/Makefile.defs b/Makefile.defs index ef419d9..313b10e 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -102,6 +102,7 @@ EXTRAVERSION = -pre0 # memory manager switcher # 0 - f_malloc (fast malloc) # 1 - q_malloc (quick malloc) +# 2 - tlsf_malloc (O(1) malloc and free) MEMMNG ?= 0 # memory debugger switcher # 0 - off (no-debug mode) @@ -501,6 +502,8 @@ data_target = $(prefix)/$(data_dir) # (not true anymore, q_malloc performs approx. the same) # -DF_MALLOC # an even faster malloc, not recommended for debugging +# -DTLSF_MALLOC=1 +# an implemetation of the "two levels segregation fit" malloc algorithm # -DDL_MALLOC # a malloc implementation based on Doug Lea's dl_malloc # -DSF_MALLOC @@ -662,6 +665,9 @@ 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 else # use f_malloc C_DEFS+= -DF_MALLOC

1 0

git:tmp/TLSF_pkg:63b7c711: mem: TLSF integration for pkg memory
by Camille Oudot 23 Apr '15

23 Apr '15

Module: kamailio Branch: tmp/TLSF_pkg Commit: 63b7c711c26557b7caafb76b98a89e6b28ec3593 URL: https://github.com/kamailio/kamailio/commit/63b7c711c26557b7caafb76b98a89e6… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-04-23T17:28:18+02:00 mem: TLSF integration for pkg memory --- Modified: mem/mem.c Modified: mem/mem.h --- Diff: https://github.com/kamailio/kamailio/commit/63b7c711c26557b7caafb76b98a89e6… Patch: https://github.com/kamailio/kamailio/commit/63b7c711c26557b7caafb76b98a89e6… --- diff --git a/mem/mem.c b/mem/mem.c index ac7ddc8..18fb9af 100644 --- a/mem/mem.c +++ b/mem/mem.c @@ -51,6 +51,8 @@ struct fm_block* mem_block = 0; #elif defined DL_MALLOC /* don't need this */ + #elif defined TLSF_MALLOC + tlsf_t mem_block = 0; #else struct qm_block* mem_block = 0; #endif @@ -75,6 +77,8 @@ int init_pkg_mallocs(void) mem_block=fm_malloc_init(mem_pool, pkg_mem_size, MEM_TYPE_PKG); #elif DL_MALLOC /* don't need this */ + #elif TLSF_MALLOC + mem_block = tlsf_create_with_pool(mem_pool, pkg_mem_size); #else if (mem_pool) mem_block=qm_malloc_init(mem_pool, pkg_mem_size, MEM_TYPE_PKG); diff --git a/mem/mem.h b/mem/mem.h index d90fcf4..9db8d93 100644 --- a/mem/mem.h +++ b/mem/mem.h @@ -57,6 +57,9 @@ extern struct fm_block* mem_block; # elif defined DL_MALLOC # include "dl_malloc.h" +# elif defined TLSF_MALLOC +# include "tlsf.h" + extern tlsf_t mem_block; # else # include "q_malloc.h" extern struct qm_block* mem_block; @@ -92,6 +95,10 @@ # define pkg_malloc(s) dlmalloc((s)) # define pkg_realloc(p, s) dlrealloc((p), (s)) # define pkg_free(p) dlfree((p)) +# elif defined TLSF_MALLOC +# define pkg_malloc(s) tlsf_malloc(mem_block, (s)) +# define pkg_realloc(p, s) tlsf_realloc(mem_block, (p), (s)) +# define pkg_free(p) tlsf_free(mem_block, (p)) # else # define pkg_malloc(s) qm_malloc(mem_block, (s)) # define pkg_realloc(p, s) qm_realloc(mem_block, (p), (s)) @@ -108,6 +115,11 @@ # define pkg_info(mi) 0 # define pkg_available() 0 # define pkg_sums() 0 +# elif defined TLSF_MALLOC +# define pkg_status() ((void) 0) +# define pkg_info(mi) tlsf_meminfo(mem_block, (mi)) +# define pkg_available() ((void) 0) +# define pkg_sums() ((void) 0) # else # define pkg_status() qm_status(mem_block) # define pkg_info(mi) qm_info(mem_block, mi)

1 0

git:master:144da7f3: mem: TLSF fix max fragments macro
by Camille Oudot 23 Apr '15

23 Apr '15

Module: kamailio Branch: master Commit: 144da7f3aef010bb6c51b93c399875c233500189 URL: https://github.com/kamailio/kamailio/commit/144da7f3aef010bb6c51b93c399875c… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-04-23T17:28:18+02:00 mem: TLSF fix max fragments macro --- Modified: mem/tlsf.c --- Diff: https://github.com/kamailio/kamailio/commit/144da7f3aef010bb6c51b93c399875c… Patch: https://github.com/kamailio/kamailio/commit/144da7f3aef010bb6c51b93c399875c… --- diff --git a/mem/tlsf.c b/mem/tlsf.c index 3b494d0..124409e 100644 --- a/mem/tlsf.c +++ b/mem/tlsf.c @@ -150,7 +150,7 @@ static const size_t block_size_max = tlsf_cast(size_t, 1) << FL_INDEX_MAX; #ifdef TLSF_STATS #define TLSF_INCREASE_REAL_USED(control, increment) do {control->real_used += (increment) ; control->max_used = tlsf_max(control->real_used, control->max_used);}while(0) - #define TLSF_INCREASE_FRAGMENTS(control) do {control->fragments++ ; control->fragments = tlsf_max(control->fragments, control->max_fragments);}while(0) + #define TLSF_INCREASE_FRAGMENTS(control) do {control->fragments++ ; control->max_fragments = tlsf_max(control->fragments, control->max_fragments);}while(0) #endif /* The TLSF control structure. */

1 0

[kamailio] permissions "trustedReload" fails (#138)
by Emmanuel Schmidbauer 23 Apr '15

23 Apr '15

I'm running latest kamailio version (as of today) from the git Using postgres 9.4 db backend. When I do "trustedReload" output is as follows: root@ua01-proxy01:~# kamctl kamcmd permissions.trustedReload error: 500 - Reload failed. and kamailio log shows: Apr 22 10:16:21 ua01-proxy01 /usr/sbin/kamailio[20252]: ERROR: permissions [trusted.c:78]: reload_trusted_table(): no connection to database Apr 22 10:16:25 ua01-proxy01 /usr/sbin/kamailio[20252]: ERROR: permissions [trusted.c:78]: reload_trusted_table(): no connection to database} Only way for me to reload database is to restart kamailio. Thanks, Emmanuel --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/138

2 3

git:master:48663e42: permissions: fixed reload trusted rpc command
by Daniel-Constantin Mierla 23 Apr '15

23 Apr '15

Module: kamailio Branch: master Commit: 48663e4239f819b42e7035d9f4023c161eb71d05 URL: https://github.com/kamailio/kamailio/commit/48663e4239f819b42e7035d9f4023c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-23T16:34:35+02:00 permissions: fixed reload trusted rpc command - reported by Emmanuel Schmidbauer, GH#138 --- Modified: modules/permissions/mi.c Modified: modules/permissions/trusted.c Modified: modules/permissions/trusted.h --- Diff: https://github.com/kamailio/kamailio/commit/48663e4239f819b42e7035d9f4023c1… Patch: https://github.com/kamailio/kamailio/commit/48663e4239f819b42e7035d9f4023c1… --- diff --git a/modules/permissions/mi.c b/modules/permissions/mi.c index 9f66683..35f2cca 100644 --- a/modules/permissions/mi.c +++ b/modules/permissions/mi.c @@ -54,11 +54,7 @@ struct mi_root* mi_trusted_reload(struct mi_root *cmd_tree, void *param) * RPC function to reload trusted table */ void rpc_trusted_reload(rpc_t* rpc, void* c) { - if (hash_table==NULL) { - rpc->fault(c, 500, "Reload failed. No hash table"); - return; - } - if (reload_trusted_table () != 1) { + if (reload_trusted_table_cmd () != 1) { rpc->fault(c, 500, "Reload failed."); return; } diff --git a/modules/permissions/trusted.c b/modules/permissions/trusted.c index 920f307..db20e8f 100644 --- a/modules/permissions/trusted.c +++ b/modules/permissions/trusted.c @@ -555,3 +555,24 @@ int allow_trusted_2(struct sip_msg* _msg, char* _src_ip_sp, char* _proto_sp) return -1; } + +int reload_trusted_table_cmd(void) +{ + if (!db_handle) { + db_handle = perm_dbf.init(&db_url); + if (!db_handle) { + LM_ERR("unable to connect database\n"); + return -1; + } + } + if (reload_trusted_table () != 1) { + perm_dbf.close(db_handle); + db_handle = 0; + return -1; + } + + perm_dbf.close(db_handle); + db_handle = 0; + + return 1; +} diff --git a/modules/permissions/trusted.h b/modules/permissions/trusted.h index cbb3655..f487f6a 100644 --- a/modules/permissions/trusted.h +++ b/modules/permissions/trusted.h @@ -84,4 +84,6 @@ int allow_trusted_0(struct sip_msg* _msg, char* str1, char* str2); int allow_trusted_2(struct sip_msg* _msg, char* _src_ip_sp, char* _proto_sp); +int reload_trusted_table_cmd(void); + #endif /* TRUSTED_H */

1 0

[kamailio] permissions "trustedDump" outputs to strange characters (#137)
by Emmanuel Schmidbauer 23 Apr '15

23 Apr '15

I'm running latest kamailio version (as of today) from the git Using postgres 9.4 db backend. When I do "trustedDump" output is strange. Example: root@ua01-proxy01:~# kamctl kamcmd permissions.trustedDump { table: 27 item: { ip: 10.10.5.112úæ¼ÿÿÿÿÿÿÿÿ proto: 0 pattern: NULL tag: peer } table: 31 item: { ip: 10.10.1.112(‘¹‚÷ m»‚j ÉUŠ´'æ -_-+-: 0 -a++e_+: NULL +ag: -ee_ } +ab+e: 48 i+e+: { i-: 192.168.159.10 -_-+-: 0 -a++e_+: NULL +ag: -ee_ } +ab+e: 70 i+e+: { i-: 192.168.157.10 -_-+-: 0 -a++e_+: NULL +ag: -ee_ } +ab+e: 74 i+e+: { i-: 192.168.101.154 -_-+-: 0 -a++e_+: NULL +ag: f_01 } +ab+e: 75 i+e+: { i-: 192.168.101.155 -_-+-: 0 -a++e_+: NULL +ag: f_02 } } --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/137

3 4

← Newer
1
2
3
4
5
6
7
8
9
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2015