sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

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, 3 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, 3 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, 3 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, 3 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, 3 months

git:andrei/counters: sercmd: added command line completion for counters

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: 388ac89f2cdc2ed6a411238fb9b8b17531557b33 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=388ac89… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 8 19:33:32 2010 +0200 sercmd: added command line completion for counters Command line completion for counters groups and names, for all the counters RPCs defined in the counters module. --- utils/sercmd/sercmd.c | 317 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 316 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=388…

14 years, 3 months

git:andrei/counters: counters: added docs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: 5c9d70108df0a318ec62c5dcf64f37b3d969a4ac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c9d701… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 8 19:32:03 2010 +0200 counters: added docs --- modules/counters/README | 148 ++++++++++++++++++++++++++++++++++++ modules/counters/doc/Makefile | 4 + modules/counters/doc/counters.xml | 51 ++++++++++++ modules/counters/doc/functions.xml | 94 +++++++++++++++++++++++ modules/counters/doc/params.xml | 58 ++++++++++++++ modules/counters/doc/rpc.xml | 89 +++++++++++++++++++++ 6 files changed, 444 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5c9…

14 years, 3 months

git:andrei/counters: counters: new modules for counters manipulations

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: 90ba454289fb76ba3ba2badd025e6cd41c581740 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90ba454… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 8 19:25:07 2010 +0200 counters: new modules for counters manipulations New module for manipulating counters via the script, or RPCs. Script functions: cnt_inc(name) cnt_add(name, val) cnt_reset(name) Before using a counter in the script it must be declared using: modparam("counters", "script_counter", counter_name) RPCs: cnt.get grp name - get counter value cnt.reset grp name - reset counter cnt.grps_list - list all the counter groups cnt.var_list grp - list all the counters names in a group cnt.grp_get_all grp - list all the counters and their value, in a group --- modules/counters/Makefile | 12 ++ modules/counters/counters.c | 368 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 380 insertions(+), 0 deletions(-) diff --git a/modules/counters/Makefile b/modules/counters/Makefile new file mode 100644 index 0000000..2f325fb --- /dev/null +++ b/modules/counters/Makefile @@ -0,0 +1,12 @@ +# $Id$ +# + +include ../../Makefile.defs +auto_gen= +NAME=counters.so +LIBS= + +DEFS+=-DSER_MOD_INTERFACE + +include ../../Makefile.modules + diff --git a/modules/counters/counters.c b/modules/counters/counters.c new file mode 100644 index 0000000..c163730 --- /dev/null +++ b/modules/counters/counters.c @@ -0,0 +1,368 @@ +/*$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. + */ +/** counters/statistics rpcs and script functions. + * @file counters.c + * @ingroup counters + * Module: counters. + */ +/* + * History: + * ------- + * 2010-08-06 created by andrei + */ + + +#include "../../modparam.h" +#include "../../dprint.h" +#include "../../compiler_opt.h" +#include "../../counters.h" + +MODULE_VERSION + +/* default script counter group name */ +static char* cnt_script_grp = "script"; + +static int add_script_counter(modparam_t type, void* val); +static int cnt_inc_f(struct sip_msg*, char*, char*); +static int cnt_add_f(struct sip_msg*, char*, char*); +static int cnt_reset_f(struct sip_msg*, char*, char*); +static int cnt_fixup1(void** param, int param_no); +static int cnt_int_fixup(void** param, int param_no); + + + +static cmd_export_t cmds[] = { + {"cnt_inc", cnt_inc_f, 1, cnt_fixup1, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|ONSEND_ROUTE}, + {"cnt_add", cnt_add_f, 2, cnt_int_fixup, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|ONSEND_ROUTE}, + {"cnt_reset", cnt_reset_f, 1, cnt_fixup1, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|ONSEND_ROUTE}, + {0,0,0,0,0} +}; + +static param_export_t params[] = { + {"script_cnt_grp_name", PARAM_STRING, &cnt_script_grp}, + {"script_counter", PARAM_STRING|PARAM_USE_FUNC, add_script_counter}, + {0,0,0} +}; + + +static void cnt_get_rpc(rpc_t* rpc, void* ctx); +static const char* cnt_get_doc[] = { + "get counter value (takes group and counter name as parameters)", 0 +}; + +static void cnt_reset_rpc(rpc_t* rpc, void* ctx); +static const char* cnt_reset_doc[] = { + "reset counter (takes group and counter name as parameters)", 0 +}; + +static void cnt_get_raw_rpc(rpc_t* rpc, void* ctx); +static const char* cnt_get_raw_doc[] = { + "get raw counter value (debugging version)", 0 +}; + +static void cnt_grps_list_rpc(rpc_t* rpc, void* ctx); +static const char* cnt_grps_list_doc[] = { + "list all the counter group names", 0 +}; + +static void cnt_var_list_rpc(rpc_t* rpc, void* ctx); +static const char* cnt_var_list_doc[] = { + "list all the counters names in a specified group", 0 +}; + +static void cnt_grp_get_all_rpc(rpc_t* rpc, void* ctx); +static const char* cnt_grp_get_all_doc[] = { + "list all counter names and values in a specified group", 0 +}; + + + + +static rpc_export_t counters_rpc[] = { + {"cnt.get", cnt_get_rpc, cnt_get_doc, 0 }, + {"cnt.reset", cnt_reset_rpc, cnt_reset_doc, 0 }, + {"cnt.get_raw", cnt_get_raw_rpc, cnt_get_raw_doc, 0 }, + {"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 }, + { 0, 0, 0, 0} +}; + + + +struct module_exports exports= { + "counters", + cmds, + counters_rpc, /* RPC methods */ + params, + 0, /* module initialization function */ + 0, /* response function */ + 0, /* destroy function */ + 0, /* on_cancel function */ + 0, /* per-child init function */ +}; + + +static int add_script_counter(modparam_t type, void* val) +{ + char* name; + counter_handle_t h; + int ret; + + 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, 0); + if (ret < 0) { + if (ret == -2) { + ERR("counter %s.%s already registered\n", cnt_script_grp, name); + return 0; + } + ERR("failed to register counter %s.%s\n", cnt_script_grp, name); + goto error; + } + return 0; +error: + return -1; +} + + + +static int cnt_fixup1(void** param, int param_no) +{ + char* name; + counter_handle_t h; + + name = (char*)*param; + if (counter_lookup(&h, cnt_script_grp, name) < 0) { + ERR("counter %s.%s does not exist (forgot to define it?)\n", + cnt_script_grp, name); + return -1; + } + *param = (void*)(long)h.id; + return 0; +} + + + +static int cnt_int_fixup(void** param, int param_no) +{ + char* name; + counter_handle_t h; + + if (param_no == 1) { + name = (char*)*param; + if (counter_lookup(&h, cnt_script_grp, name) < 0) { + ERR("counter %s.%s does not exist (forgot to define it?)\n", + cnt_script_grp, name); + return -1; + } + *param = (void*)(long)h.id; + } else + return fixup_var_int_2(param, param_no); + return 0; +} + + + +static int cnt_inc_f(struct sip_msg* msg, char* handle, char* bar) +{ + counter_handle_t h; + + h.id = (long)(void*)handle; + counter_inc(h); + return 1; +} + + + +static int cnt_add_f(struct sip_msg* msg, char* handle, char* val) +{ + counter_handle_t h; + int v; + + h.id = (long)(void*)handle; + if (unlikely(get_int_fparam(&v, msg, (fparam_t*)val) < 0)) { + ERR("non integer parameter\n"); + return -1; + } + counter_add(h, v); + return 1; +} + + + +static int cnt_reset_f(struct sip_msg* msg, char* handle, char* bar) +{ + counter_handle_t h; + + h.id = (long)(void*)handle; + counter_reset(h); + return 1; +} + + + +static void cnt_get_rpc(rpc_t* rpc, void* c) +{ + char* group; + char* name; + counter_val_t v; + counter_handle_t h; + + if (rpc->scan(c, "ss", &group, &name) < 2) { + /* rpc->fault(c, 400, "group and counter name required"); */ + return; + } + if (counter_lookup(&h, group, name) < 0) { + rpc->fault(c, 400, "non-existent counter %s.%s\n", group, name); + return; + } + v = counter_get_val(h); + rpc->add(c, "d", (int)v); + return; +} + + + +static void cnt_get_raw_rpc(rpc_t* rpc, void* c) +{ + char* group; + char* name; + counter_val_t v; + counter_handle_t h; + + if (rpc->scan(c, "ss", &group, &name) < 2) { + /* rpc->fault(c, 400, "group and counter name required"); */ + return; + } + if (counter_lookup(&h, group, name) < 0) { + rpc->fault(c, 400, "non-existent counter %s.%s\n", group, name); + return; + } + v = counter_get_raw_val(h); + rpc->add(c, "d", (int)v); + return; +} + + + +static void cnt_reset_rpc(rpc_t* rpc, void* c) +{ + char* group; + char* name; + counter_handle_t h; + + if (rpc->scan(c, "ss", &group, &name) < 2) { + /* rpc->fault(c, 400, "group and counter name required"); */ + return; + } + if (counter_lookup(&h, group, name) < 0) { + rpc->fault(c, 400, "non-existent counter %s.%s\n", group, name); + return; + } + counter_reset(h); + return; +} + + + +struct rpc_list_params { + rpc_t* rpc; + void* ctx; +}; + + +/* helper callback for iterating groups or names */ +static void rpc_print_name(void* param, str* n) +{ + struct rpc_list_params* p; + rpc_t* rpc; + void* ctx; + + p = param; + rpc = p->rpc; + ctx = p->ctx; + rpc->add(ctx, "S", n); +} + + +/* helper callback for iterating on variable names & values*/ +static void rpc_print_name_val(void* param, str* g, str* n, + counter_handle_t h) +{ + struct rpc_list_params* p; + rpc_t* rpc; + void* s; + + p = param; + rpc = p->rpc; + s = p->ctx; + rpc->struct_add(s, "d", n->s, (int)counter_get_val(h)); +} + + + +static void cnt_grps_list_rpc(rpc_t* rpc, void* c) +{ + struct rpc_list_params packed_params; + + packed_params.rpc = rpc; + packed_params.ctx = c; + counter_iterate_grp_names(rpc_print_name, &packed_params); +} + + + +static void cnt_var_list_rpc(rpc_t* rpc, void* c) +{ + char* group; + struct rpc_list_params packed_params; + + if (rpc->scan(c, "s", &group) < 1) { + /* rpc->fault(c, 400, "group name required"); */ + return; + } + packed_params.rpc = rpc; + packed_params.ctx = c; + counter_iterate_grp_var_names(group, rpc_print_name, &packed_params); +} + + + +static void cnt_grp_get_all_rpc(rpc_t* rpc, void* c) +{ + void* s; + char* group; + struct rpc_list_params packed_params; + + if (rpc->scan(c, "s", &group) < 1) { + /* rpc->fault(c, 400, "group name required"); */ + return; + } + if (rpc->add(c, "{", &s) < 0) return; + packed_params.rpc = rpc; + packed_params.ctx = s; + counter_iterate_grp_vars(group, rpc_print_name_val, &packed_params); +} + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */

14 years, 3 months

git:andrei/counters: sercmd: fix cfg. var name completion

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: 261d8282e6dabf73a65904e7a8413ccec9faf2fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=261d828… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 8 18:09:17 2010 +0200 sercmd: fix cfg. var name completion In some rare cases cfg. variable name completion did not work properly (e.g. reusing a command from history, editing it, changing the group and attempting command completion again). This was due to an assumption that the state would be re-initialized on new commands (which is mostly not true). --- utils/sercmd/sercmd.c | 49 ++++++++++++++++++++++--------------------------- 1 files changed, 22 insertions(+), 27 deletions(-) diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 1f1a721..3b4432a 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -1802,36 +1802,31 @@ char** sercmd_completion(const char* text, int start, int end) } } #endif /* USE_MI */ -#ifdef USE_CFG_VARS }else if (crt_param_no==2){ - if (attempted_completion_state!=COMPLETE_CFG_GRP){ - for(i=0; complete_params_cfg_var[i]; i++){ - if ((cmd_len==strlen(complete_params_cfg_var[i])) && - (strncmp(&rl_line_buffer[cmd_start], +#ifdef USE_CFG_VARS + /* see if we complete cfg. var names for this command */ + for(i=0; complete_params_cfg_var[i]; i++){ + if ((cmd_len==strlen(complete_params_cfg_var[i])) && + (strncmp(&rl_line_buffer[cmd_start], complete_params_cfg_var[i], cmd_len)==0)){ - attempted_completion_state=COMPLETE_CFG_GRP; - /* find grp_start */ - for(j=cmd_end; (j<start) && ((rl_line_buffer[j]==' ') - || (rl_line_buffer[j]=='\t')); j++); - grp_start=j; - break; - } - } - } - if (attempted_completion_state==COMPLETE_CFG_GRP){ - /* get the group name from the grp_param */ - /* find first whitespace for the group name*/ - for(j=grp_start; (j<start) && (rl_line_buffer[j]!=' ') && - (rl_line_buffer[j]!='\t'); j++); - grp_len=j-grp_start; - for(grp=cfg_grp_lst; grp; grp=grp->next){ - if (grp_len==grp->grp_name.len && - memcmp(&rl_line_buffer[grp_start], grp->grp_name.s, - grp_len)==0) { - attempted_completion_state=COMPLETE_CFG_VAR; - crt_cfg_grp=grp; - goto end; + /* get the group name: */ + /* find grp_start */ + for(j=cmd_end; (j<start) && ((rl_line_buffer[j]==' ') || + (rl_line_buffer[j]=='\t')); j++); + grp_start=j; + /* find group end / grp_len*/ + for(j=grp_start; (j<start) && (rl_line_buffer[j]!=' ') && + (rl_line_buffer[j]!='\t'); j++); + grp_len=j-grp_start; + for(grp=cfg_grp_lst; grp; grp=grp->next){ + if (grp_len==grp->grp_name.len && + memcmp(&rl_line_buffer[grp_start], + grp->grp_name.s, grp_len)==0) { + attempted_completion_state=COMPLETE_CFG_VAR; + crt_cfg_grp=grp; + goto end; + } } } }

14 years, 3 months

git:andrei/counters: core: counters / statistics support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: 4208dc00cf245559ed3152beace6084c7c6c4571 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4208dc0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Aug 8 18:41:30 2010 +0200 core: counters / statistics support Efficient counters support (api). Incrementing or adding a value to a defined counter is extremely fast at the cost of slower reading (each process has its own set of counters => no cacheline ping-pong and no expensive atomic operations). All counters must be defined before forking (in a module this means from mod_init() or init_child(rank==PROC_INIT)). A counter is uniquely identified by its group and its name (and not only by its name like in kamailio stats). Example (error checking skipped): /* before forking, e.g. mod_init() */ counter_handle_t h; /* declare the counter my_grp.foo */ counter_register(&h, "my_grp", "foo", 0, 0, 0, 0); /* after forking */ counter_inc(h); /* getting a counter value, knowing its group and name*/ counter_lookup(&h, "my_grp", "foo"); val = counter_get(h); --- counters.c | 696 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ counters.h | 124 +++++++++++ main.c | 10 +- 3 files changed, 828 insertions(+), 2 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=420…

14 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2010