sr-dev October 2010

sr-dev@lists.kamailio.org

33 participants
336 discussions

git:master: mtree: option to ignore duplicates
by Daniel-Constantin Mierla 01 Oct '10

01 Oct '10

Module: sip-router Branch: master Commit: 427e4c0f5f8dd8665a5484e724154921a2b896b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=427e4c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 1 16:51:56 2010 +0200 mtree: option to ignore duplicates - when testing with lot of data generated randomnly (usage and performance profiling) there might be duplicates that can be ignored --- modules/mtree/README | 19 +++++++++++++++++-- modules/mtree/doc/mtree_admin.xml | 20 ++++++++++++++++++++ modules/mtree/mtree.c | 3 +++ modules/mtree/mtree_mod.c | 2 ++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/modules/mtree/README b/modules/mtree/README index 7aaa4fd..6391512 100644 --- a/modules/mtree/README +++ b/modules/mtree/README @@ -35,6 +35,7 @@ Daniel-Constantin Mierla 3.8. char_list (string) 3.9. pv_value (string) 3.10. mt_tree_type (integer) + 3.11. mt_ignore_duplicates (integer) 4. Exported Functions @@ -58,7 +59,8 @@ Daniel-Constantin Mierla 1.8. Set char_list parameter 1.9. Set pv_value parameter 1.10. Set mt_tree_type parameter - 1.11. mt_match usage + 1.11. Set mt_ignore_duplicates parameter + 1.12. mt_match usage Chapter 1. Admin Guide @@ -82,6 +84,7 @@ Chapter 1. Admin Guide 3.8. char_list (string) 3.9. pv_value (string) 3.10. mt_tree_type (integer) + 3.11. mt_ignore_duplicates (integer) 4. Exported Functions @@ -126,6 +129,7 @@ Chapter 1. Admin Guide 3.8. char_list (string) 3.9. pv_value (string) 3.10. mt_tree_type (integer) + 3.11. mt_ignore_duplicates (integer) 3.1. db_url (string) @@ -239,6 +243,17 @@ modparam("mtree", "pv_value", "$var(mtval)") modparam("mtree", "mt_tree_type", 1) ... +3.11. mt_ignore_duplicates (integer) + + Ignore duplicated prefixes when loading data. + + Default value is 0. + + Example 1.11. Set mt_ignore_duplicates parameter +... +modparam("mtree", "mt_ignore_duplicates", 1) +... + 4. Exported Functions 4.1. mt_match(mtree, pv, mode) @@ -248,7 +263,7 @@ modparam("mtree", "mt_tree_type", 1) Match 'pv' value against mtree. mode is reserved for further use, now set any integer or PV. - Example 1.11. mt_match usage + Example 1.12. mt_match usage ... mt_match("mytree", "$rU", "0"); ... diff --git a/modules/mtree/doc/mtree_admin.xml b/modules/mtree/doc/mtree_admin.xml index 64e4c00..fd471a1 100644 --- a/modules/mtree/doc/mtree_admin.xml +++ b/modules/mtree/doc/mtree_admin.xml @@ -255,6 +255,26 @@ modparam("mtree", "mt_tree_type", 1) </example> </section> + <section> + <title><varname>mt_ignore_duplicates</varname> (integer)</title> + <para> + Ignore duplicated prefixes when loading data. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>mt_ignore_duplicates</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("mtree", "mt_ignore_duplicates", 1) +... +</programlisting> + </example> + </section> + </section> <section> diff --git a/modules/mtree/mtree.c b/modules/mtree/mtree.c index 84a798d..3678040 100644 --- a/modules/mtree/mtree.c +++ b/modules/mtree/mtree.c @@ -43,6 +43,7 @@ extern pv_spec_t pv_value; extern pv_spec_t pv_dstid; extern pv_spec_t pv_weight; extern int _mt_tree_type; +extern int _mt_ignore_duplicates; /** structures containing prefix-value pairs */ static m_tree_t **_ptree = NULL; @@ -207,6 +208,8 @@ int mt_add_to_tree(m_tree_t *pt, str *sp, str *sv) sp->len, sp->s, sv->len, sv->s, itn0[_mt_char_table[(unsigned int)sp->s[l]]].tvalue.len, itn0[_mt_char_table[(unsigned int)sp->s[l]]].tvalue.s); + if(_mt_ignore_duplicates!=0) + return 1; return -1; } diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index e89987a..aeb98ad 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -90,6 +90,7 @@ pv_spec_t pv_dstid; pv_spec_t pv_weight; pv_spec_t pv_count; int _mt_tree_type = MT_TREE_SVAL; +int _mt_ignore_duplicates = 0; /* lock, ref counter and flag used for reloading the date */ static gen_lock_t *mt_lock = 0; @@ -136,6 +137,7 @@ static param_export_t params[]={ {"pv_weight", STR_PARAM, &weight_param.s}, {"pv_count", STR_PARAM, &count_param.s}, {"mt_tree_type", INT_PARAM, &_mt_tree_type}, + {"mt_ignore_duplicates", INT_PARAM, &_mt_ignore_duplicates}, {0, 0, 0} };

