[sr-dev] git:master:9113defb: Merge pull request #1646 from rromrrom/stats_by_method

Module: kamailio Branch: master Commit: 9113defb29b152cf41a961f7e82b1630d30464bd URL: https://github.com/kamailio/kamailio/commit/9113defb29b152cf41a961f7e82b163… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: GitHub &lt;noreply(a)github.com&gt; Date: 2018-09-24T09:29:38+02:00 Merge pull request #1646 from rromrrom/stats_by_method kex: Extend kamailio rcv_replies statistics --- Modified: src/modules/kex/core_stats.c Modified: src/modules/kex/core_stats.h --- Diff: https://github.com/kamailio/kamailio/commit/9113defb29b152cf41a961f7e82b163… Patch: https://github.com/kamailio/kamailio/commit/9113defb29b152cf41a961f7e82b163… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index ad8f42964d..5d2bcc13a1 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -82,6 +82,29 @@ stat_var* rcv_rpls_486; stat_var* rcv_rpls_5xx; stat_var* rcv_rpls_6xx; +#define VAR_NAME(method) rcv_rpls_ ## method + +#define STAT_NAME(method, group) "rcv_replies_" #group "xx_" #method + +#define DECLARE_STAT_VARS(method) stat_var* VAR_NAME(method)[6]; + +#define DECLARE_STATS(method) \ + { STAT_NAME(method, 1), 0, &VAR_NAME(method)[0] }, \ + { STAT_NAME(method, 2), 0, &VAR_NAME(method)[1] }, \ + { STAT_NAME(method, 3), 0, &VAR_NAME(method)[2] }, \ + { STAT_NAME(method, 4), 0, &VAR_NAME(method)[3] }, \ + { STAT_NAME(method, 5), 0, &VAR_NAME(method)[4] }, \ + { STAT_NAME(method, 6), 0, &VAR_NAME(method)[5] } + +DECLARE_STAT_VARS(invite); +DECLARE_STAT_VARS(cancel); +DECLARE_STAT_VARS(bye); +DECLARE_STAT_VARS(reg); +DECLARE_STAT_VARS(message); +DECLARE_STAT_VARS(prack); +DECLARE_STAT_VARS(update); +DECLARE_STAT_VARS(refer); + /*! exported core statistics */ stat_export_t core_stats[] = { {"rcv_requests" , 0, &rcv_reqs }, @@ -121,6 +144,14 @@ stat_export_t core_stats[] = { {"bad_URIs_rcvd", 0, &bad_URIs }, {"unsupported_methods", 0, &unsupported_methods }, {"bad_msg_hdr", 0, &bad_msg_hdr }, + DECLARE_STATS(invite), + DECLARE_STATS(cancel), + DECLARE_STATS(bye), + DECLARE_STATS(reg), + DECLARE_STATS(message), + DECLARE_STATS(prack), + DECLARE_STATS(update), + DECLARE_STATS(refer), {0,0,0} }; @@ -200,6 +231,28 @@ static int km_cb_req_stats(struct sip_msg *msg, return 1; } +static int km_cb_rpl_stats_by_method(struct sip_msg *msg, + unsigned int flags, void *param) +{ + int method = get_cseq(msg)->method_id; + int group = msg->first_line.u.reply.statuscode / 100 - 1; + + if (group >= 1 && group <= 6) { + switch(method) { + case METHOD_INVITE: update_stat( VAR_NAME(invite)[group], 1); break; + case METHOD_CANCEL: update_stat( VAR_NAME(cancel)[group], 1); break; + case METHOD_BYE: update_stat( VAR_NAME(bye)[group], 1); break; + case METHOD_REGISTER: update_stat( VAR_NAME(reg)[group], 1); break; + case METHOD_MESSAGE: update_stat( VAR_NAME(message)[group], 1); break; + case METHOD_PRACK: update_stat( VAR_NAME(prack)[group], 1); break; + case METHOD_UPDATE: update_stat( VAR_NAME(update)[group], 1); break; + case METHOD_REFER: update_stat( VAR_NAME(refer)[group], 1); break; + } + } + + return 1; +} + static int km_cb_rpl_stats(struct sip_msg *msg, unsigned int flags, void *param) { @@ -321,6 +374,10 @@ int register_core_stats(void) LM_ERR("failed to register PRE request callback\n"); return -1; } + if (register_script_cb(km_cb_rpl_stats_by_method, PRE_SCRIPT_CB|ONREPLY_CB, 0)<0 ) { + LM_ERR("failed to register PRE request callback\n"); + return -1; + } if (stats_proc_stats_init_rpc()<0) return -1; sr_event_register_cb(SREV_CORE_STATS, sts_update_core_stats); diff --git a/src/modules/kex/core_stats.h b/src/modules/kex/core_stats.h index ae59e9463f..72a5f5becc 100644 --- a/src/modules/kex/core_stats.h +++ b/src/modules/kex/core_stats.h @@ -69,6 +69,8 @@ extern stat_var* rcv_rpls_480; extern stat_var* rcv_rpls_486; extern stat_var* rcv_rpls_5xx; extern stat_var* rcv_rpls_6xx; +extern stat_var* rcv_rpls_2xx_invite; +extern stat_var* rcv_rpls_4xx_invite; /*! \brief forwarded requests */ extern stat_var* fwd_reqs;