sr-dev June 2013

sr-dev@lists.kamailio.org

33 participants
236 discussions

[tracker] Comment added: modules/debugger: be able to log assign actions (Attachment added)
by sip-router 03 Jun '13

03 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#299 - modules/debugger: be able to log assign actions User who did this - Víctor Seva (linuxmaniac) ---------- Ups. Sorry for that I thought It was polish enough. The only malloc without checking that I see is the one on dbg_init_pvcache. I have removed the commented code. Thanks ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=299#comment921 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] Task reopened: modules/debugger: be able to log assign actions
by sip-router 03 Jun '13

03 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been re-opened: FS#299 - modules/debugger: be able to log assign actions User who did this - Daniel-Constantin Mierla (miconda) More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=299 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: modules/debugger: be able to log assign actions
by sip-router 03 Jun '13

03 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#299 - modules/debugger: be able to log assign actions User who did this - Daniel-Constantin Mierla (miconda) ---------- This doesn't look like a finished patch, but I saw it was already committed. I could spot a pkg malloc without checking the result, next like potentially writing over null address. Then I see c++ style comments // that are for unused code not for documentation text, they have to be removed. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=299#comment920 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] Task changed: modules/debugger: add dbg_pv_dump config function. It dumps on json format the content of pv_cache
by sip-router 03 Jun '13

03 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#307 - modules/debugger: add dbg_pv_dump config function. It dumps on json format the content of pv_cache User who did this: Víctor Seva (linuxmaniac) Category: Core -> Module Task Type: Bug Report -> Improvement More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=307 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: modules/debugger: add dbg_pv_dump config function. It dumps on json format the content of pv_cache (Attachment added)
by sip-router 03 Jun '13

03 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#307 - modules/debugger: add dbg_pv_dump config function. It dumps on json format the content of pv_cache User who did this - Víctor Seva (linuxmaniac) ---------- Refresh patches from the last master version. - fix compile warning. ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=307#comment919 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: htable: added rpc commands for setting items in a hash table
by Elena-Ramona Modroiu 03 Jun '13

03 Jun '13