1 0

git:master: mtree: exposed internal usage data via mi
by Daniel-Constantin Mierla 01 Oct '10

01 Oct '10

Module: sip-router Branch: master Commit: f448386d214b5bca734ea4ba1dc5388b23b3a5f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f448386… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 1 15:36:50 2010 +0200 mtree: exposed internal usage data via mi - good for troubleshooting memory usage --- modules/mtree/README | 33 ++++++++++++++++------ modules/mtree/doc/mtree_admin.xml | 20 +++++++++++++ modules/mtree/mtree.c | 6 ++++ modules/mtree/mtree.h | 3 ++ modules/mtree/mtree_mod.c | 55 +++++++++++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+), 9 deletions(-) diff --git a/modules/mtree/README b/modules/mtree/README index f11bac1..7aaa4fd 100644 --- a/modules/mtree/README +++ b/modules/mtree/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright � 2010 Daniel-Constantin Mierla (asipto.com) + Copyright © 2010 Daniel-Constantin Mierla (asipto.com) __________________________________________________________________ Table of Contents @@ -44,6 +44,7 @@ Daniel-Constantin Mierla 5.1. mt_list 5.2. mt_reload + 5.3. mt_summary List of Examples @@ -90,6 +91,7 @@ Chapter 1. Admin Guide 5.1. mt_list 5.2. mt_reload + 5.3. mt_summary 1. Overview @@ -129,7 +131,7 @@ Chapter 1. Admin Guide URL of the database server to be used. - Default value is "mysql://openser:openserrw@localhost/openser". + Default value is “mysql://openser:openserrw@localhost/openser”. Example 1.1. Set db_url parameter ... @@ -141,7 +143,7 @@ modparam("mtree", "db_url", "dbdriver://username:password@dbhost/dbname") Name of DB table where data for trees is store. It is ignored if a 'mtree' parameter is defined. - Default value is "mtrees". + Default value is “mtrees”. Example 1.2. Set db_table parameter ... @@ -152,7 +154,7 @@ modparam("mtree", "db_table", "mymtrees") Definition of memory tree - Default value is "none". + Default value is “none”. Example 1.3. Set mtree parameter ... @@ -163,7 +165,7 @@ modparam("mtree", "mtree", "name=mytable;dbtable=routes;type=0;") Name of 'tname' column. - Default value is "tname". + Default value is “tname”. Example 1.4. Set tname_column parameter ... @@ -174,7 +176,7 @@ modparam("mtree", "tname_column", "name") Name of 'tprefix' column. - Default value is "tprefix". + Default value is “tprefix”. Example 1.5. Set tprefix_column parameter ... @@ -185,7 +187,7 @@ modparam("mtree", "tprefix_column", "prefix") Name of 'tvalue' column. - Default value is "tvalue". + Default value is “tvalue”. Example 1.6. Set tvalue_column parameter ... @@ -207,7 +209,7 @@ modparam("mtree", "fetch_rows", 4000) The list with characters allowed in prefix. - Default value is "0123456789". + Default value is “0123456789”. Example 1.8. Set char_list parameter ... @@ -219,7 +221,7 @@ modparam("mtree", "char_list", "0123456789*+") The PV spec where to store the matched value. It can be any writtable PV. - Default value is "$avp(s:tvalue)". + Default value is “$avp(s:tvalue)”. Example 1.9. Set pv_value parameter ... @@ -255,6 +257,7 @@ mt_match("mytree", "$rU", "0"); 5.1. mt_list 5.2. mt_reload + 5.3. mt_summary 5.1. mt_list @@ -284,3 +287,15 @@ mt_match("mytree", "$rU", "0"); :mt_reload:_reply_fifo_file_ _mtname_ _empty_line_ + +5.3. mt_summary + + List usage summary for all trees. + + Name: mt_summary + + Parameters: none. + + MI FIFO Command Format: + :mt_summary:_reply_fifo_file_ + _empty_line_ diff --git a/modules/mtree/doc/mtree_admin.xml b/modules/mtree/doc/mtree_admin.xml index f4b9698..64e4c00 100644 --- a/modules/mtree/doc/mtree_admin.xml +++ b/modules/mtree/doc/mtree_admin.xml @@ -329,6 +329,26 @@ mt_match("mytree", "$rU", "0"); _empty_line_ </programlisting> </section> + + <section> + <title> + <function moreinfo="none">mt_summary</function> + </title> + <para> + List usage summary for all trees. + </para> + <para> + Name: <emphasis>mt_summary</emphasis> + </para> + <para>Parameters: none.</para> + <para> + MI FIFO Command Format: + </para> + <programlisting format="linespecific"> + :mt_summary:_reply_fifo_file_ + _empty_line_ + </programlisting> + </section> </section> </chapter> diff --git a/modules/mtree/mtree.c b/modules/mtree/mtree.c index f88c9e5..84a798d 100644 --- a/modules/mtree/mtree.c +++ b/modules/mtree/mtree.c @@ -162,6 +162,8 @@ int mt_add_to_tree(m_tree_t *pt, str *sp, str *sv) return -1; } memset(pt->head, 0, MT_NODE_SIZE*sizeof(mt_node_t)); + pt->nrnodes++; + pt->memsize += MT_NODE_SIZE*sizeof(mt_node_t); } itn0 = pt->head; @@ -184,6 +186,8 @@ int mt_add_to_tree(m_tree_t *pt, str *sp, str *sv) return -1; } memset(itn, 0, MT_NODE_SIZE*sizeof(mt_node_t)); + pt->nrnodes++; + pt->memsize += MT_NODE_SIZE*sizeof(mt_node_t); itn0[_mt_char_table[(unsigned int)sp->s[l]]].child = itn; } l++; @@ -213,6 +217,8 @@ int mt_add_to_tree(m_tree_t *pt, str *sp, str *sv) LM_ERR("no more shm mem!\n"); return -1; } + pt->memsize += (sv->len+1)*sizeof(char); + pt->nritems++; strncpy(itn0[_mt_char_table[(unsigned int)sp->s[l]]].tvalue.s, sv->s, sv->len); itn0[_mt_char_table[(unsigned int)sp->s[l]]].tvalue.len = sv->len; diff --git a/modules/mtree/mtree.h b/modules/mtree/mtree.h index 0bacb90..8cbe006 100644 --- a/modules/mtree/mtree.h +++ b/modules/mtree/mtree.h @@ -54,6 +54,9 @@ typedef struct _m_tree str tname; str dbtable; int type; + unsigned int nrnodes; + unsigned int nritems; + unsigned int memsize; mt_node_t *head; struct _m_tree *next; diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 2ab5ae5..e89987a 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -111,6 +111,7 @@ static int mt_match(struct sip_msg *msg, gparam_t *dm, gparam_t *var, static struct mi_root* mt_mi_reload(struct mi_root*, void* param); static struct mi_root* mt_mi_list(struct mi_root*, void* param); +static struct mi_root* mt_mi_summary(struct mi_root*, void* param); static int mt_load_db(str *tname); static int mt_load_db_trees(); @@ -141,6 +142,7 @@ static param_export_t params[]={ static mi_export_t mi_cmds[] = { { "mt_reload", mt_mi_reload, 0, 0, child_init }, { "mt_list", mt_mi_list, 0, 0, 0 }, + { "mt_summary", mt_mi_summary, 0, 0, 0 }, { 0, 0, 0, 0, 0} }; @@ -886,3 +888,56 @@ error: return 0; } +struct mi_root* mt_mi_summary(struct mi_root* cmd_tree, void* param) +{ + m_tree_t *pt; + struct mi_root* rpl_tree = NULL; + struct mi_node* node = NULL; + struct mi_attr* attr= NULL; + str val; + + if(!mt_defined_trees()) + { + LM_ERR("empty tree list\n"); + return init_mi_tree( 500, "No trees", 8); + } + + rpl_tree = init_mi_tree(200, MI_OK_S, MI_OK_LEN); + if(rpl_tree == NULL) + return 0; + + pt = mt_get_first_tree(); + + while(pt!=NULL) + { + node = add_mi_node_child(&rpl_tree->node, 0, "MT", 2, 0, 0); + if(node == NULL) + goto error; + attr = add_mi_attr(node, MI_DUP_VALUE, "TNAME", 5, + pt->tname.s, pt->tname.len); + if(attr == NULL) + goto error; + val.s = int2str(pt->memsize, &val.len); + attr = add_mi_attr(node, MI_DUP_VALUE, "MEMSIZE", 7, + val.s, val.len); + if(attr == NULL) + goto error; + val.s = int2str(pt->nrnodes, &val.len); + attr = add_mi_attr(node, MI_DUP_VALUE, "NRNODES", 7, + val.s, val.len); + if(attr == NULL) + goto error; + val.s = int2str(pt->nritems, &val.len); + attr = add_mi_attr(node, MI_DUP_VALUE, "NRITEMS", 7, + val.s, val.len); + if(attr == NULL) + goto error; + + pt = pt->next; + } + + return rpl_tree; +error: + free_mi_tree(rpl_tree); + return 0; +}

