sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

git:andrei/counters: snmp(k): fix direct access to stat vars
by Andrei Pelinescu-Onciul 09 Aug '10

09 Aug '10

Module: sip-router Branch: andrei/counters Commit: 5cac9a1836ff097fe5ff4bc0478cf1ff0e1a7cd3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5cac9a1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 9 19:05:46 2010 +0200 snmp(k): fix direct access to stat vars The snmp modules used to access directly some stat vars values, instead of using get_stat_val() (because the kamailio stats are now a wrapper over sr counters, the stats var definition changed and it's not possible to access its value directly). --- modules_k/snmpstats/snmpSIPStatusCodesTable.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules_k/snmpstats/snmpSIPStatusCodesTable.c b/modules_k/snmpstats/snmpSIPStatusCodesTable.c index cac6a33..eda8fbc 100644 --- a/modules_k/snmpstats/snmpSIPStatusCodesTable.c +++ b/modules_k/snmpstats/snmpSIPStatusCodesTable.c @@ -348,12 +348,12 @@ openserSIPStatusCodesTable_create_row( netsnmp_index* hdr) if (in_status_code != NULL) { - ctx->startingInStatusCodeValue = *(long *)in_status_code->u.val; + ctx->startingInStatusCodeValue = get_stat_val(in_status_code); } if (out_status_code != NULL) { - ctx->startingOutStatusCodeValue = *(long *)out_status_code->u.val; + ctx->startingOutStatusCodeValue = get_stat_val(out_status_code); } return ctx; @@ -796,9 +796,8 @@ int openserSIPStatusCodesTable_get_value( if (the_stat != NULL) { /* Calculate the Delta */ - context->openserSIPStatusCodeIns = - *(long *)the_stat->u.val - - context->startingInStatusCodeValue; + context->openserSIPStatusCodeIns = get_stat_val(the_stat) - + context->startingInStatusCodeValue; } snmp_set_var_typed_value(var, ASN_COUNTER, @@ -817,7 +816,7 @@ int openserSIPStatusCodesTable_get_value( { /* Calculate the Delta */ context->openserSIPStatusCodeOuts = - *(long *)the_stat->u.val - + get_stat_val(the_stat) - context->startingOutStatusCodeValue; } snmp_set_var_typed_value(var, ASN_COUNTER,

1 0

git:andrei/counters: counters: doc update
by Andrei Pelinescu-Onciul 09 Aug '10

09 Aug '10

Module: sip-router Branch: andrei/counters Commit: 0c5cadddd86c31ce8021811ad4806c02200e21ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c5cadd… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 9 17:41:25 2010 +0200 counters: doc update - document the new format used by the script_counter modparam and by the script functions. - document the new cnt.help rpc. --- modules/counters/README | 60 ++++++++++++++++++++++++----------- modules/counters/doc/functions.xml | 24 ++++++++++---- modules/counters/doc/params.xml | 23 ++++++++++--- modules/counters/doc/rpc.xml | 13 ++++++++ 4 files changed, 88 insertions(+), 32 deletions(-) diff --git a/modules/counters/README b/modules/counters/README index 025f400..59b3fc6 100644 --- a/modules/counters/README +++ b/modules/counters/README @@ -17,9 +17,9 @@ Andrei Pelinescu-Onciul 1.3. Functions - 1.3.1. cnt_inc(name) - 1.3.2. cnt_add(name, number) - 1.3.3. cnt_reset(name) + 1.3.1. cnt_inc([group.]name) + 1.3.2. cnt_add([group.]name, number) + 1.3.3. cnt_reset([group.]name) 1.4. counters RPC Functions @@ -28,6 +28,7 @@ Andrei Pelinescu-Onciul 1.4.3. cnt.grps_list 1.4.4. cnt.var_list group 1.4.5. cnt.grp_get_all + 1.4.6. cnt.help group counter_name 1.1. Overview @@ -41,17 +42,25 @@ Andrei Pelinescu-Onciul 1.2.1. script_counter - Define a new counter that can be used from the script. The default - group name for the counter is "script" (it can be changed using the - script_cnt_grp_name module parameter). + Define a new counter that can be used from the script. The declaration + might include a group in front of the counter name, separated with '.'. + It might also include a counter description string (help message), + separated from the name with a ' ' or ':'. If the group is missing, the + group defined in the script_cnt_grp_name module parameter will be used + (the default is "script"). If the description is missing, the default + is "custom script counter". The format of the declaration is: + [group.]name[( |:)description]. Example 1. Create a new script_counter -modparam("counters", "script_counter", "foo") +modparam("counters", "script_counter", "foo") # script.foo +modparam("counters", "script_counter", "test.bar") # test.bar +modparam("counters", "script_counter", "baz example counter") # script.baz +modparam("counters", "script_counter", "test.x:another example") # test.x 1.2.2. script_cnt_grp_name - Group name that will be used for all the counters defined via the - script_counter module parameter. + Group name that will be used for the counters defined via the + script_counter module parameter which do not have a specified group. Default: "script". @@ -63,38 +72,44 @@ modparam("counters", "script_cnt_grp_name", "my_counters") Revision History Revision $Revision$ $Date$ -1.3.1. cnt_inc(name) +1.3.1. cnt_inc([group.]name) - Increments the counter name. The counter must be defined using the - script_counter module parameter. + Increments the counter group.name. The counter must be defined using + the script_counter module parameter. If the group name is missing, the + group specified by the script_cnt_grp_name modparam will be used. Example 3. cnt_inc usage ... modparam("counters", "script_counter", "reqs") +modparam("counters", "script_counter", "out.reqs forwarded requests") ... route { cnt_inc("reqs"); + if (forward(uri:host, uri:port)) + cnt_inc("out.reqs"); ... } -1.3.2. cnt_add(name, number) +1.3.2. cnt_add([group.]name, number) - Adds number the counter name. The counter must be defined using the - script_counter module parameter. + Adds number the counter group.name. The counter must be defined using + the script_counter module parameter. If the group name is missing, the + group specified by the script_cnt_grp_name modparam will be used. Example 4. cnt_add usage ... -modparam("counters", "script_counter", "reqs10") +modparam("counters", "script_counter", "reqs10 reqs times 10") ... route { cnt_add("reqs10", 10); ... } -1.3.3. cnt_reset(name) +1.3.3. cnt_reset([group.]name) - Resets the counter name. The counter must be defined using the - script_counter module parameter. + Resets the counter group.name. The counter must be defined using the + script_counter module parameter. If the group name is missing, the + group specified by the script_cnt_grp_name modparam will be used. Example 5. cnt_reset usage ... @@ -146,3 +161,10 @@ route { Example 10. cnt.var_list group usage $ sercmd cnt.grp_get_all script + +1.4.6. cnt.help group counter_name + + Displays the counter description. + + Example 11. cnt.help grp name usage + $ sercmd cnt.help script foo diff --git a/modules/counters/doc/functions.xml b/modules/counters/doc/functions.xml index 0138e68..a004872 100644 --- a/modules/counters/doc/functions.xml +++ b/modules/counters/doc/functions.xml @@ -23,21 +23,26 @@ <section id="cnt_inc"> <title> - <function>cnt_inc(name)</function> + <function>cnt_inc([group.]name)</function> </title> <para> - Increments the counter <emphasis>name</emphasis>. The counter + Increments the counter <emphasis>group.name</emphasis>. The counter must be defined using the <varname>script_counter</varname> module parameter. + If the group name is missing, the group specified by the + <varname>script_cnt_grp_name</varname> modparam will be used. </para> <example> <title><function>cnt_inc</function> usage</title> <programlisting> ... modparam("counters", "script_counter", "reqs") +modparam("counters", "script_counter", "out.reqs forwarded requests") ... route { cnt_inc("reqs"); + if (forward(uri:host, uri:port)) + cnt_inc("out.reqs"); ... } </programlisting> @@ -46,18 +51,21 @@ route { <section id="cnt_add"> <title> - <function>cnt_add(name, number)</function> + <function>cnt_add([group.]name, number)</function> </title> <para> - Adds <emphasis>number</emphasis> the counter <emphasis>name</emphasis>. + Adds <emphasis>number</emphasis> the counter + <emphasis>group.name</emphasis>. The counter must be defined using the <varname>script_counter</varname> module parameter. + If the group name is missing, the group specified by the + <varname>script_cnt_grp_name</varname> modparam will be used. </para> <example> <title><function>cnt_add</function> usage</title> <programlisting> ... -modparam("counters", "script_counter", "reqs10") +modparam("counters", "script_counter", "reqs10 reqs times 10") ... route { cnt_add("reqs10", 10); @@ -69,12 +77,14 @@ route { <section id="cnt_reset"> <title> - <function>cnt_reset(name)</function> + <function>cnt_reset([group.]name)</function> </title> <para> - Resets the counter <emphasis>name</emphasis>. The counter + Resets the counter <emphasis>group.name</emphasis>. The counter must be defined using the <varname>script_counter</varname> module parameter. + If the group name is missing, the group specified by the + <varname>script_cnt_grp_name</varname> modparam will be used. </para> <example> <title><function>cnt_reset</function> usage</title> diff --git a/modules/counters/doc/params.xml b/modules/counters/doc/params.xml index 52c1ba9..e8b1510 100644 --- a/modules/counters/doc/params.xml +++ b/modules/counters/doc/params.xml @@ -22,16 +22,26 @@ <title><varname>script_counter</varname></title> <para> Define a new counter that can be used from the script. - The default group name for the counter is "script" - (it can be changed using the - <varname>script_cnt_grp_name</varname> module parameter). + The declaration might include a group in front of the counter + name, separated with '.'. It might also include a counter + description string (help message), separated from the name + with a ' ' or ':'. + If the group is missing, the group defined in the + <varname>script_cnt_grp_name</varname> module parameter will + be used (the default is "script"). + If the description is missing, the default is + "custom script counter". + The format of the declaration is: [group.]name[( |:)description]. </para> <example> <title> Create a new <varname>script_counter</varname> </title> <programlisting> -modparam("counters", "script_counter", "foo") +modparam("counters", "script_counter", "foo") # script.foo +modparam("counters", "script_counter", "test.bar") # test.bar +modparam("counters", "script_counter", "baz example counter") # script.baz +modparam("counters", "script_counter", "test.x:another example") # test.x </programlisting> </example> </section> @@ -39,8 +49,9 @@ modparam("counters", "script_counter", "foo") <section id="scrip_cnt_grp_name"> <title><varname>script_cnt_grp_name</varname></title> <para> - Group name that will be used for all the counters defined - via the <varname>script_counter</varname> module parameter. + Group name that will be used for the counters defined + via the <varname>script_counter</varname> module parameter which + do not have a specified group. </para> <para> Default: "script". diff --git a/modules/counters/doc/rpc.xml b/modules/counters/doc/rpc.xml index 9782ce0..a01e6bb 100644 --- a/modules/counters/doc/rpc.xml +++ b/modules/counters/doc/rpc.xml @@ -85,5 +85,18 @@ </example> </section> + <section id="cnt.help"> + <title> <function>cnt.help group counter_name</function></title> + <para> + Displays the counter description. + </para> + <example> + <title><function>cnt.help grp name</function> usage</title> + <programlisting> + $ &sercmd; cnt.help script foo + </programlisting> + </example> + </section> + </section>

1 0

git:andrei/counters: counters: extended declaration syntax
by Andrei Pelinescu-Onciul 09 Aug '10

09 Aug '10

Module: sip-router Branch: andrei/counters Commit: e43c19c98cc2c6c26cab2da66e85803e95ff521c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e43c19c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 9 17:13:40 2010 +0200 counters: extended declaration syntax Counters declarations can now include a group and a description. E.g.: modparam("counters", "script_counter", "test.foo example counter) (declares counter foo in group test with the description "example counter") The format for the declarations is: [grp.]name[( |:)desc] '.' separates the group from the counter name and ' ' or ':' the name from the description. If the group is missing, the group defined by script_cnt_grp_name will be used (default "script"). If the description is missing, "custom script counter." will be used. Counter manipulating script functions can now include a group. The format for the script functions counter parameters is: [grp.]name. E.g.: cnt.inc("test.foo") --- modules/counters/counters.c | 60 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 53 insertions(+), 7 deletions(-) diff --git a/modules/counters/counters.c b/modules/counters/counters.c index 3c77fef..1755308 100644 --- a/modules/counters/counters.c +++ b/modules/counters/counters.c @@ -125,24 +125,52 @@ struct module_exports exports= { }; + +/** parse the the script_counter modparam. + * Format: [grp.]name[( |:)desc] + * E.g.: + * "name" => new counter: *cnt_script_grp."name" + * "grp.name" => new counter: "grp"."name" + * "name desc" => new counter "name", desc = "desc" + * "grp.name desc" => "grp"."name", desc = "desc". + */ static int add_script_counter(modparam_t type, void* val) { char* name; counter_handle_t h; int ret; + char* grp; + char* desc; + char* p; if ((type & PARAM_STRING) == 0) { BUG("bad parameter type %d\n", type); goto error; } name = (char*) val; - ret = counter_register(&h, cnt_script_grp, name, 0, 0, 0, "script counter", 0); + grp = cnt_script_grp; /* default group */ + desc = "custom script counter."; /* default desc. */ + if ((p = strchr(name, ':')) != 0 || + (p = strchr(name, ' ')) != 0) { + /* found desc. */ + *p = 0; + for(p = p+1; *p && (*p == ' ' || *p == '\t'); p++); + if (*p) + desc = p; + } + if ((p = strchr(name, '.')) != 0) { + /* found group */ + grp = name; + *p = 0; + name = p+1; + } + ret = counter_register(&h, grp, name, 0, 0, 0, desc, 0); if (ret < 0) { if (ret == -2) { - ERR("counter %s.%s already registered\n", cnt_script_grp, name); + ERR("counter %s.%s already registered\n", grp, name); return 0; } - ERR("failed to register counter %s.%s\n", cnt_script_grp, name); + ERR("failed to register counter %s.%s\n", grp, name); goto error; } return 0; @@ -155,12 +183,21 @@ error: static int cnt_fixup1(void** param, int param_no) { char* name; + char* grp; + char* p; counter_handle_t h; name = (char*)*param; - if (counter_lookup(&h, cnt_script_grp, name) < 0) { + grp = cnt_script_grp; /* default group */ + if ((p = strchr(name, '.')) != 0) { + /* found group */ + grp = name; + name = p+1; + *p = 0; + } + if (counter_lookup(&h, grp, name) < 0) { ERR("counter %s.%s does not exist (forgot to define it?)\n", - cnt_script_grp, name); + grp, name); return -1; } *param = (void*)(long)h.id; @@ -172,13 +209,22 @@ static int cnt_fixup1(void** param, int param_no) static int cnt_int_fixup(void** param, int param_no) { char* name; + char* grp; + char* p; counter_handle_t h; if (param_no == 1) { name = (char*)*param; - if (counter_lookup(&h, cnt_script_grp, name) < 0) { + grp = cnt_script_grp; /* default group */ + if ((p = strchr(name, '.')) != 0) { + /* found group */ + grp = name; + name = p+1; + *p = 0; + } + if (counter_lookup(&h, grp, name) < 0) { ERR("counter %s.%s does not exist (forgot to define it?)\n", - cnt_script_grp, name); + grp, name); return -1; } *param = (void*)(long)h.id;

1 0

git:andrei/counters: sercmd: cnt.help command line completion support
by Andrei Pelinescu-Onciul 09 Aug '10

09 Aug '10

Module: sip-router Branch: andrei/counters Commit: 92e30a1e983e99c236ab64fdf2f90bed85ea58cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=92e30a1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 9 17:12:08 2010 +0200 sercmd: cnt.help command line completion support Command line completion support for counter groups and names when using cnt.help. --- utils/sercmd/sercmd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 94dc390..a309b3f 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -352,6 +352,7 @@ char* complete_param1_counter_grp[] = { "cnt.grp_get_all", "cnt.reset", "cnt.var_list", + "cnt.help", 0 }; @@ -360,6 +361,7 @@ char* complete_param2_counter_name[] = { "cnt.get", "cnt.get_raw", "cnt.reset", + "cnt.help", 0 }; #endif /* USE_COUNTERS */

1 0

git:master: siputils(k): fix bug introduced in the sl unification
by Henning Westerholt 09 Aug '10

09 Aug '10

Module: sip-router Branch: master Commit: 6f7bd906b64527667d5067795ff3401796708a1a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f7bd90… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Aug 9 17:25:14 2010 +0200 siputils(k): fix bug introduced in the sl unification --- modules_k/siputils/options.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/siputils/options.c b/modules_k/siputils/options.c index cac1158..d12e396 100644 --- a/modules_k/siputils/options.c +++ b/modules_k/siputils/options.c @@ -112,7 +112,7 @@ int opt_reply(struct sip_msg* _msg, char* _foo, char* _bar) { if (add_lump_rpl( _msg, rpl_hf.s, rpl_hf.len, LUMP_RPL_HDR|LUMP_RPL_NODUP)!=0) { - if (opt_slb.send_reply(_msg, 200, &opt_200_rpl) == -1) { + if (opt_slb.freply(_msg, 200, &opt_200_rpl) == -1) { LM_ERR("failed to send 200 via send_reply\n"); return -1; } @@ -124,7 +124,7 @@ int opt_reply(struct sip_msg* _msg, char* _foo, char* _bar) { } error: - if (opt_slb.send_reply(_msg, 500, &opt_500_rpl) == -1) { + if (opt_slb.freply(_msg, 500, &opt_500_rpl) == -1) { LM_ERR("failed to send 500 via send_reply\n"); return -1; }

1 0

git:andrei/counters: counters: cnt.help and api update
by Andrei Pelinescu-Onciul 09 Aug '10

09 Aug '10

Module: sip-router Branch: andrei/counters Commit: 4477123b4981879de826df54df8a0a7f22807b70 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4477123… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 9 17:09:03 2010 +0200 counters: cnt.help and api update - new RPC for displaying a counter description, e.g.: $ sercmd cnt.help tcp local_reject number of rejected incoming connections. - counter_register() update (takes an extra parameter: the counter description) --- modules/counters/counters.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/modules/counters/counters.c b/modules/counters/counters.c index c163730..3c77fef 100644 --- a/modules/counters/counters.c +++ b/modules/counters/counters.c @@ -92,6 +92,10 @@ static const char* cnt_grp_get_all_doc[] = { "list all counter names and values in a specified group", 0 }; +static void cnt_help_rpc(rpc_t* rpc, void* ctx); +static const char* cnt_help_doc[] = { + "print the description of a counter (group and counter name required).", 0 +}; @@ -102,6 +106,7 @@ static rpc_export_t counters_rpc[] = { {"cnt.grps_list", cnt_grps_list_rpc, cnt_grps_list_doc, RET_ARRAY }, {"cnt.var_list", cnt_var_list_rpc, cnt_var_list_doc, RET_ARRAY }, {"cnt.grp_get_all", cnt_grp_get_all_rpc, cnt_grp_get_all_doc, 0 }, + {"cnt.help", cnt_help_rpc, cnt_help_doc, 0}, { 0, 0, 0, 0} }; @@ -131,7 +136,7 @@ static int add_script_counter(modparam_t type, void* val) goto error; } name = (char*) val; - ret = counter_register(&h, cnt_script_grp, name, 0, 0, 0, 0); + ret = counter_register(&h, cnt_script_grp, name, 0, 0, 0, "script counter", 0); if (ret < 0) { if (ret == -2) { ERR("counter %s.%s already registered\n", cnt_script_grp, name); @@ -365,4 +370,30 @@ static void cnt_grp_get_all_rpc(rpc_t* rpc, void* c) counter_iterate_grp_vars(group, rpc_print_name_val, &packed_params); } + + +static void cnt_help_rpc(rpc_t* rpc, void* ctx) +{ + char* group; + char* name; + char* desc; + counter_handle_t h; + + if (rpc->scan(ctx, "ss", &group, &name) < 2) { + /* rpc->fault(c, 400, "group and counter name required"); */ + return; + } + if (counter_lookup(&h, group, name) < 0) { + rpc->fault(ctx, 400, "non-existent counter %s.%s\n", group, name); + return; + } + desc = counter_get_doc(h); + if (desc) + rpc->add(ctx, "s", desc); + else + rpc->fault(ctx, 400, "no description for counter %s.%s\n", + group, name); + return; +} + /* vi: set ts=4 sw=4 tw=79:ai:cindent: */

1 0

git:andrei/counters: tcp: switched to counter arrays + more stats
by Andrei Pelinescu-Onciul 09 Aug '10

09 Aug '10

Module: sip-router Branch: andrei/counters Commit: 17ac58e824e44a298e9211a33089b99841f66217 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17ac58e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 9 17:01:11 2010 +0200 tcp: switched to counter arrays + more stats - use counters arrays - added counters description/doc - don't attempt to compile if tcp support or tcp stats support are disabled. - more stats: current_opened_connections and current_write_queue_size. --- tcp_stats.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 70 insertions(+), 10 deletions(-) diff --git a/tcp_stats.c b/tcp_stats.c index e0a8fc0..dc2dd61 100644 --- a/tcp_stats.c +++ b/tcp_stats.c @@ -25,11 +25,77 @@ * 2010-08-08 initial version (andrei) */ +#ifdef USE_TCP #include "tcp_stats.h" + +#ifdef USE_TCP_STATS + #include "counters.h" +#include "tcp_info.h" struct tcp_counters_h tcp_cnts_h; + +enum tcp_info_req { TCP_INFO_NONE, TCP_INFO_CONN_NO, TCP_INFO_WR_QUEUE_SZ }; + +static counter_val_t tcp_info(counter_handle_t h, void* what); + +/* tcp counters definitions */ +counter_def_t tcp_cnt_defs[] = { + {&tcp_cnts_h.established, "established", 0, 0, 0, + "incremented each time a tcp connection is established."}, + {&tcp_cnts_h.passive_open, "passive_open", 0, 0, 0, + "total number of accepted connections (so far)."}, + {&tcp_cnts_h.connect_success, "connect_success", 0, 0, 0, + "total number of successfully active opened connections" + " (successful connect()s)."}, + {&tcp_cnts_h.connect_failed, "connect_failed", 0, 0, 0, + "number of failed active connection attempts."}, + {&tcp_cnts_h.local_reject, "local_reject", 0, 0, 0, + "number of rejected incoming connections."}, + {&tcp_cnts_h.con_timeout, "con_timeout", 0, 0, 0, + "total number of connections that did timeout (idle for too long)."}, + {&tcp_cnts_h.con_reset, "con_reset", 0, 0, 0, + "total number of TCP_RSTs received on established connections."}, + {&tcp_cnts_h.send_timeout, "send_timeout", 0, 0, 0, + "number of send attempts that failed due to a timeout" + "(note: works only in tcp async mode)."}, + {&tcp_cnts_h.sendq_full, "sendq_full", 0, 0, 0, + "number of send attempts that failed because of exceeded buffering" + "capacity (send queue full, works only in tcp async mode)."}, + {0, "current_opened_connections", 0, + tcp_info, (void*)(long)TCP_INFO_CONN_NO, + "number of currently opened connections."}, + {0, "current_write_queue_size", 0, + tcp_info, (void*)(long)TCP_INFO_WR_QUEUE_SZ, + "current sum of all the connections write queue sizes."}, + {0, 0, 0, 0, 0, 0 } +}; + + + +/** helper function for some stats (which are kept internally inside tcp). + */ +static counter_val_t tcp_info(counter_handle_t h, void* what) +{ + enum tcp_info_req w; + struct tcp_gen_info ti; + + if (tcp_disable) + return 0; + w = (int)(long)what; + tcp_get_info(&ti); + switch(w) { + case TCP_INFO_CONN_NO: + return ti.tcp_connections_no; + case TCP_INFO_WR_QUEUE_SZ: + return ti.tcp_write_queued; + case TCP_INFO_NONE: + break; + }; + return 0; +} + /** intialize tcp statistics. * Must be called before forking. * @return < 0 on errror, 0 on success. @@ -40,15 +106,8 @@ int tcp_stats_init() if (counter_register(&tcp_cnts_h.name, "tcp", # name, 0, 0, 0, 0) < 0) \ goto error; - TCP_REG_COUNTER(established); - TCP_REG_COUNTER(passive_open); - TCP_REG_COUNTER(connect_success); - TCP_REG_COUNTER(connect_failed); - TCP_REG_COUNTER(local_reject); - TCP_REG_COUNTER(con_timeout); - TCP_REG_COUNTER(con_reset); - TCP_REG_COUNTER(send_timeout); - TCP_REG_COUNTER(sendq_full); + if (counter_register_array("tcp", tcp_cnt_defs) < 0) + goto error; return 0; error: return -1; @@ -61,5 +120,6 @@ void tcp_stats_destroy() } - +#endif /* USE_TCP_STATS */ +#endif /* USE_TCP */ /* vi: set ts=4 sw=4 tw=79:ai:cindent: */

1 0

git:andrei/counters: sctp: switched to counter arrays + more stats
by Andrei Pelinescu-Onciul 09 Aug '10

09 Aug '10

Module: sip-router Branch: andrei/counters Commit: 62ab77b9b7692f48067f36cf241d7feb0879de2f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=62ab77b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 9 17:04:41 2010 +0200 sctp: switched to counter arrays + more stats - use counters arrays - added counters descriptions - don't attempt to compile if sctp support or sctp stats support are disabled - more stats: current_opened_connections and current_tracked_connections. --- sctp_stats.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 72 insertions(+), 11 deletions(-) diff --git a/sctp_stats.c b/sctp_stats.c index 46b8a49..e024811 100644 --- a/sctp_stats.c +++ b/sctp_stats.c @@ -25,29 +25,87 @@ * 2010-08-09 initial version (andrei) */ +#ifdef USE_SCTP + #include "sctp_stats.h" + +#ifdef USE_SCTP_STATS + #include "counters.h" +#include "sctp_server.h" struct sctp_counters_h sctp_cnts_h; + +enum sctp_info_req { SCTP_INFO_NONE, SCTP_INFO_CONN_NO, SCTP_INFO_TRACKED_NO }; +static counter_val_t sctp_info(counter_handle_t h, void* what); + + + +/* sctp counters definitions */ +counter_def_t sctp_cnt_defs[] = { + {&sctp_cnts_h.established, "established", 0, 0, 0, + "incremented each time a new association is established."}, + {&sctp_cnts_h.connect_failed, "connect_failed", 0, 0, 0, + "incremented each time a new outgoing connection fails."}, + {&sctp_cnts_h.local_reject, "local_reject", 0, 0, 0, + "number of rejected incoming connections."}, + {&sctp_cnts_h.remote_shutdown, "remote_shutdown", 0, 0, 0, + "incremented each time an association is closed by the peer."}, + {&sctp_cnts_h.assoc_shutdown, "assoc_shutdown", 0, 0, 0, + "incremented each time an association is shutdown."}, + {&sctp_cnts_h.comm_lost, "comm_lost", 0, 0, 0, + "incremented each time an established connection is close due to" + "some error."}, + {&sctp_cnts_h.sendq_full, "sendq_full", 0, 0, 0, + "number of failed send attempt due to exceeded buffering capacity" + " (full kernel buffers)."}, + {&sctp_cnts_h.send_failed, "send_failed", 0, 0, 0, + "number of failed send attempt for any reason except full buffers."}, + {&sctp_cnts_h.send_force_retry, "send_force_retry", 0, 0, 0, + "incremented each time a failed send is force-retried" + "(possible only if sctp_send_retries ! = 0"}, + {0, "current_opened_connections", 0, + sctp_info, (void*)(long)SCTP_INFO_CONN_NO, + "number of currently opened associations."}, + {0, "current_tracked_connections", 0, + sctp_info, (void*)(long)SCTP_INFO_TRACKED_NO, + "number of currently tracked associations."}, + {0, 0, 0, 0, 0, 0 } +}; + + + +/** helper function for some stats (which are kept internally inside sctp). + */ +static counter_val_t sctp_info(counter_handle_t h, void* what) +{ + enum sctp_info_req w; + struct sctp_gen_info i; + + if (sctp_disable) + return 0; + w = (int)(long)what; + sctp_get_info(&i); + switch(w) { + case SCTP_INFO_CONN_NO: + return i.sctp_connections_no; + case SCTP_INFO_TRACKED_NO: + return i.sctp_tracked_no; + case SCTP_INFO_NONE: + break; + }; + return 0; +} + /** intialize sctp statistics. * Must be called before forking. * @return < 0 on errror, 0 on success. */ int sctp_stats_init() { -#define SCTP_REG_COUNTER(name) \ - if (counter_register(&sctp_cnts_h.name, "sctp", # name, 0, 0, 0, 0) < 0) \ + if (counter_register_array("sctp", sctp_cnt_defs) < 0) goto error; - - SCTP_REG_COUNTER(established); - SCTP_REG_COUNTER(connect_failed); - SCTP_REG_COUNTER(local_reject); - SCTP_REG_COUNTER(remote_shutdown); - SCTP_REG_COUNTER(assoc_shutdown); - SCTP_REG_COUNTER(comm_lost); - SCTP_REG_COUNTER(sendq_full); - SCTP_REG_COUNTER(send_force_retry); return 0; error: return -1; @@ -59,4 +117,7 @@ void sctp_stats_destroy() /* do nothing */ } +#endif /* USE_SCTP_STATS */ +#endif /* USE_SCTP */ + /* vi: set ts=4 sw=4 tw=79:ai:cindent: */

1 0

git:andrei/counters: core: counters arrays and counters descriptions
by Andrei Pelinescu-Onciul 09 Aug '10

09 Aug '10

Module: sip-router Branch: andrei/counters Commit: a719d6ae7f9b2227ab483600d8979561b49b32ba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a719d6a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 9 16:51:36 2010 +0200 core: counters arrays and counters descriptions - each counter must have a description / help string. - allow null handles in counter_register(). - counters arrays can be used to conveniently describe and register several counters in the same time. E.g.: counter_def_t my_counters_defs[] = { {&h1, "counter1", 0, 0, 0, "test counter1"}, {&h2, "counter2", 0, 0, 0, "test counter2"}, {0, "counter3", 0, get_cbk, 0, "counter with callback"}, {0, 0, 0, 0, 0, 0} }; counter_register_array("my_counters", my_counters_defs); --- counters.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++------------ counters.h | 38 ++++++++++++++++++++---- 2 files changed, 108 insertions(+), 26 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a71…

1 0

git:andrei/counters: core: k statistics counter api update
by Andrei Pelinescu-Onciul 09 Aug '10

09 Aug '10

Module: sip-router Branch: andrei/counters Commit: 83fc52f0d894a0b0e5a7e895391bd9f0dfdb203a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83fc52f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 9 16:59:57 2010 +0200 core: k statistics counter api update counter_register() takes now an extra parameter (description). --- lib/kcore/kstats_wrapper.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/kcore/kstats_wrapper.c b/lib/kcore/kstats_wrapper.c index 076fbf9..4feeebb 100644 --- a/lib/kcore/kstats_wrapper.c +++ b/lib/kcore/kstats_wrapper.c @@ -62,9 +62,12 @@ int register_stat( char *module, char *name, stat_var **pvar, int flags) cnt_flags = (flags & STAT_NO_RESET) ? CNT_F_NO_RESET : 0; if (flags & STAT_IS_FUNC) ret = counter_register(&h, module, name, cnt_flags, - cnt_cbk_wrapper,(stat_function)pvar , 0); + cnt_cbk_wrapper,(stat_function)pvar, + "kamailio statistic (no description)", + 0); else - ret = counter_register(&h, module, name, cnt_flags, 0, 0, 0); + ret = counter_register(&h, module, name, cnt_flags, 0, 0, + "kamailio statistic (no description)", 0); if (ret < 0) { if (ret == -2) ERR("counter %s.%s already registered\n", module, name);

1 0

← Newer
1
...
27
28
29
30
31
32
33
34
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2010