Module: sip-router Branch: master Commit: 83eb9b7d7a9b4e1e2bf35d4e2b00573c176c8290 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83eb9b7… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Mon Jun 3 11:05:58 2013 +0200 htable: added rpc commands for setting items in a hash table - htable.sets - set to a string value - htable.seti - set to an integer value --- modules/htable/htable.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/modules/htable/htable.c b/modules/htable/htable.c index e740d71..68a7a5b 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -530,6 +530,14 @@ static const char* htable_get_doc[2] = { "Get one key from a hash table.", 0 }; +static const char* htable_sets_doc[2] = { + "Set one key in a hash table to a string value.", + 0 +}; +static const char* htable_seti_doc[2] = { + "Set one key in a hash table to an integer value.", + 0 +}; static const char* htable_list_doc[2] = { "List all htables.", 0 @@ -616,6 +624,67 @@ error: return; } +/*! \brief RPC htable.sets command to set one item to string value */ +static void htable_rpc_sets(rpc_t* rpc, void* c) { + str htname, keyname; + int_str keyvalue; + ht_t *ht; + + if (rpc->scan(c, "SS.S", &htname, &keyname, &keyvalue.s) < 3) { + rpc->fault(c, 500, + "Not enough parameters (htable name, key name and value)"); + return; + } + + /* Find the htable */ + ht = ht_get_table(&htname); + if (!ht) { + rpc->fault(c, 500, "No such htable"); + return; + } + + if(ht_set_cell(ht, &keyname, AVP_VAL_STR, &keyvalue, 1)!=0) + { + LM_ERR("cannot set $ht(%.*s=>%.*s)\n", htname.len, htname.s, + keyname.len, keyname.s); + rpc->fault(c, 500, "Failed to set the item"); + return; + } + + return; +} + +/*! \brief RPC htable.seti command to set one item to integer value */ +static void htable_rpc_seti(rpc_t* rpc, void* c) { + str htname, keyname; + int_str keyvalue; + ht_t *ht; + + if (rpc->scan(c, "SS.d", &htname, &keyname, &keyvalue.n) < 3) { + rpc->fault(c, 500, + "Not enough parameters (htable name, key name and value)"); + return; + } + + /* Find the htable */ + ht = ht_get_table(&htname); + if (!ht) { + rpc->fault(c, 500, "No such htable"); + return; + } + + if(ht_set_cell(ht, &keyname, 0, &keyvalue, 1)!=0) + { + LM_ERR("cannot set $ht(%.*s=>%.*s)\n", htname.len, htname.s, + keyname.len, keyname.s); + rpc->fault(c, 500, "Failed to set the item"); + return; + } + + return; +} + +/*! \brief RPC htable.dump command to print content of a hash table */ static void htable_rpc_dump(rpc_t* rpc, void* c) { str htname; @@ -741,6 +810,7 @@ error: return; } +/*! \brief RPC htable.reload command to reload content of a hash table */ static void htable_rpc_reload(rpc_t* rpc, void* c) { str htname; @@ -822,6 +892,8 @@ rpc_export_t htable_rpc[] = { {"htable.dump", htable_rpc_dump, htable_dump_doc, 0}, {"htable.delete", htable_rpc_delete, htable_delete_doc, 0}, {"htable.get", htable_rpc_get, htable_get_doc, 0}, + {"htable.sets", htable_rpc_sets, htable_sets_doc, 0}, + {"htable.seti", htable_rpc_seti, htable_seti_doc, 0}, {"htable.listTables", htable_rpc_list, htable_list_doc, 0}, {"htable.reload", htable_rpc_reload, htable_reload_doc, 0}, {0, 0, 0, 0}

2 1

[tracker] Task closed: modules/debugger: be able to log assign actions
by sip-router 03 Jun '13

03 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#299 - modules/debugger: be able to log assign actions User who did this - Víctor Seva (linuxmaniac) Reason for closing: Implemented More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=299 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: modules/debugger: new parameter log_assign
by Victor Seva 03 Jun '13

03 Jun '13

Module: sip-router Branch: master Commit: 2312e2adc626f42d36d240a417bb488f19e95017 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2312e2a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Mon Jun 3 15:10:27 2013 +0200 modules/debugger: new parameter log_assign This parameter enables logging every single assign action on the config. --- modules/debugger/README | 20 ++++- modules/debugger/debugger_api.c | 166 ++++++++++++++++++++++++++++++- modules/debugger/debugger_api.h | 2 + modules/debugger/debugger_mod.c | 7 ++ modules/debugger/doc/debugger_admin.xml | 23 ++++- 5 files changed, 214 insertions(+), 4 deletions(-) diff --git a/modules/debugger/README b/modules/debugger/README index 77c2ae4..d7b350b 100644 --- a/modules/debugger/README +++ b/modules/debugger/README @@ -35,6 +35,7 @@ Daniel-Constantin Mierla 3.8. mod_hash_size (int) 3.9. mod_level_mode (int) 3.10. mod_level (str) + 3.11. log_assign (int) 4. Functions @@ -61,7 +62,8 @@ Daniel-Constantin Mierla 1.8. Set mod_hash_size parameter 1.9. Set mod_level_mode parameter 1.10. Set mod_level parameter - 1.11. dbg_breakpoint usage + 1.11. Set log_assign parameter + 1.12. dbg_breakpoint usage Chapter 1. Admin Guide @@ -85,6 +87,7 @@ Chapter 1. Admin Guide 3.8. mod_hash_size (int) 3.9. mod_level_mode (int) 3.10. mod_level (str) + 3.11. log_assign (int) 4. Functions @@ -150,6 +153,7 @@ Chapter 1. Admin Guide 3.8. mod_hash_size (int) 3.9. mod_level_mode (int) 3.10. mod_level (str) + 3.11. log_assign (int) 3.1. cfgtrace (int) @@ -275,6 +279,18 @@ modparam("debugger", "mod_level", "core=3") modparam("debugger", "mod_level", "tm=3") ... +3.11. log_assign (int) + + Enable or disable log assign actions on config (0 - disabled, 1 - + enabled). + + Default value is "0". + + Example 1.11. Set log_assign parameter +... +modparam("debugger", "log_assign", 1) +... + 4. Functions 4.1. dbg_breakpoint(mode) @@ -288,7 +304,7 @@ modparam("debugger", "mod_level", "tm=3") Note that this version of the module does not export this anchors to RPC for interactive debugging (temporarily disabled). - Example 1.11. dbg_breakpoint usage + Example 1.12. dbg_breakpoint usage ... if($si=="10.0.0.10") dbg_breakpoint("1"); diff --git a/modules/debugger/debugger_api.c b/modules/debugger/debugger_api.c index 390d92d..1f42d74 100644 --- a/modules/debugger/debugger_api.c +++ b/modules/debugger/debugger_api.c @@ -36,6 +36,8 @@ #include "../../route_struct.h" #include "../../mem/shm_mem.h" #include "../../locking.h" +#include "../../lvalue.h" +#include "../../hashes.h" #include "debugger_act.h" #include "debugger_api.h" @@ -895,7 +897,6 @@ int dbg_init_rpc(void) return 0; } - typedef struct _dbg_mod_level { str name; unsigned int hashid; @@ -1109,6 +1110,169 @@ void dbg_enable_mod_levels(void) set_module_debug_level_cb(dbg_get_mod_debug_level); } +#define DBG_PVCACHE_SIZE 32 + +typedef struct _dbg_pvcache { + pv_spec_t *spec; + str *pvname; + struct _dbg_pvcache *next; +} dbg_pvcache_t; + +static dbg_pvcache_t **_dbg_pvcache = NULL; + +void dbg_init_pvcache() +{ + _dbg_pvcache = (dbg_pvcache_t**)pkg_malloc(sizeof(dbg_pvcache_t*)*DBG_PVCACHE_SIZE); + memset(_dbg_pvcache, 0, sizeof(dbg_pvcache_t*)*DBG_PVCACHE_SIZE); +} + +int dbg_assign_add(str *name, pv_spec_t *spec) +{ + dbg_pvcache_t *pvn, *last, *next; + unsigned int pvid; + //unsigned i = 0; + + if(name==NULL||spec==NULL) + return -1; + + if(_dbg_pvcache==NULL) + return -1; + + pvid = get_hash1_raw((char *)&spec, sizeof(pv_spec_t*)); + pvn = (dbg_pvcache_t*)pkg_malloc(sizeof(dbg_pvcache_t)); + if(pvn==0) + { + LM_ERR("no more memory\n"); + return -1; + } + memset(pvn, 0, sizeof(dbg_pvcache_t)); + pvn->pvname = name; + pvn->spec = spec; + next = _dbg_pvcache[pvid%DBG_PVCACHE_SIZE]; + if(next==NULL) + { + _dbg_pvcache[pvid%DBG_PVCACHE_SIZE] = pvn; + } + else + { + while(next) + { + //i++; + last = next; + next = next->next; + } + last->next = pvn; + } + /*LM_DBG("spec[%p] pvar[%.*s] added in cache[%d][%d]\n", spec, + name->len, name->s, pvid%DBG_PVCACHE_SIZE, i);*/ + return 0; +} + +str *_dbg_pvcache_lookup(pv_spec_t *spec) +{ + dbg_pvcache_t *pvi; + unsigned int pvid; + str *name = NULL; + //unsigned int i = 0; + + if(spec==NULL) + return NULL; + + if(_dbg_pvcache==NULL) + return NULL; + + pvid = get_hash1_raw((char *)&spec, sizeof(pv_spec_t*)); + pvi = _dbg_pvcache[pvid%DBG_PVCACHE_SIZE]; + while(pvi) + { + if(pvi->spec==spec) { + /*LM_DBG("spec[%p] pvar[%.*s] found in cache[%d][%d]\n", spec, + pvi->pvname->len, pvi->pvname->s, pvid%DBG_PVCACHE_SIZE, i);*/ + return pvi->pvname; + } + //i++; + pvi = pvi->next; + } + name = pv_cache_get_name(spec); + if(name!=NULL) + { + /*LM_DBG("Add name[%.*s] to pvcache\n", name->len, name->s);*/ + dbg_assign_add(name, spec); + } + return name; +} + +int _dbg_log_assign_action_avp(struct sip_msg* msg, struct lvalue* lv) +{ + int_str avp_val; + avp_t* avp; + avp_spec_t* avp_s = &lv->lv.avps; + avp = search_avp_by_index(avp_s->type, avp_s->name, + &avp_val, avp_s->index); + if (likely(avp)){ + if (avp->flags&(AVP_VAL_STR)){ + LM_DBG("%.*s:\"%.*s\"\n", avp_s->name.s.len, avp_s->name.s.s, + avp_val.s.len, avp_val.s.s); + }else{ + LM_DBG("%.*s:%d\n", avp_s->name.s.len, avp_s->name.s.s, + avp_val.n); + } + } + return 0; +} + +int _dbg_log_assign_action_pvar(struct sip_msg* msg, struct lvalue* lv) +{ + pv_value_t value; + pv_spec_t* pvar = lv->lv.pvs; + str def_name = {"unknown", 7}; + str *name = _dbg_pvcache_lookup(pvar); + + if(name==NULL) + name = &def_name; + if(pv_get_spec_value(msg, pvar, &value)!=0) + { + LM_ERR("can't get value\n"); + return -1; + } + + if(value.flags&(PV_VAL_NULL|PV_VAL_EMPTY|PV_VAL_NONE)){ + LM_DBG("%.*s: $null\n", name->len, name->s); + }else if(value.flags&(PV_VAL_INT)){ + LM_DBG("%.*s:%d\n", name->len, name->s, value.ri); + }else if(value.flags&(PV_VAL_STR)){ + LM_DBG("%.*s:\"%.*s\"\n", name->len, name->s, value.rs.len, value.rs.s); + } + return 0; +} + +int dbg_log_assign(struct sip_msg* msg, struct lvalue *lv) +{ + if(lv==NULL) + { + LM_ERR("left value is NULL\n"); + return -1; + } + switch(lv->type){ + case LV_AVP: + return _dbg_log_assign_action_avp(msg, lv); + break; + case LV_PVAR: + return _dbg_log_assign_action_pvar(msg, lv); + break; + case LV_NONE: + break; + } + return 0; +} + +void dbg_enable_log_assign(void) +{ + if(_dbg_pvcache==NULL) + return; + set_log_assign_action_cb(dbg_log_assign); +} + int dbg_level_mode_fixup(void *temp_handle, str *group_name, str *var_name, void **value){ if(_dbg_mod_table==NULL) diff --git a/modules/debugger/debugger_api.h b/modules/debugger/debugger_api.h index 1060c95..6a45678 100644 --- a/modules/debugger/debugger_api.h +++ b/modules/debugger/debugger_api.h @@ -37,5 +37,7 @@ int dbg_init_mod_levels(int _dbg_mod_hash_size); int dbg_set_mod_debug_level(char *mname, int mnlen, int *mlevel); void dbg_enable_mod_levels(void); +void dbg_init_pvcache(void); +void dbg_enable_log_assign(void); #endif diff --git a/modules/debugger/debugger_mod.c b/modules/debugger/debugger_mod.c index 8b511bb..18b50e6 100644 --- a/modules/debugger/debugger_mod.c +++ b/modules/debugger/debugger_mod.c @@ -57,6 +57,7 @@ extern int _dbg_step_usleep; extern int _dbg_step_loops; static char * _dbg_cfgtrace_facility_str = 0; +static int _dbg_log_assign = 0; static cmd_export_t cmds[]={ {"dbg_breakpoint", (cmd_function)w_dbg_breakpoint, 1, @@ -70,6 +71,7 @@ static param_export_t params[]={ {"log_level", INT_PARAM, &_dbg_cfgtrace_level}, {"log_facility", STR_PARAM, &_dbg_cfgtrace_facility_str}, {"log_prefix", STR_PARAM, &_dbg_cfgtrace_prefix}, + {"log_assign", INT_PARAM, &_dbg_log_assign}, {"step_usleep", INT_PARAM, &_dbg_step_usleep}, {"step_loops", INT_PARAM, &_dbg_step_loops}, {"mod_hash_size", INT_PARAM, &default_dbg_cfg.mod_hash_size}, @@ -133,6 +135,10 @@ static int mod_init(void) return -1; } + if(_dbg_log_assign>0) + { + dbg_init_pvcache(); + } return dbg_init_bp_list(); } @@ -144,6 +150,7 @@ static int child_init(int rank) LM_DBG("rank is (%d)\n", rank); if (rank==PROC_INIT) { dbg_enable_mod_levels(); + dbg_enable_log_assign(); return dbg_init_pid_list(); } return dbg_init_mypid(); diff --git a/modules/debugger/doc/debugger_admin.xml b/modules/debugger/doc/debugger_admin.xml index 6359cc0..1a70490 100644 --- a/modules/debugger/doc/debugger_admin.xml +++ b/modules/debugger/doc/debugger_admin.xml @@ -281,8 +281,29 @@ modparam("debugger", "mod_level", "tm=3") </programlisting> </example> </section> + + <section> + <title><varname>log_assign</varname> (int)</title> + <para> + Enable or disable log assign actions on config (0 - disabled, 1 - enabled). + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>log_assign</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("debugger", "log_assign", 1) +... +</programlisting> + </example> </section> - + + </section> + <section> <title>Functions</title> <section>

1 0

[tracker] Comment added: modules/debugger: be able to log assign actions (Attachment added)
by sip-router 03 Jun '13

03 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#299 - modules/debugger: be able to log assign actions User who did this - Víctor Seva (linuxmaniac) ---------- Patch reworked. - struct dbg_pvcache_t has now a next field. - dbg_assign_add() and _dbg_pvcache_lookup() functions loop over the next field. - _dbg_pvcache is now a real hash table, not an array. - comment the debugger debug output ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=299#comment918 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] User took ownership: modules/debugger: add dbg_pv_dump config function. It dumps on json format the content of pv_cache
by sip-router 03 Jun '13

03 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Víctor Seva has taken ownership of the following task: FS#307 - modules/debugger: add dbg_pv_dump config function. It dumps on json format the content of pv_cache More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=307 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2013