1 0

git:master: mtree: set root tree pointer to null
by Daniel-Constantin Mierla 01 Oct '10

01 Oct '10

Module: sip-router Branch: master Commit: fa898c615d6a2ffb130563c52214ad06de2cd278 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa898c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 1 13:34:28 2010 +0200 mtree: set root tree pointer to null - avoid double free if there is error at startup --- modules/mtree/mtree.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/mtree/mtree.c b/modules/mtree/mtree.c index a1626d2..f88c9e5 100644 --- a/modules/mtree/mtree.c +++ b/modules/mtree/mtree.c @@ -753,6 +753,7 @@ void mt_destroy_trees(void) if (*_ptree!=NULL) mt_free_tree(*_ptree); shm_free(_ptree); + _ptree = NULL; } }

1 0

git:master: modules:carrierroute Fix documentation when using cr_route/ t_relay in failure routes
by Marius Zbihlei 01 Oct '10

01 Oct '10

Module: sip-router Branch: master Commit: c44529a8078f7c58d621e5116757da10084180f1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c44529a… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Sep 30 17:04:00 2010 +0300 modules:carrierroute Fix documentation when using cr_route/t_relay in failure routes Starting with 3.0 version, there is no need to call append_branch in failure routes before t_relay if the RURI is new(it is done automatically from t_relay). --- modules/carrierroute/README | 69 +++++++++++------------ modules/carrierroute/doc/carrierroute_admin.xml | 6 +- 2 files changed, 36 insertions(+), 39 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c44…

4 10

git:master: modules/carrierroute: change doc to reflect latest changes in append branch
by Marius Zbihlei 01 Oct '10

01 Oct '10

Module: sip-router Branch: master Commit: 22cb194483a7b0d15b823cb8f851cd1fe9746a8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22cb194… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Oct 1 12:52:33 2010 +0300 modules/carrierroute: change doc to reflect latest changes in append branch --- modules/carrierroute/README | 10 +++++----- modules/carrierroute/doc/carrierroute_admin.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/carrierroute/README b/modules/carrierroute/README index 5c4f15d..1c28e22 100644 --- a/modules/carrierroute/README +++ b/modules/carrierroute/README @@ -272,11 +272,11 @@ Chapter 1. Admin Guide modules. But for smaller installations it probably make more sense to use the lcr and dispatcher module. - Starting with version 3.0 of kamailio, if you want to use this module - in failure routes, it is not needed to call“append_branch()” after - rewriting the request URI in order to relay the message to the new - target. Its also supportes the usage of database derived failure - routing descisions with the carrierfailureroute table. + Starting with version 3.1 , if you want to use this module in failure + routes, it is not needed to call“append_branch()” after rewriting the + request URI in order to relay the message to the new target. Its also + supportes the usage of database derived failure routing descisions with + the carrierfailureroute table. 2. Dependencies diff --git a/modules/carrierroute/doc/carrierroute_admin.xml b/modules/carrierroute/doc/carrierroute_admin.xml index f83b2c0..d30bb29 100644 --- a/modules/carrierroute/doc/carrierroute_admin.xml +++ b/modules/carrierroute/doc/carrierroute_admin.xml @@ -66,7 +66,7 @@ installations it probably make more sense to use the lcr and dispatcher module. </para> <para> - Starting with version 3.0 of kamailio, if you want to use this module in failure routes, + Starting with version 3.1 , if you want to use this module in failure routes, it is not needed to call<quote>append_branch()</quote> after rewriting the request URI in order to relay the message to the new target. Its also supportes the usage of database derived failure routing descisions with the carrierfailureroute table.

1 0

git:master: xcap_server: support parsing oma pres-rules auid
by Juha Heinanen 01 Oct '10

01 Oct '10

daniel, does xcap-server already support oma pres-rules and resource-list or is it on the roadmap? -- juha

3 18

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2010