sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:andrei/counters: counters: cnt.help and api update

by Andrei Pelinescu-Onciul

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: */

14 years, 6 months

git:andrei/counters: core: k statistics counter api update

by Andrei Pelinescu-Onciul

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);

14 years, 6 months

git:andrei/counters: core: counters arrays and counters descriptions

by Andrei Pelinescu-Onciul

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…

14 years, 6 months

git:andrei/counters: sctp: switched to counter arrays + more stats

by Andrei Pelinescu-Onciul

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: */

14 years, 6 months

git:andrei/counters: tcp: switched to counter arrays + more stats

by Andrei Pelinescu-Onciul

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: */

14 years, 6 months

git:andrei/counters: doc: NEWS counters/stats update

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: 42ce02609d7e056c9d7362c756bc01827f4b42b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42ce026… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 9 00:40:40 2010 +0200 doc: NEWS counters/stats update --- NEWS | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 5d691cb..1173aae 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,8 @@ $Id$ sip-router 3.1 chages core: + - statistics / counters support for tcp and sctp (enable by default) + - statistics / counters api - networks addresses support in ip comparisons (src_ip, dst_ip, to_ip) with strings or rvalue expressions. E.g.: $ip=10.0.0.0; if (src_ip == $ip +"/8") .... @@ -35,6 +37,11 @@ new config variables: 3 - prefer records with longer lifetime modules: + - counters: functions and RPCs for manipulating counters (statistics): + modparam("counters", "script_counter", name) + cnt_inc(name) + cnt_add(name, val) + cnt_reset(name) - blst: functions for ignoring blacklist events per message: blst_set_ignore(mask): set the events in mask in the per per message blacklist ignore mask for a request

14 years, 6 months

git:andrei/counters: sctp: enable statistics

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: be186dac78d509f1a36133cbcde1204b613733f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be186da… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 9 00:35:04 2010 +0200 sctp: enable statistics sctp statistics implemented using the counters api. Enabled by default (unless compiles with -DNO_SCTP_STATS). E.g.: $ sercmd cnt.grp_get_all sctp { assoc_shutdown: 1 comm_lost: 0 connect_failed: 1 established: 1 local_reject: 0 remote_shutdown: 1 send_force_retry: 0 sendq_full: 0 } --- sctp_stats.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sctp_stats.h | 55 +++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 106 insertions(+), 11 deletions(-) diff --git a/sctp_stats.c b/sctp_stats.c new file mode 100644 index 0000000..46b8a49 --- /dev/null +++ b/sctp_stats.c @@ -0,0 +1,62 @@ +/* + * $Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/** sctp statistics. + * @file sctp_stats.c + * @ingroup: core (sctp) + */ +/* + * History: + * -------- + * 2010-08-09 initial version (andrei) +*/ + +#include "sctp_stats.h" +#include "counters.h" + +struct sctp_counters_h sctp_cnts_h; + +/** 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) \ + 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; +} + + +void sctp_stats_destroy() +{ + /* do nothing */ +} + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/sctp_stats.h b/sctp_stats.h index 4f6efdb..1ce6f8d 100644 --- a/sctp_stats.h +++ b/sctp_stats.h @@ -28,6 +28,11 @@ #define __sctp_stats_h +/* enable sctp stats by default */ +#ifndef NO_SCTP_STATS +#define USE_SCTP_STATS +#endif + #ifndef USE_SCTP_STATS #define INIT_SCTP_STATS() 0 /* success */ @@ -45,59 +50,87 @@ #else /* USE_SCTP_STATS */ -#define INIT_SCTP_STATS() 0 /* success */ +#include "counters.h" -#define DESTROY_SCTP_STATS() +struct sctp_counters_h { + counter_handle_t established; + counter_handle_t connect_failed; + counter_handle_t local_reject; + counter_handle_t remote_shutdown; + counter_handle_t assoc_shutdown; + counter_handle_t comm_lost; + counter_handle_t sendq_full; + counter_handle_t send_failed; + counter_handle_t send_force_retry; +}; + +extern struct sctp_counters_h sctp_cnts_h; + +int sctp_stats_init(); +void sctp_stats_destroy(); + +#define INIT_SCTP_STATS() sctp_stats_init() /* success */ + +#define DESTROY_SCTP_STATS() sctp_stats_destroy() /** called each time a new sctp assoc. is established. * sctp notification: SCTP_COMM_UP. */ -#define SCTP_STATS_ESTABLISHED() +#define SCTP_STATS_ESTABLISHED() \ + counter_inc(sctp_cnts_h.established) /** called each time a new outgoing connection/assoc open fails. * sctp notification: SCTP_CANT_STR_ASSOC */ -#define SCTP_STATS_CONNECT_FAILED() +#define SCTP_STATS_CONNECT_FAILED() \ + counter_inc(sctp_cnts_h.connect_failed) /** called each time a new incoming connection is rejected. */ -#define SCTP_STATS_LOCAL_REJECT() +#define SCTP_STATS_LOCAL_REJECT() \ + counter_inc(sctp_cnts_h.local_reject) /** called each time a connection is closed by the peer. * sctp notification: SCTP_SHUTDOWN_EVENT */ -#define SCTP_STATS_REMOTE_SHUTDOWN() +#define SCTP_STATS_REMOTE_SHUTDOWN() \ + counter_inc(sctp_cnts_h.remote_shutdown) /** called each time a connection is shutdown. * sctp notification: SCTP_SHUTDOWN_COMP */ -#define SCTP_STATS_ASSOC_SHUTDOWN() +#define SCTP_STATS_ASSOC_SHUTDOWN() \ + counter_inc(sctp_cnts_h.assoc_shutdown) /** called each time an established connection is closed due to some error. * sctp notification: SCTP_COMM_LOST */ -#define SCTP_STATS_COMM_LOST() +#define SCTP_STATS_COMM_LOST() \ + counter_inc(sctp_cnts_h.comm_lost) /** called each time a send fails due to the buffering capacity being exceeded. * (send fails due to full kernel buffers) */ -#define SCTP_STATS_SENDQ_FULL() +#define SCTP_STATS_SENDQ_FULL() \ + counter_inc(sctp_cnts_h.sendq_full) /** called each time a send fails. * (send fails for any reason except buffers full) * sctp notification: SCTP_SEND_FAILED */ -#define SCTP_STATS_SEND_FAILED() +#define SCTP_STATS_SEND_FAILED() \ + counter_inc(sctp_cnts_h.send_failed) /** called each time a failed send is force-retried. * (possible only if sctp_send_retries is != 0) */ -#define SCTP_STATS_SEND_FORCE_RETRY() +#define SCTP_STATS_SEND_FORCE_RETRY() \ + counter_inc(sctp_cnts_h.send_force_retry) #endif /* USE_SCTP_STATS */

