sr-dev April 2015

sr-dev@lists.kamailio.org

36 participants
248 discussions

git:master:92dcf770: mem: TLSF allocator integration in kamailio
by Camille Oudot 22 Apr '15

22 Apr '15

Module: kamailio Branch: master Commit: 92dcf770474436ece25a775ed81cb70d23902064 URL: https://github.com/kamailio/kamailio/commit/92dcf770474436ece25a775ed81cb70… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-04-22T10:19:11+02:00 mem: TLSF allocator integration in kamailio - kamailio memory counters for statistics - use MEMMNG=1 MEMDBG=0 extra_defs='-DTLSF_MALLOC=1 to enable - support for > 4GB memory (current limit is now 1TB) --- Modified: mem/shm_mem.c Modified: mem/shm_mem.h Modified: mem/tlsf.c Modified: mem/tlsf.h --- Diff: https://github.com/kamailio/kamailio/commit/92dcf770474436ece25a775ed81cb70… Patch: https://github.com/kamailio/kamailio/commit/92dcf770474436ece25a775ed81cb70…

1 0

git:master:257af3bc: mem: introducing TLSF malloc
by Camille Oudot 22 Apr '15

22 Apr '15

Module: kamailio Branch: master Commit: 257af3bcbabd8e1466b981c8a3edb43de8df4ee8 URL: https://github.com/kamailio/kamailio/commit/257af3bcbabd8e1466b981c8a3edb43… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-04-22T10:10:24+02:00 mem: introducing TLSF malloc TLSF is a real-time oriented dynamic allocator, with O(1) malloc() and free() costs --- Added: mem/Readme.tlsf.txt Added: mem/tlsf.c Added: mem/tlsf.h Added: mem/tlsfbits.h --- Diff: https://github.com/kamailio/kamailio/commit/257af3bcbabd8e1466b981c8a3edb43… Patch: https://github.com/kamailio/kamailio/commit/257af3bcbabd8e1466b981c8a3edb43…

1 0

new memory allocator proposal: TLSF
by Camille Oudot 22 Apr '15

22 Apr '15

Hi, == Short story: Currently, there is a (corner case) performance issue in kamailio when lots of fragments of about the same size are freed in a short time. == Long story: I've recently hit a wall using kamailio, dealing with ~150k TLS connections in parallel: when I stop my injector (sipp), all the connections are closed at the same time. The TCP main process took ~20 minutes to dispose of all the objects, and was unable to accept any new connection in the meantime. The bottleneck lies in the shm_free() code (whether f_malloc or q_malloc is used), when a free fragment is be inserted in an ordered linked list (which is O(n) if n is the size of the list). Enabling mem_join did help a little (less fragments, shorter lists), and the 150k disconnections scenario went down to ~5 minutes unavailability for the TCP main process. But this is still big. == TLSF: I looked for alternatives to f/q_malloc, and I found TLSF: * http://www.gii.upv.es/tlsf/ This allocator has O(1) malloc and free even in every case. This means no surprise like the one I had previously. I took the implementation found here: * http://tlsf.baisoku.org/ and integrated it in kamailio. My 150k disconnections scenario went down to 12 seconds, and the fragmentation is as good as q_malloc() with mem_join. I've published a branch with TLSF here: * https://github.com/kamailio/kamailio/commits/tmp/TLSF_malloc What do you think of integrating it in kamailio? By the way, I've tried to play with dl_malloc, ll_malloc and sf_malloc, but none of these currently compile. Should we maintain them or remove them from the codebase? -- Camille

3 3

git:master:7488275e: modules/ims_qos: subscribe to DLG_FAILED callback
by Richard Good 22 Apr '15

22 Apr '15

Module: kamailio Branch: master Commit: 7488275e059efe48704b821991c6598f43d3a556 URL: https://github.com/kamailio/kamailio/commit/7488275e059efe48704b821991c6598… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-04-22T11:10:46+02:00 modules/ims_qos: subscribe to DLG_FAILED callback --- Modified: modules/ims_qos/mod.c Modified: modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/7488275e059efe48704b821991c6598… Patch: https://github.com/kamailio/kamailio/commit/7488275e059efe48704b821991c6598… --- diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index a59caa4..78010cb 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -362,8 +362,8 @@ void callback_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params * para LM_DBG("Dialog callback of type %d received\n", type); - if(type == DLGCB_TERMINATED || type == DLGCB_DESTROY || type == DLGCB_EXPIRED){ - LM_DBG("Dialog has ended - we need to terminate Rx bearer session\n"); + if(type == DLGCB_TERMINATED || type == DLGCB_DESTROY || type == DLGCB_EXPIRED || type == DLGCB_FAILED){ + LM_DBG("Dialog has ended or failed - we need to terminate Rx bearer session\n"); LM_DBG("Received notification of termination of dialog with Rx session ID: [%.*s]\n", rx_session_id->len, rx_session_id->s); diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c index 233fb66..fcc91de 100644 --- a/modules/ims_qos/rx_aar.c +++ b/modules/ims_qos/rx_aar.c @@ -154,7 +154,7 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps STR_SHM_DUP(*passed_rx_session_id, aaa->sessionId->data, "cb_passed_rx_session_id"); LM_DBG("passed rx session id [%.*s]", passed_rx_session_id->len, passed_rx_session_id->s); - dlgb.register_dlgcb_nodlg(&data->callid, &data->ftag, &data->ttag, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); + dlgb.register_dlgcb_nodlg(&data->callid, &data->ftag, &data->ttag, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); } result = CSCF_RETURN_TRUE; } else {

1 0

git:tmp/TLSF_malloc:92dcf770: mem: TLSF allocator integration in kamailio
by Camille Oudot 22 Apr '15

22 Apr '15

Module: kamailio Branch: tmp/TLSF_malloc Commit: 92dcf770474436ece25a775ed81cb70d23902064 URL: https://github.com/kamailio/kamailio/commit/92dcf770474436ece25a775ed81cb70… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-04-22T10:19:11+02:00 mem: TLSF allocator integration in kamailio - kamailio memory counters for statistics - use MEMMNG=1 MEMDBG=0 extra_defs='-DTLSF_MALLOC=1 to enable - support for > 4GB memory (current limit is now 1TB) --- Modified: mem/shm_mem.c Modified: mem/shm_mem.h Modified: mem/tlsf.c Modified: mem/tlsf.h --- Diff: https://github.com/kamailio/kamailio/commit/92dcf770474436ece25a775ed81cb70… Patch: https://github.com/kamailio/kamailio/commit/92dcf770474436ece25a775ed81cb70…

1 0

git:tmp/TLSF_malloc:257af3bc: mem: introducing TLSF malloc
by Camille Oudot 22 Apr '15

22 Apr '15

Module: kamailio Branch: tmp/TLSF_malloc Commit: 257af3bcbabd8e1466b981c8a3edb43de8df4ee8 URL: https://github.com/kamailio/kamailio/commit/257af3bcbabd8e1466b981c8a3edb43… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-04-22T10:10:24+02:00 mem: introducing TLSF malloc TLSF is a real-time oriented dynamic allocator, with O(1) malloc() and free() costs --- Added: mem/Readme.tlsf.txt Added: mem/tlsf.c Added: mem/tlsf.h Added: mem/tlsfbits.h --- Diff: https://github.com/kamailio/kamailio/commit/257af3bcbabd8e1466b981c8a3edb43… Patch: https://github.com/kamailio/kamailio/commit/257af3bcbabd8e1466b981c8a3edb43…

1 0

git:master:287884ba: acc: update schema and version
by mikomarrache 22 Apr '15

22 Apr '15

Module: kamailio Branch: master Commit: 287884ba9183da3eed2eb4fba1e31d287730fe26 URL: https://github.com/kamailio/kamailio/commit/287884ba9183da3eed2eb4fba1e31d2… Author: mikomarrache <mikomarrache(a)users.noreply.github.com> Committer: mikomarrache <mikomarrache(a)users.noreply.github.com> Date: 2015-04-14T20:37:37+03:00 acc: update schema and version Change type of columns: -> start_time and end_time as datetime -> duration as float Also increment version of acc_cdrs table. --- Modified: lib/srdb1/schema/acc_cdrs.xml --- Diff: https://github.com/kamailio/kamailio/commit/287884ba9183da3eed2eb4fba1e31d2… Patch: https://github.com/kamailio/kamailio/commit/287884ba9183da3eed2eb4fba1e31d2… --- diff --git a/lib/srdb1/schema/acc_cdrs.xml b/lib/srdb1/schema/acc_cdrs.xml index 22cba14..84bb678 100644 --- a/lib/srdb1/schema/acc_cdrs.xml +++ b/lib/srdb1/schema/acc_cdrs.xml @@ -9,7 +9,7 @@ <table id="acc_cdrs" xmlns:db="http://docbook.org/ns/docbook"> <name>acc_cdrs</name> - <version>1</version> + <version>2</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the ACC module to report on CDRs relying on dialog callbacks. More information is available at: &KAMAILIO_MOD_DOC;acc.html @@ -28,24 +28,22 @@ <column id="start_time"> <name>start_time</name> - <type>string</type> - <size>32</size> - <description>Start time</description> + <type>datetime</type> + <description>Start date and time</description> <default/> </column> <column> <name>end_time</name> - <type>string</type> - <size>32</size> - <description>End time</description> + <type>datetime</type> + <description>End date and time</description> <default/> </column> <column> <name>duration</name> - <type>string</type> - <size>32</size> + <type>float</type> + <size>10,3</size> <description>Duration</description> <default/> </column>

1 0

git:master:f2b468ab: Merge pull request #125 from mikomarrache/patch-7
by Daniel-Constantin Mierla 22 Apr '15

22 Apr '15

Module: kamailio Branch: master Commit: f2b468ab50e6ce2cc698486c88080f2d93ed057d URL: https://github.com/kamailio/kamailio/commit/f2b468ab50e6ce2cc698486c88080f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-15T11:08:17+02:00 Merge pull request #125 from mikomarrache/patch-7 acc: use appropriate types for core values --- Modified: lib/srdb1/schema/acc_cdrs.xml Modified: modules/acc/acc_api.h Modified: modules/acc/acc_cdr.c --- Diff: https://github.com/kamailio/kamailio/commit/f2b468ab50e6ce2cc698486c88080f2… Patch: https://github.com/kamailio/kamailio/commit/f2b468ab50e6ce2cc698486c88080f2…

1 0

git:master:d6404937: acc: fix copy/paste error
by mikomarrache 22 Apr '15

22 Apr '15

Module: kamailio Branch: master Commit: d6404937cfb7498dd85c4329f07269ee7c64f157 URL: https://github.com/kamailio/kamailio/commit/d6404937cfb7498dd85c4329f07269e… Author: mikomarrache <mikomarrache(a)users.noreply.github.com> Committer: mikomarrache <mikomarrache(a)users.noreply.github.com> Date: 2015-04-14T15:53:29+03:00 acc: fix copy/paste error --- Modified: modules/acc/acc_cdr.c --- Diff: https://github.com/kamailio/kamailio/commit/d6404937cfb7498dd85c4329f07269e… Patch: https://github.com/kamailio/kamailio/commit/d6404937cfb7498dd85c4329f07269e… --- diff --git a/modules/acc/acc_cdr.c b/modules/acc/acc_cdr.c index a547c34..845fc12 100644 --- a/modules/acc/acc_cdr.c +++ b/modules/acc/acc_cdr.c @@ -175,7 +175,7 @@ static int db_write_cdr( struct dlg_cell* dialog, LM_ERR("failed to convert string to integer - %d.\n", errno); goto error; } - VAL_INT(db_cdr_vals+i) = cdr_value_array[i]; + VAL_INT(db_cdr_vals+i) = long_val; break; case TYPE_STR: VAL_TYPE(db_cdr_vals+i)=DB1_STR;

1 0

git:master:b3887407: acc: change type of core fields to real types
by mikomarrache 22 Apr '15

22 Apr '15

Module: kamailio Branch: master Commit: b38874078ccf23b093bc94484e08bf1a4ba53f90 URL: https://github.com/kamailio/kamailio/commit/b38874078ccf23b093bc94484e08bf1… Author: mikomarrache <mikomarrache(a)users.noreply.github.com> Committer: mikomarrache <mikomarrache(a)users.noreply.github.com> Date: 2015-04-14T15:29:02+03:00 acc: change type of core fields to real types Change the type of the core fields as follows: -> start and end as dates (instead of string) -> duration as double (instead of string) Then, set the db_val with appropriate value and type. --- Modified: modules/acc/acc_cdr.c --- Diff: https://github.com/kamailio/kamailio/commit/b38874078ccf23b093bc94484e08bf1… Patch: https://github.com/kamailio/kamailio/commit/b38874078ccf23b093bc94484e08bf1… --- diff --git a/modules/acc/acc_cdr.c b/modules/acc/acc_cdr.c index d01beb9..a547c34 100644 --- a/modules/acc/acc_cdr.c +++ b/modules/acc/acc_cdr.c @@ -90,6 +90,8 @@ extern str acc_cdrs_table; extern int cdr_log_enable; extern int _acc_cdr_on_failed; +static int string2time( str* time_str, struct timeval* time_value); + /* write all basic information to buffers(e.g. start-time ...) */ static int cdr_core2strar( struct dlg_cell* dlg, str* values, @@ -111,13 +113,13 @@ static int cdr_core2strar( struct dlg_cell* dlg, duration = dlgb.get_dlg_var( dlg, (str*)&cdr_duration_str); values[0] = ( start != NULL ? *start : empty_string); - types[0] = ( start != NULL ? TYPE_STR : TYPE_NULL); + types[0] = ( start != NULL ? TYPE_DATE : TYPE_NULL); values[1] = ( end != NULL ? *end : empty_string); - types[1] = ( end != NULL ? TYPE_STR : TYPE_NULL); + types[1] = ( end != NULL ? TYPE_DATE : TYPE_NULL); values[2] = ( duration != NULL ? *duration : empty_string); - types[2] = ( duration != NULL ? TYPE_STR : TYPE_NULL); + types[2] = ( duration != NULL ? TYPE_DOUBLE : TYPE_NULL); return MAX_CDR_CORE; } @@ -138,6 +140,10 @@ static int db_write_cdr( struct dlg_cell* dialog, db1_con_t *dh=NULL; void *vf=NULL; void *vh=NULL; + struct timeval timeval_val; + long long_val; + double double_val; + char * end; if(acc_cdrs_table.len<=0) return 0; @@ -157,9 +163,45 @@ static int db_write_cdr( struct dlg_cell* dialog, for(i=0; i<m; i++) { db_cdr_keys[i] = &cdr_attrs[i]; - VAL_TYPE(db_cdr_vals+i)=DB1_STR; - VAL_NULL(db_cdr_vals+i)=0; - VAL_STR(db_cdr_vals+i) = cdr_value_array[i]; + switch(cdr_type_array[i]) { + case TYPE_NULL: + VAL_NULL(db_cdr_vals+i)=1; + break; + case TYPE_INT: + VAL_TYPE(db_cdr_vals+i)=DB1_INT; + VAL_NULL(db_cdr_vals+i)=0; + long_val = strtol(cdr_value_array[i].s, &end, 10); + if(errno && (errno != EAGAIN)) { + LM_ERR("failed to convert string to integer - %d.\n", errno); + goto error; + } + VAL_INT(db_cdr_vals+i) = cdr_value_array[i]; + break; + case TYPE_STR: + VAL_TYPE(db_cdr_vals+i)=DB1_STR; + VAL_NULL(db_cdr_vals+i)=0; + VAL_STR(db_cdr_vals+i) = cdr_value_array[i]; + break; + case TYPE_DATE: + VAL_TYPE(db_cdr_vals+i)=DB1_DATETIME; + VAL_NULL(db_cdr_vals+i)=0; + if(string2time(&cdr_value_array[i], &timeval_val) < 0) { + LM_ERR("failed to convert string to timeval.\n"); + goto error; + } + VAL_TIME(db_cdr_vals+i) = timeval_val.tv_sec; + break; + case TYPE_DOUBLE: + VAL_TYPE(db_cdr_vals+i)=DB1_DOUBLE; + VAL_NULL(db_cdr_vals+i)=0; + double_val = strtod(cdr_value_array[i].s, &end); + if(errno && (errno != EAGAIN)) { + LM_ERR("failed to convert string to double - %d.\n", errno); + goto error; + } + VAL_DOUBLE(db_cdr_vals+i) = double_val; + break; + } } /* get extra values */

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
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