sr-dev June 2012

sr-dev@lists.kamailio.org

31 participants
251 discussions

str_str function
by Vicente Hernando 14 Jun '12

14 Jun '12

Hello, str_str function searches for a substring into a bigger string. str_str function in lib/cds/sstr.c file has a comment: /* FIXME: reimplement using better algorithm */ Attached patch reimplements that function using Boyer-Moore-Horspool-Raita algorithm, which is the one most text editors use to search for substrings. Boyer-Moore-Horspool-Raita algorithm is a simplification from Boyer-Moore one, with less preprocessing overhead. If n is the string length, and m is substring length, naive brute force algorithm has a cost of O(n*m). Raita algoritm has same cost in worst case but Ω(n/m) a better average cost. As a drawback it adds a preprocessing cost of O(m + charset_length) where charset_length is 256 for us, because we use char. Another way to approach this substring search issue would be separate it into two functions, a preprocessing one, and a searching one. Then in module initializacion where the function is used, calculate the needed preprocess and when the function is called do the search only. This Raita algorithm could also be useful for str_search function in ut.c. Its usefulness depends on n, and m lengths, the bigger they are the better the algoritm works. http://en.wikipedia.org/wiki/String_searching_algorithm http://en.wikipedia.org/wiki/Boyer%E2%80%93Moore%E2%80%93Horspool_algorithm http://www-igm.univ-mlv.fr/~lecroq/string/node22.html Regards, Vicente.

2 6

git:3.3: modules_k/presence: Fixed segmentation fault when uploading pres-rules documents
by Peter Dunkley 14 Jun '12

14 Jun '12

Module: sip-router Branch: 3.3 Commit: 3dba329bbefb4ef4274642eff722278c22387784 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3dba329… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 14 12:10:35 2012 +0100 modules_k/presence: Fixed segmentation fault when uploading pres-rules documents - Found and fixed by Hugh Waite @ Crocodile RCS (cherry picked from commit 9dbe8f9fdff1eb5718698cdcdf2357ee1fabd42b) --- modules_k/presence/presence.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index f8ba258..95a7127 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -949,6 +949,7 @@ int update_watchers_status(str pres_uri, pres_ev_t* ev, str* rules_doc) } } + memset(&subs, 0, sizeof(subs_t)); subs.pres_uri= pres_uri; subs.event= ev; subs.auth_rules_doc= rules_doc; @@ -1406,11 +1407,18 @@ static int update_pw_dialogs_dbonlymode(subs_t* subs, subs_t** subs_array) db_cols[n_update_cols] = &str_updated_col; db_vals[n_update_cols].type = DB1_INT; - db_vals[n_update_cols].nul = 0; - db_vals[n_update_cols].val.int_val = - core_hash(&subs->callid, &subs->from_tag, + db_vals[n_update_cols].nul = 0; + if (subs->callid.len == 0 || subs->from_tag.len == 0) + { + db_vals[n_update_cols].val.int_val = (int) ((rand() / (RAND_MAX + 1.0)) * (pres_waitn_time * pres_notifier_poll_rate + * pres_notifier_processes)); + } else { + db_vals[n_update_cols].val.int_val = + core_hash(&subs->callid, &subs->from_tag, + (pres_waitn_time * pres_notifier_poll_rate * pres_notifier_processes) - 1); + } n_update_cols++;

1 0

git:master: modules_k/presence: Fixed segmentation fault when uploading pres-rules documents
by Peter Dunkley 14 Jun '12

14 Jun '12

Module: sip-router Branch: master Commit: 9dbe8f9fdff1eb5718698cdcdf2357ee1fabd42b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9dbe8f9… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 14 12:10:35 2012 +0100 modules_k/presence: Fixed segmentation fault when uploading pres-rules documents - Found and fixed by Hugh Waite @ Crocodile RCS --- modules_k/presence/presence.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index f8ba258..95a7127 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -949,6 +949,7 @@ int update_watchers_status(str pres_uri, pres_ev_t* ev, str* rules_doc) } } + memset(&subs, 0, sizeof(subs_t)); subs.pres_uri= pres_uri; subs.event= ev; subs.auth_rules_doc= rules_doc; @@ -1406,11 +1407,18 @@ static int update_pw_dialogs_dbonlymode(subs_t* subs, subs_t** subs_array) db_cols[n_update_cols] = &str_updated_col; db_vals[n_update_cols].type = DB1_INT; - db_vals[n_update_cols].nul = 0; - db_vals[n_update_cols].val.int_val = - core_hash(&subs->callid, &subs->from_tag, + db_vals[n_update_cols].nul = 0; + if (subs->callid.len == 0 || subs->from_tag.len == 0) + { + db_vals[n_update_cols].val.int_val = (int) ((rand() / (RAND_MAX + 1.0)) * (pres_waitn_time * pres_notifier_poll_rate + * pres_notifier_processes)); + } else { + db_vals[n_update_cols].val.int_val = + core_hash(&subs->callid, &subs->from_tag, + (pres_waitn_time * pres_notifier_poll_rate * pres_notifier_processes) - 1); + } n_update_cols++;

1 0

git:3.2: drouting: reset the content of routing tree if root pointer is not freed
by Daniel-Constantin Mierla 14 Jun '12

14 Jun '12

Module: sip-router Branch: 3.2 Commit: 231017d40132dd2d2e21d715d12101ed67b51d45 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=231017d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jun 13 11:51:57 2012 +0200 drouting: reset the content of routing tree if root pointer is not freed - reported by Yufei Tao (cherry picked from commit c737ff95bb2e742981d81088169baa60d4605b85) --- modules_k/drouting/routing.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/drouting/routing.c b/modules_k/drouting/routing.c index 1ff7629..f54709e 100644 --- a/modules_k/drouting/routing.c +++ b/modules_k/drouting/routing.c @@ -460,7 +460,8 @@ free_rt_data( shm_free(rt_data->noprefix.rg); rt_data->noprefix.rg = 0; } - /* del top level */ + /* del top level or reset to 0 it's content */ if (all) shm_free(rt_data); + else memset(rt_data, 0, sizeof(rt_data_t)); } }

1 0

git:3.3: drouting: reset the content of routing tree if root pointer is not freed
by Daniel-Constantin Mierla 14 Jun '12

14 Jun '12

Module: sip-router Branch: 3.3 Commit: a1983f7f059262ba47b9c2fcf6f31feefac624c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1983f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jun 13 11:51:57 2012 +0200 drouting: reset the content of routing tree if root pointer is not freed - reported by Yufei Tao (cherry picked from commit c737ff95bb2e742981d81088169baa60d4605b85) --- modules_k/drouting/routing.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/drouting/routing.c b/modules_k/drouting/routing.c index 1ff7629..f54709e 100644 --- a/modules_k/drouting/routing.c +++ b/modules_k/drouting/routing.c @@ -460,7 +460,8 @@ free_rt_data( shm_free(rt_data->noprefix.rg); rt_data->noprefix.rg = 0; } - /* del top level */ + /* del top level or reset to 0 it's content */ if (all) shm_free(rt_data); + else memset(rt_data, 0, sizeof(rt_data_t)); } }

1 0

[tracker] Comment added: Kamailio crash when about 300, 000 tls connections opened.
by sip-router 14 Jun '12

14 Jun '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#236 - Kamailio crash when about 300,000 tls connections opened. User who did this - Andrei Pelinescu-Onciul (andrei) ---------- You could try also forcing kamailio/ser to pre-fault all the shm memory pages on startup and to lock the pages in memory (shm_force_alloc = yes and mlock_pages = yes in the .cfg). This way you would see on startup if there is enough memory for your shared memory requirements and you will make also all the shared memory unswapable (better performance if it's a dedicated k machine). ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=236#comment690 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: pua: remove wrong free of TM callback param in send_publish()
by Daniel-Constantin Mierla 14 Jun '12

14 Jun '12

Module: sip-router Branch: master Commit: 1d89d7bea854c2e2c646b5d13ba215795325b50f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d89d7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jun 14 12:24:36 2012 +0200 pua: remove wrong free of TM callback param in send_publish() - reported by Charles Chance and Juha Heinanen --- modules_k/pua/send_publish.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/modules_k/pua/send_publish.c b/modules_k/pua/send_publish.c index cfc759f..3bc8702 100644 --- a/modules_k/pua/send_publish.c +++ b/modules_k/pua/send_publish.c @@ -695,15 +695,24 @@ done: goto error; } } + goto finish; error: - if(etag.s) - pkg_free(etag.s); - + ret = -1; if(cb_param) shm_free(cb_param); - if(body&& ret_code) + if (dbmode == PUA_DB_ONLY && pua_dbf.abort_transaction) + { + if (pua_dbf.abort_transaction(pua_db) < 0) + LM_ERR("in abort_transaction\n"); + } + +finish: + if(etag.s) + pkg_free(etag.s); + + if(body && ret_code) { if(body->s) xmlFree(body->s); @@ -719,12 +728,6 @@ error: } free_results_puadb(res); - if (dbmode == PUA_DB_ONLY && pua_dbf.abort_transaction) - { - if (pua_dbf.abort_transaction(pua_db) < 0) - LM_ERR("in abort_transaction\n"); - } - return ret; }

1 0

[tracker] Comment added: Kamailio crash when about 300, 000 tls connections opened.
by sip-router 14 Jun '12

14 Jun '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#236 - Kamailio crash when about 300,000 tls connections opened. User who did this - Klaus Darilion (klaus3000) ---------- See http://www.win.tue.nl/~aeb/linux/lk/lk-9.html section "9.6 Overcommit and OOM" Since 2.5.30 the values are: 0 (default): as before: guess about how much overcommitment is reasonable, 1: never refuse any malloc(), 2: be precise about the overcommit - never commit a virtual address space larger than swap space plus a fraction overcommit_ratio of the physical memory. Here /proc/sys/vm/overcommit_ratio (by default 50) is another user-settable parameter. It is possible to set overcommit_ratio to values larger than 100. (See also Documentation/vm/overcommit-accounting.) Thus, you have to set it to "2", any maybe also tweak /proc/sys/vm/overcommit_ratio ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=236#comment689 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: Kamailio crash when about 300, 000 tls connections opened.
by sip-router 14 Jun '12

14 Jun '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#236 - Kamailio crash when about 300,000 tls connections opened. User who did this - Shaobin.Feng (saxon_leo) ---------- thanks for quick reply. Something really confuse me. According to top info while connections achieve 310,000, there are almost 3G cached,why OS didn't use them? And the server overcommit_memory=0,why someone can invoke oom-killer? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=236#comment688 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: Kamailio crash when about 300, 000 tls connections opened.
by sip-router 14 Jun '12

14 Jun '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#236 - Kamailio crash when about 300,000 tls connections opened. User who did this - Klaus Darilion (klaus3000) ---------- You can try setting /proc/sys/vm/overcommit_memory to "2". Then system malloc should fail when running out of memory and there shouldn't be a reason to kill Kamailio. Also read the TLS README carefully. There are various memory aspects documented, e.g.: http://kamailio.org/docs/modules/3.2.x/modules/tls.html#tls.low_memory See also the low memory thresholds: http://kamailio.org/docs/modules/3.2.x/modules/tls.html#low_mem_threshold1 http://kamailio.org/docs/modules/3.2.x/modules/tls.html#low_mem_threshold2 ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=236#comment687 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2012