14 years, 6 months

git:andrei/counters: tcp: enable tcp statistics

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: 1aca6a526b718c95eecdb86e17f7f0eeb7abf0bc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1aca6a5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 9 00:16:54 2010 +0200 tcp: enable tcp statistics tcp statistics implemented using the counters api. Enabled by default (unless compiles with -DNO_TCP_STATS). E.g.: $ sercmd cnt.grp_get_all tcp { con_reset: 4 con_timeout: 0 connect_failed: 6 connect_success: 1 established: 12 local_reject: 0 passive_open: 11 send_timeout: 0 sendq_full: 0 } --- tcp_stats.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tcp_stats.h | 55 +++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 111 insertions(+), 9 deletions(-) diff --git a/tcp_stats.c b/tcp_stats.c new file mode 100644 index 0000000..e0a8fc0 --- /dev/null +++ b/tcp_stats.c @@ -0,0 +1,65 @@ +/* + * $Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/** tcp statistics. + * @file tcp_stats.c + * @ingroup: core + */ +/* + * History: + * -------- + * 2010-08-08 initial version (andrei) +*/ + +#include "tcp_stats.h" +#include "counters.h" + +struct tcp_counters_h tcp_cnts_h; + +/** intialize tcp statistics. + * Must be called before forking. + * @return < 0 on errror, 0 on success. + */ +int tcp_stats_init() +{ +#define TCP_REG_COUNTER(name) \ + 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); + return 0; +error: + return -1; +} + + +void tcp_stats_destroy() +{ + /* do nothing */ +} + + + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/tcp_stats.h b/tcp_stats.h index 67c1ddc..f39e2ec 100644 --- a/tcp_stats.h +++ b/tcp_stats.h @@ -27,6 +27,11 @@ #ifndef __tcp_stats_h #define __tcp_stats_h +/* enable tcp stats by default */ +#ifndef NO_TCP_STATS +#define USE_TCP_STATS +#endif + #ifndef USE_TCP_STATS #define INIT_TCP_STATS() 0 /* success */ @@ -42,9 +47,28 @@ #else /* USE_TCP_STATS */ -#define INIT_TCP_STATS() 0 /* success */ +#include "counters.h" -#define DESTROY_TCP_STATS() +struct tcp_counters_h { + counter_handle_t established; + counter_handle_t passive_open; + counter_handle_t connect_success; + counter_handle_t connect_failed; + counter_handle_t local_reject; + counter_handle_t con_timeout; + counter_handle_t con_reset; + counter_handle_t send_timeout; + counter_handle_t sendq_full; +}; + +extern struct tcp_counters_h tcp_cnts_h; + +int tcp_stats_init(); +void tcp_stats_destroy(); + +#define INIT_TCP_STATS() tcp_stats_init() + +#define DESTROY_TCP_STATS() tcp_stats_destroy() /** called each time a new tcp connection is established. @@ -54,36 +78,49 @@ * sent on the new connection and not immediately after accept() or * connect() */ -#define TCP_STATS_ESTABLISHED(state) +#define TCP_STATS_ESTABLISHED(state) \ + do { \ + counter_inc(tcp_cnts_h.established); \ + if (state == S_CONN_ACCEPT) \ + counter_inc(tcp_cnts_h.passive_open); \ + else \ + counter_inc(tcp_cnts_h.connect_success); \ + }while(0) /** called each time a new outgoing connection fails. */ -#define TCP_STATS_CONNECT_FAILED() +#define TCP_STATS_CONNECT_FAILED() \ + counter_inc(tcp_cnts_h.connect_failed) /** called each time a new incoming connection is rejected. * (accept() denied due to maximum number of TCP connections being exceeded) */ -#define TCP_STATS_LOCAL_REJECT() +#define TCP_STATS_LOCAL_REJECT() \ + counter_inc(tcp_cnts_h.local_reject) /** called each time a connection lifetime expires. * (the connection is closed for being idle for too long) */ -#define TCP_STATS_CON_TIMEOUT() +#define TCP_STATS_CON_TIMEOUT() \ + counter_inc(tcp_cnts_h.con_timeout) /** called each time a TCP RST is received on an established connection. */ -#define TCP_STATS_CON_RESET() +#define TCP_STATS_CON_RESET() \ + counter_inc(tcp_cnts_h.con_reset) /** called each time a send operation fails due to a timeout. * FIXME: it works only in async mode (in sync. mode a send might timeout * but the stats won't be increased). */ -#define TCP_STATS_SEND_TIMEOUT() +#define TCP_STATS_SEND_TIMEOUT() \ + counter_inc(tcp_cnts_h.send_timeout) /** called each time a send fails due to the buffering capacity being exceeded. * (used only in tcp async mode) */ -#define TCP_STATS_SENDQ_FULL() +#define TCP_STATS_SENDQ_FULL() \ + counter_inc(tcp_cnts_h.sendq_full) #endif /* USE_TCP_STATS */

14 years, 6 months

git:andrei/counters: kex(k): updated to the lastest statistics changes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: 7eb676b4bf8c04dc1a63a69d9b9545297de77072 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7eb676b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 8 19:47:06 2010 +0200 kex(k): updated to the lastest statistics changes kex used some lower-level statistics access (some of the functions and data types that were deleted) and required some minor updates. --- modules_k/kex/core_stats.c | 58 +++++++++++++++++++------------------------ modules_k/kex/kex_mod.c | 3 -- 2 files changed, 26 insertions(+), 35 deletions(-) diff --git a/modules_k/kex/core_stats.c b/modules_k/kex/core_stats.c index 466dd11..6c5cd30 100644 --- a/modules_k/kex/core_stats.c +++ b/modules_k/kex/core_stats.c @@ -201,14 +201,12 @@ int register_core_stats(void) inline static int mi_add_stat(struct mi_node *rpl, stat_var *stat) { struct mi_node *node; - stats_collector *sc; - if((sc = get_stats_collector())==NULL) return -1; + if (stats_support()==0) return -1; - node = addf_mi_node_child(rpl, 0, 0, 0, "%.*s:%.*s = %lu", - sc->amodules[stat->mod_idx].name.len, - sc->amodules[stat->mod_idx].name.s, - stat->name.len, stat->name.s, + node = addf_mi_node_child(rpl, 0, 0, 0, "%s:%s = %lu", + ZSW(get_stat_module(stat)), + ZSW(get_stat_name(stat)), get_stat_val(stat) ); if (node==0) @@ -216,37 +214,36 @@ inline static int mi_add_stat(struct mi_node *rpl, stat_var *stat) return 0; } -inline static int mi_add_module_stats(struct mi_node *rpl, - module_stats *mods) + + +/* callback for counter_iterate_grp_vars. */ +static void mi_add_grp_vars_cbk(void* r, str* g, str* n, counter_handle_t h) { + struct mi_node *rpl; struct mi_node *node; - stat_var *stat; - - for( stat=mods->head ; stat ; stat=stat->lnext) { - node = addf_mi_node_child(rpl, 0, 0, 0, "%.*s:%.*s = %lu", - mods->name.len, mods->name.s, - stat->name.len, stat->name.s, - get_stat_val(stat) ); - if (node==0) - return -1; - } - return 0; + + rpl = r; + node = addf_mi_node_child(rpl, 0, 0, 0, "%.*s:%.*s = %lu", + g->len, g->s, n->len, n->s, counter_get_val(h)); } +/* callback for counter_iterate_grp_names */ +static void mi_add_all_grps_cbk(void* p, str* g) +{ + counter_iterate_grp_vars(g->s, mi_add_grp_vars_cbk, p); +} + static struct mi_root *mi_get_stats(struct mi_root *cmd, void *param) { struct mi_root *rpl_tree; struct mi_node *rpl; struct mi_node *arg; - module_stats *mods; stat_var *stat; str val; - int i; - stats_collector *sc; - if((sc = get_stats_collector())==NULL) + if(stats_support()==0) return init_mi_tree( 404, "Statistics Not Found", 20); if (cmd->node.kids==NULL) @@ -265,18 +262,15 @@ static struct mi_root *mi_get_stats(struct mi_root *cmd, void *param) if ( val.len==3 && memcmp(val.s,"all",3)==0) { /* add all statistic variables */ - for( i=0 ; i<sc->mod_no ;i++ ) { - if (mi_add_module_stats( rpl, &sc->amodules[i] )!=0) - goto error; - } + /* use direct counters access for that */ + counter_iterate_grp_names(mi_add_all_grps_cbk, rpl); } else if ( val.len>1 && val.s[val.len-1]==':') { /* add module statistics */ val.len--; - mods = get_stat_module( &val ); - if (mods==0) - continue; - if (mi_add_module_stats( rpl, mods )!=0) - goto error; + val.s[val.len]=0; /* zero term. */ + /* use direct counters access for that */ + counter_iterate_grp_vars(val.s, mi_add_grp_vars_cbk, rpl); + val.s[val.len]=':' /* restore */; } else { /* add only one statistic */ stat = get_stat( &val ); diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index bc35656..d86cfbd 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -124,9 +124,6 @@ static int mod_init(void) */ static void destroy(void) { -#ifdef STATISTICS - destroy_stats_collector(); -#endif return; }

14 years, 6 months

git:andrei/counters: kcore stats: rewrote in terms of the counters api

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: efb487e2a47d7c714821d506b5efe8cf46d632a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=efb487e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 8 19:36:48 2010 +0200 kcore stats: rewrote in terms of the counters api Most of the original kamailio statistics functions and data types are now wrappers over sr counters. The only important usage difference is that sr counters are uniquely identified by group and name (one can have counters with the same name if they are in different groups), while kamailio stats vars had unique names. This means that when using the kamailio get_stat(name) the first counter matching that name will be returned (in the future this kind of usage should be obsoleted). Removed functions (not needed): get_stats_collector() destroy_stats_collector() Removed data types: stats_collector module_stats New functions: stats_support() - partially replaces get_stats_collector(). get_stat_name() - returns the name of a stat_var. get_stat_module() - returns the module of a stat_var. --- lib/kcore/kstats_wrapper.c | 105 ++++++++++++++++++ lib/kcore/kstats_wrapper.h | 171 ++++++++++++++++++++++++++++++ lib/kcore/statistics.c | 251 +------------------------------------------- lib/kcore/statistics.h | 104 +------------------ 4 files changed, 279 insertions(+), 352 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=efb…

14 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev