From 65daf0988f44953c218f401d6027682822fff9da Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 17 May 2023 16:36:54 +0200 Subject: [PATCH] kex: clang-format for coherent indentation and coding style --- src/modules/kex/core_stats.c | 643 +++++++++++++++++------------------ src/modules/kex/core_stats.h | 76 ++--- src/modules/kex/flags.c | 73 ++-- src/modules/kex/kex_mod.c | 152 ++++----- src/modules/kex/km_core.c | 53 ++- src/modules/kex/km_core.h | 2 +- src/modules/kex/mod_stats.c | 113 +++--- src/modules/kex/pkg_stats.c | 127 +++---- 8 files changed, 584 insertions(+), 655 deletions(-) diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index 816ae39a90f..8db604ec4be 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -42,59 +42,61 @@ #ifdef STATISTICS -stat_var* rcv_reqs; /*!< received requests */ -stat_var* rcv_rpls; /*!< received replies */ -stat_var* fwd_reqs; /*!< forwarded requests */ -stat_var* fwd_rpls; /*!< forwarded replies */ -stat_var* drp_reqs; /*!< dropped requests */ -stat_var* drp_rpls; /*!< dropped replies */ -stat_var* err_reqs; /*!< error requests */ -stat_var* err_rpls; /*!< error replies */ -stat_var* bad_URIs; /*!< number of bad URIs */ -stat_var* unsupported_methods; /*!< unsupported methods */ -stat_var* bad_msg_hdr; /*!< messages with bad header */ +stat_var *rcv_reqs; /*!< received requests */ +stat_var *rcv_rpls; /*!< received replies */ +stat_var *fwd_reqs; /*!< forwarded requests */ +stat_var *fwd_rpls; /*!< forwarded replies */ +stat_var *drp_reqs; /*!< dropped requests */ +stat_var *drp_rpls; /*!< dropped replies */ +stat_var *err_reqs; /*!< error requests */ +stat_var *err_rpls; /*!< error replies */ +stat_var *bad_URIs; /*!< number of bad URIs */ +stat_var *unsupported_methods; /*!< unsupported methods */ +stat_var *bad_msg_hdr; /*!< messages with bad header */ /*! received requests by method */ -stat_var* rcv_reqs_invite; -stat_var* rcv_reqs_cancel; -stat_var* rcv_reqs_ack; -stat_var* rcv_reqs_bye; -stat_var* rcv_reqs_info; -stat_var* rcv_reqs_register; -stat_var* rcv_reqs_subscribe; -stat_var* rcv_reqs_notify; -stat_var* rcv_reqs_message; -stat_var* rcv_reqs_options; -stat_var* rcv_reqs_prack; -stat_var* rcv_reqs_update; -stat_var* rcv_reqs_refer; -stat_var* rcv_reqs_publish; +stat_var *rcv_reqs_invite; +stat_var *rcv_reqs_cancel; +stat_var *rcv_reqs_ack; +stat_var *rcv_reqs_bye; +stat_var *rcv_reqs_info; +stat_var *rcv_reqs_register; +stat_var *rcv_reqs_subscribe; +stat_var *rcv_reqs_notify; +stat_var *rcv_reqs_message; +stat_var *rcv_reqs_options; +stat_var *rcv_reqs_prack; +stat_var *rcv_reqs_update; +stat_var *rcv_reqs_refer; +stat_var *rcv_reqs_publish; /*! extended received replies */ -stat_var* rcv_rpls_1xx; -stat_var* rcv_rpls_18x; -stat_var* rcv_rpls_2xx; -stat_var* rcv_rpls_3xx; -stat_var* rcv_rpls_4xx; -stat_var* rcv_rpls_401; -stat_var* rcv_rpls_404; -stat_var* rcv_rpls_407; -stat_var* rcv_rpls_480; -stat_var* rcv_rpls_486; -stat_var* rcv_rpls_5xx; -stat_var* rcv_rpls_6xx; - -#define VAR_NAME(method) rcv_rpls_ ## method +stat_var *rcv_rpls_1xx; +stat_var *rcv_rpls_18x; +stat_var *rcv_rpls_2xx; +stat_var *rcv_rpls_3xx; +stat_var *rcv_rpls_4xx; +stat_var *rcv_rpls_401; +stat_var *rcv_rpls_404; +stat_var *rcv_rpls_407; +stat_var *rcv_rpls_480; +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_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] } +#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); @@ -106,54 +108,41 @@ DECLARE_STAT_VARS(update); DECLARE_STAT_VARS(refer); /*! exported core statistics */ -stat_export_t core_stats[] = { - {"rcv_requests" , 0, &rcv_reqs }, - {"rcv_requests_invite" , 0, &rcv_reqs_invite }, - {"rcv_requests_cancel" , 0, &rcv_reqs_cancel }, - {"rcv_requests_ack" , 0, &rcv_reqs_ack }, - {"rcv_requests_bye" , 0, &rcv_reqs_bye }, - {"rcv_requests_info" , 0, &rcv_reqs_info }, - {"rcv_requests_register" , 0, &rcv_reqs_register }, - {"rcv_requests_subscribe" , 0, &rcv_reqs_subscribe }, - {"rcv_requests_notify" , 0, &rcv_reqs_notify }, - {"rcv_requests_message" , 0, &rcv_reqs_message }, - {"rcv_requests_options" , 0, &rcv_reqs_options }, - {"rcv_requests_prack" , 0, &rcv_reqs_prack }, - {"rcv_requests_update" , 0, &rcv_reqs_update }, - {"rcv_requests_refer" , 0, &rcv_reqs_refer }, - {"rcv_requests_publish" , 0, &rcv_reqs_publish }, - {"rcv_replies" , 0, &rcv_rpls }, - {"rcv_replies_1xx" , 0, &rcv_rpls_1xx }, - {"rcv_replies_18x" , 0, &rcv_rpls_18x }, - {"rcv_replies_2xx" , 0, &rcv_rpls_2xx }, - {"rcv_replies_3xx" , 0, &rcv_rpls_3xx }, - {"rcv_replies_4xx" , 0, &rcv_rpls_4xx }, - {"rcv_replies_401" , 0, &rcv_rpls_401 }, - {"rcv_replies_404" , 0, &rcv_rpls_404 }, - {"rcv_replies_407" , 0, &rcv_rpls_407 }, - {"rcv_replies_480" , 0, &rcv_rpls_480 }, - {"rcv_replies_486" , 0, &rcv_rpls_486 }, - {"rcv_replies_5xx" , 0, &rcv_rpls_5xx }, - {"rcv_replies_6xx" , 0, &rcv_rpls_6xx }, - {"fwd_requests" , 0, &fwd_reqs }, - {"fwd_replies" , 0, &fwd_rpls }, - {"drop_requests" , 0, &drp_reqs }, - {"drop_replies" , 0, &drp_rpls }, - {"err_requests" , 0, &err_reqs }, - {"err_replies" , 0, &err_rpls }, - {"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} -}; +stat_export_t core_stats[] = {{"rcv_requests", 0, &rcv_reqs}, + {"rcv_requests_invite", 0, &rcv_reqs_invite}, + {"rcv_requests_cancel", 0, &rcv_reqs_cancel}, + {"rcv_requests_ack", 0, &rcv_reqs_ack}, + {"rcv_requests_bye", 0, &rcv_reqs_bye}, + {"rcv_requests_info", 0, &rcv_reqs_info}, + {"rcv_requests_register", 0, &rcv_reqs_register}, + {"rcv_requests_subscribe", 0, &rcv_reqs_subscribe}, + {"rcv_requests_notify", 0, &rcv_reqs_notify}, + {"rcv_requests_message", 0, &rcv_reqs_message}, + {"rcv_requests_options", 0, &rcv_reqs_options}, + {"rcv_requests_prack", 0, &rcv_reqs_prack}, + {"rcv_requests_update", 0, &rcv_reqs_update}, + {"rcv_requests_refer", 0, &rcv_reqs_refer}, + {"rcv_requests_publish", 0, &rcv_reqs_publish}, + {"rcv_replies", 0, &rcv_rpls}, {"rcv_replies_1xx", 0, &rcv_rpls_1xx}, + {"rcv_replies_18x", 0, &rcv_rpls_18x}, + {"rcv_replies_2xx", 0, &rcv_rpls_2xx}, + {"rcv_replies_3xx", 0, &rcv_rpls_3xx}, + {"rcv_replies_4xx", 0, &rcv_rpls_4xx}, + {"rcv_replies_401", 0, &rcv_rpls_401}, + {"rcv_replies_404", 0, &rcv_rpls_404}, + {"rcv_replies_407", 0, &rcv_rpls_407}, + {"rcv_replies_480", 0, &rcv_rpls_480}, + {"rcv_replies_486", 0, &rcv_rpls_486}, + {"rcv_replies_5xx", 0, &rcv_rpls_5xx}, + {"rcv_replies_6xx", 0, &rcv_rpls_6xx}, {"fwd_requests", 0, &fwd_reqs}, + {"fwd_replies", 0, &fwd_rpls}, {"drop_requests", 0, &drp_reqs}, + {"drop_replies", 0, &drp_rpls}, {"err_requests", 0, &err_reqs}, + {"err_replies", 0, &err_rpls}, {"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}}; unsigned long shm_stats_get_size(void); unsigned long shm_stats_get_used(void); @@ -163,20 +152,18 @@ unsigned long shm_stats_get_free(void); unsigned long shm_stats_get_frags(void); stat_export_t shm_stats[] = { - {"total_size" , STAT_IS_FUNC, (stat_var**)shm_stats_get_size }, - {"used_size" , STAT_IS_FUNC, (stat_var**)shm_stats_get_used }, - {"real_used_size" , STAT_IS_FUNC, (stat_var**)shm_stats_get_rused }, - {"max_used_size" , STAT_IS_FUNC, (stat_var**)shm_stats_get_mused }, - {"free_size" , STAT_IS_FUNC, (stat_var**)shm_stats_get_free }, - {"fragments" , STAT_IS_FUNC, (stat_var**)shm_stats_get_frags }, - {0,0,0} -}; + {"total_size", STAT_IS_FUNC, (stat_var **)shm_stats_get_size}, + {"used_size", STAT_IS_FUNC, (stat_var **)shm_stats_get_used}, + {"real_used_size", STAT_IS_FUNC, (stat_var **)shm_stats_get_rused}, + {"max_used_size", STAT_IS_FUNC, (stat_var **)shm_stats_get_mused}, + {"free_size", STAT_IS_FUNC, (stat_var **)shm_stats_get_free}, + {"fragments", STAT_IS_FUNC, (stat_var **)shm_stats_get_frags}, + {0, 0, 0}}; int stats_proc_stats_init_rpc(void); -static int km_cb_req_stats(struct sip_msg *msg, - unsigned int flags, void *param) +static int km_cb_req_stats(struct sip_msg *msg, unsigned int flags, void *param) { update_stat(rcv_reqs, 1); if(!IS_SIP(msg)) @@ -184,137 +171,141 @@ static int km_cb_req_stats(struct sip_msg *msg, switch(msg->first_line.u.request.method_value) { case METHOD_INVITE: update_stat(rcv_reqs_invite, 1); - break; + break; case METHOD_CANCEL: update_stat(rcv_reqs_cancel, 1); - break; + break; case METHOD_ACK: update_stat(rcv_reqs_ack, 1); - break; + break; case METHOD_BYE: update_stat(rcv_reqs_bye, 1); - break; + break; case METHOD_INFO: update_stat(rcv_reqs_info, 1); - break; + break; case METHOD_REGISTER: update_stat(rcv_reqs_register, 1); - break; + break; case METHOD_SUBSCRIBE: update_stat(rcv_reqs_subscribe, 1); - break; + break; case METHOD_NOTIFY: update_stat(rcv_reqs_notify, 1); - break; + break; case METHOD_MESSAGE: update_stat(rcv_reqs_message, 1); - break; + break; case METHOD_OPTIONS: update_stat(rcv_reqs_options, 1); - break; + break; case METHOD_PRACK: update_stat(rcv_reqs_prack, 1); - break; + break; case METHOD_UPDATE: update_stat(rcv_reqs_update, 1); - break; + break; case METHOD_REFER: update_stat(rcv_reqs_refer, 1); - break; + break; case METHOD_PUBLISH: update_stat(rcv_reqs_publish, 1); - break; + break; case METHOD_OTHER: update_stat(unsupported_methods, 1); - break; + break; } return 1; } -static int km_cb_rpl_stats_by_method(struct sip_msg *msg, - unsigned int flags, void *param) +static int km_cb_rpl_stats_by_method( + struct sip_msg *msg, unsigned int flags, void *param) { int method = 0; int group = 0; - if(msg==NULL) { + if(msg == NULL) { return -1; } - if (!msg->cseq && (parse_headers(msg, HDR_CSEQ_F, 0) < 0 || !msg->cseq)) { + if(!msg->cseq && (parse_headers(msg, HDR_CSEQ_F, 0) < 0 || !msg->cseq)) { return -1; } method = get_cseq(msg)->method_id; group = msg->first_line.u.reply.statuscode / 100 - 1; - if (group >= 0 && group <= 5) { - 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; + if(group >= 0 && group <= 5) { + 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) +static int km_cb_rpl_stats(struct sip_msg *msg, unsigned int flags, void *param) { update_stat(rcv_rpls, 1); - if(msg->first_line.u.reply.statuscode > 99 && - msg->first_line.u.reply.statuscode <200) - { + if(msg->first_line.u.reply.statuscode > 99 + && msg->first_line.u.reply.statuscode < 200) { update_stat(rcv_rpls_1xx, 1); - if(msg->first_line.u.reply.statuscode > 179 && - msg->first_line.u.reply.statuscode <190) { - update_stat(rcv_rpls_18x, 1); + if(msg->first_line.u.reply.statuscode > 179 + && msg->first_line.u.reply.statuscode < 190) { + update_stat(rcv_rpls_18x, 1); } - } - else if(msg->first_line.u.reply.statuscode > 199 && - msg->first_line.u.reply.statuscode <300) - { + } else if(msg->first_line.u.reply.statuscode > 199 + && msg->first_line.u.reply.statuscode < 300) { update_stat(rcv_rpls_2xx, 1); - } - else if(msg->first_line.u.reply.statuscode > 299 && - msg->first_line.u.reply.statuscode <400) - { + } else if(msg->first_line.u.reply.statuscode > 299 + && msg->first_line.u.reply.statuscode < 400) { update_stat(rcv_rpls_3xx, 1); - } - else if(msg->first_line.u.reply.statuscode > 399 && - msg->first_line.u.reply.statuscode <500) - { + } else if(msg->first_line.u.reply.statuscode > 399 + && msg->first_line.u.reply.statuscode < 500) { update_stat(rcv_rpls_4xx, 1); switch(msg->first_line.u.reply.statuscode) { case 401: update_stat(rcv_rpls_401, 1); - break; + break; case 404: update_stat(rcv_rpls_404, 1); - break; + break; case 407: update_stat(rcv_rpls_407, 1); - break; + break; case 480: update_stat(rcv_rpls_480, 1); - break; + break; case 486: update_stat(rcv_rpls_486, 1); - break; + break; } - } - else if(msg->first_line.u.reply.statuscode > 499 && - msg->first_line.u.reply.statuscode <600) - { + } else if(msg->first_line.u.reply.statuscode > 499 + && msg->first_line.u.reply.statuscode < 600) { update_stat(rcv_rpls_5xx, 1); - } - else if(msg->first_line.u.reply.statuscode > 599 && - msg->first_line.u.reply.statuscode <700) - { + } else if(msg->first_line.u.reply.statuscode > 599 + && msg->first_line.u.reply.statuscode < 700) { update_stat(rcv_rpls_6xx, 1); } return 1; @@ -330,35 +321,35 @@ static int sts_update_core_stats(sr_event_param_t *evp) case 1: /* fwd_requests */ update_stat(fwd_reqs, 1); - break; + break; case 2: /* fwd_replies */ update_stat(fwd_rpls, 1); - break; + break; case 3: /* drop_requests */ update_stat(drp_reqs, 1); - break; + break; case 4: /* drop_replies */ update_stat(drp_rpls, 1); - break; + break; case 5: /* err_requests */ update_stat(err_reqs, 1); - break; + break; case 6: /* err_replies */ update_stat(err_rpls, 1); - break; + break; case 7: /* bad_URIs_rcvd */ update_stat(bad_URIs, 1); - break; + break; case 8: /* bad_msg_hdr */ update_stat(bad_msg_hdr, 1); - break; + break; } return 0; } @@ -366,28 +357,31 @@ static int sts_update_core_stats(sr_event_param_t *evp) int register_core_stats(void) { /* register core statistics */ - if (register_module_stats( "core", core_stats)!=0 ) { + if(register_module_stats("core", core_stats) != 0) { LM_ERR("failed to register core statistics\n"); return -1; } /* register sh_mem statistics */ - if (register_module_stats( "shmem", shm_stats)!=0 ) { + if(register_module_stats("shmem", shm_stats) != 0) { LM_ERR("failed to register sh_mem statistics\n"); return -1; } - if (register_script_cb(km_cb_req_stats, PRE_SCRIPT_CB|REQUEST_CB, 0)<0 ) { + if(register_script_cb(km_cb_req_stats, PRE_SCRIPT_CB | REQUEST_CB, 0) < 0) { LM_ERR("failed to register PRE request callback\n"); return -1; } - if (register_script_cb(km_cb_rpl_stats, PRE_SCRIPT_CB|ONREPLY_CB, 0)<0 ) { + if(register_script_cb(km_cb_rpl_stats, PRE_SCRIPT_CB | ONREPLY_CB, 0) < 0) { 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 ) { + 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; + if(stats_proc_stats_init_rpc() < 0) + return -1; sr_event_register_cb(SREV_CORE_STATS, sts_update_core_stats); return 0; @@ -399,10 +393,11 @@ int register_core_stats(void) /** * Parameters for RPC callback functions. */ -struct rpc_list_params { - rpc_t* rpc; - void* ctx; - void* hst; +struct rpc_list_params +{ + rpc_t *rpc; + void *ctx; + void *hst; int numeric; int clear; }; @@ -411,24 +406,24 @@ struct rpc_list_params { /** * Statistic getter RPC callback. */ -static void rpc_get_grp_vars_cbk(void* p, str* g, str* n, counter_handle_t h) +static void rpc_get_grp_vars_cbk(void *p, str *g, str *n, counter_handle_t h) { struct rpc_list_params *packed_params; - rpc_t* rpc; - void* ctx; + rpc_t *rpc; + void *ctx; packed_params = p; rpc = packed_params->rpc; ctx = packed_params->ctx; - rpc->rpl_printf(ctx, "%.*s:%.*s = %lu", - g->len, g->s, n->len, n->s, counter_get_val(h)); + rpc->rpl_printf(ctx, "%.*s:%.*s = %lu", g->len, g->s, n->len, n->s, + counter_get_val(h)); } /** * Group statistic getter RPC callback. */ -static void rpc_get_all_grps_cbk(void* p, str* g) +static void rpc_get_all_grps_cbk(void *p, str *g) { counter_iterate_grp_vars(g->s, rpc_get_grp_vars_cbk, p); } @@ -436,33 +431,30 @@ static void rpc_get_all_grps_cbk(void* p, str* g) /** * All statistic getter RPC callback. */ -static void stats_get_all(rpc_t* rpc, void* ctx, char* stat) +static void stats_get_all(rpc_t *rpc, void *ctx, char *stat) { int len = strlen(stat); struct rpc_list_params packed_params; str s_statistic; stat_var *s_stat; - if (len==3 && strcmp("all", stat)==0) { + if(len == 3 && strcmp("all", stat) == 0) { packed_params.rpc = rpc; packed_params.ctx = ctx; counter_iterate_grp_names(rpc_get_all_grps_cbk, &packed_params); - } - else if (stat[len-1]==':') { + } else if(stat[len - 1] == ':') { packed_params.rpc = rpc; packed_params.ctx = ctx; - stat[len-1] = '\0'; + stat[len - 1] = '\0'; counter_iterate_grp_vars(stat, rpc_get_grp_vars_cbk, &packed_params); - stat[len-1] = ':'; - } - else { + stat[len - 1] = ':'; + } else { s_statistic.s = stat; s_statistic.len = strlen(stat); s_stat = get_stat(&s_statistic); - if (s_stat) { - rpc->rpl_printf(ctx, "%s:%s = %lu", - ZSW(get_stat_module(s_stat)), ZSW(get_stat_name(s_stat)), - get_stat_val(s_stat)); + if(s_stat) { + rpc->rpl_printf(ctx, "%s:%s = %lu", ZSW(get_stat_module(s_stat)), + ZSW(get_stat_name(s_stat)), get_stat_val(s_stat)); } } } @@ -470,38 +462,39 @@ static void stats_get_all(rpc_t* rpc, void* ctx, char* stat) /** * RPC statistics getter. */ -static void rpc_stats_get_statistics(rpc_t* rpc, void* ctx) +static void rpc_stats_get_statistics(rpc_t *rpc, void *ctx) { - char* stat; + char *stat; - if (stats_support()==0) { + if(stats_support() == 0) { rpc->fault(ctx, 400, "stats support not enabled"); return; } - if (rpc->scan(ctx, "s", &stat) < 1) { + if(rpc->scan(ctx, "s", &stat) < 1) { rpc->fault(ctx, 400, "Please provide which stats to retrieve"); return; } stats_get_all(rpc, ctx, stat); - while((rpc->scan(ctx, "*s", &stat)>0)) { + while((rpc->scan(ctx, "*s", &stat) > 0)) { stats_get_all(rpc, ctx, stat); } return; } -static void rpc_fetch_add_stat(rpc_t* rpc, void* ctx, void* hst, char* g, char* n, unsigned long val, int numeric) { +static void rpc_fetch_add_stat(rpc_t *rpc, void *ctx, void *hst, char *g, + char *n, unsigned long val, int numeric) +{ char nbuf[128]; int res; snprintf(nbuf, 127, "%s.%s", g, n); - if (numeric) { + if(numeric) { res = rpc->struct_add(hst, "j", nbuf, val); } else { res = rpc->struct_printf(hst, nbuf, "%lu", val); } - if (res<0) - { + if(res < 0) { rpc->fault(ctx, 500, "Internal error"); return; } @@ -510,18 +503,19 @@ static void rpc_fetch_add_stat(rpc_t* rpc, void* ctx, void* hst, char* g, char* /** * Statistic getter RPC callback. */ -static void rpc_fetch_grp_vars_cbk(void* p, str* g, str* n, counter_handle_t h) +static void rpc_fetch_grp_vars_cbk(void *p, str *g, str *n, counter_handle_t h) { struct rpc_list_params *packed_params = p; - rpc_fetch_add_stat(packed_params->rpc, packed_params->ctx, packed_params->hst, - g->s, n->s, counter_get_val(h), packed_params->numeric); + rpc_fetch_add_stat(packed_params->rpc, packed_params->ctx, + packed_params->hst, g->s, n->s, counter_get_val(h), + packed_params->numeric); } /** * Group statistic getter RPC callback. */ -static void rpc_fetch_all_grps_cbk(void* p, str* g) +static void rpc_fetch_all_grps_cbk(void *p, str *g) { counter_iterate_grp_vars(g->s, rpc_fetch_grp_vars_cbk, p); } @@ -529,7 +523,8 @@ static void rpc_fetch_all_grps_cbk(void* p, str* g) /** * All statistic getter RPC callback. */ -static void stats_fetch_all(rpc_t* rpc, void* ctx, void* th, char* stat, int numeric) +static void stats_fetch_all( + rpc_t *rpc, void *ctx, void *th, char *stat, int numeric) { int len = strlen(stat); struct rpc_list_params packed_params; @@ -539,59 +534,58 @@ static void stats_fetch_all(rpc_t* rpc, void* ctx, void* th, char* stat, int num char *n; int i; - if (len==3 && strcmp("all", stat)==0) { + if(len == 3 && strcmp("all", stat) == 0) { packed_params.rpc = rpc; packed_params.ctx = ctx; packed_params.hst = th; packed_params.numeric = numeric; counter_iterate_grp_names(rpc_fetch_all_grps_cbk, &packed_params); - } - else if (stat[len-1]==':') { + } else if(stat[len - 1] == ':') { packed_params.rpc = rpc; packed_params.ctx = ctx; packed_params.hst = th; packed_params.numeric = numeric; - stat[len-1] = '\0'; + stat[len - 1] = '\0'; counter_iterate_grp_vars(stat, rpc_fetch_grp_vars_cbk, &packed_params); - stat[len-1] = ':'; - } - else { + stat[len - 1] = ':'; + } else { s_statistic.s = stat; s_statistic.len = strlen(stat); s_stat = get_stat(&s_statistic); - if (s_stat) { - rpc_fetch_add_stat(rpc, ctx, th, - ZSW(get_stat_module(s_stat)), ZSW(get_stat_name(s_stat)), get_stat_val(s_stat), numeric); + if(s_stat) { + rpc_fetch_add_stat(rpc, ctx, th, ZSW(get_stat_module(s_stat)), + ZSW(get_stat_name(s_stat)), get_stat_val(s_stat), numeric); } else { n = strchr(stat, '.'); - if(n==NULL) { - n =strchr(stat, ':'); + if(n == NULL) { + n = strchr(stat, ':'); } - if(n==NULL) { + if(n == NULL) { return; } n++; s_statistic.s = n; s_statistic.len = strlen(n); s_stat = get_stat(&s_statistic); - if (s_stat) { + if(s_stat) { m = get_stat_module(s_stat); - if(m==NULL) { + if(m == NULL) { return; } - for(i=0; m[i]!=0 && stat[i]!=0; i++) { - if(stat[i]!=m[i]) { + for(i = 0; m[i] != 0 && stat[i] != 0; i++) { + if(stat[i] != m[i]) { /* module name mismatch */ return; } } - if(m[i]!=0 || (stat[i]!='.' && stat[i]!=':')) { + if(m[i] != 0 || (stat[i] != '.' && stat[i] != ':')) { /* module name mismatch */ return; } - rpc_fetch_add_stat(rpc, ctx, th, - ZSW(m), ZSW(get_stat_name(s_stat)), get_stat_val(s_stat), numeric); + rpc_fetch_add_stat(rpc, ctx, th, ZSW(m), + ZSW(get_stat_name(s_stat)), get_stat_val(s_stat), + numeric); } } } @@ -600,25 +594,25 @@ static void stats_fetch_all(rpc_t* rpc, void* ctx, void* th, char* stat, int num /** * RPC statistics getter */ -static void rpc_stats_fetch_statistics(rpc_t* rpc, void* ctx, int numeric) +static void rpc_stats_fetch_statistics(rpc_t *rpc, void *ctx, int numeric) { - char* stat; + char *stat; void *th; - if (stats_support()==0) { + if(stats_support() == 0) { rpc->fault(ctx, 400, "stats support not enabled"); return; } - if (rpc->scan(ctx, "s", &stat) < 1) { + if(rpc->scan(ctx, "s", &stat) < 1) { rpc->fault(ctx, 400, "Please provide which stats to retrieve"); return; } - if (rpc->add(ctx, "{", &th) < 0) { + if(rpc->add(ctx, "{", &th) < 0) { rpc->fault(ctx, 500, "Internal error creating root struct"); return; } stats_fetch_all(rpc, ctx, th, stat, numeric); - while((rpc->scan(ctx, "*s", &stat)>0)) { + while((rpc->scan(ctx, "*s", &stat) > 0)) { stats_fetch_all(rpc, ctx, th, stat, numeric); } return; @@ -628,7 +622,7 @@ static void rpc_stats_fetch_statistics(rpc_t* rpc, void* ctx, int numeric) /** * RPC statistics getter with string values. */ -static void rpc_stats_fetchs_statistics(rpc_t* rpc, void* ctx) +static void rpc_stats_fetchs_statistics(rpc_t *rpc, void *ctx) { rpc_stats_fetch_statistics(rpc, ctx, 0); return; @@ -637,7 +631,7 @@ static void rpc_stats_fetchs_statistics(rpc_t* rpc, void* ctx) /** * RPC statistics getter with number values. */ -static void rpc_stats_fetchn_statistics(rpc_t* rpc, void* ctx) +static void rpc_stats_fetchn_statistics(rpc_t *rpc, void *ctx) { rpc_stats_fetch_statistics(rpc, ctx, 1); return; @@ -646,12 +640,12 @@ static void rpc_stats_fetchn_statistics(rpc_t* rpc, void* ctx) /** * Statistic reset/clear-er RPC callback.. */ -static void rpc_reset_or_clear_grp_vars_cbk(void* p, str* g, str* n, - counter_handle_t h) +static void rpc_reset_or_clear_grp_vars_cbk( + void *p, str *g, str *n, counter_handle_t h) { struct rpc_list_params *packed_params; - rpc_t* rpc; - void* ctx; + rpc_t *rpc; + void *ctx; int clear; stat_var *s_stat; long old_val, new_val; @@ -661,23 +655,21 @@ static void rpc_reset_or_clear_grp_vars_cbk(void* p, str* g, str* n, ctx = packed_params->ctx; clear = packed_params->clear; s_stat = get_stat(n); - if (s_stat) { - if (clear) { - old_val=get_stat_val(s_stat); + if(s_stat) { + if(clear) { + old_val = get_stat_val(s_stat); reset_stat(s_stat); - new_val=get_stat_val(s_stat); - if (old_val==new_val) { + new_val = get_stat_val(s_stat); + if(old_val == new_val) { rpc->rpl_printf(ctx, "%s:%s = %lu", - ZSW(get_stat_module(s_stat)), ZSW(get_stat_name(s_stat)), - new_val); - } - else { + ZSW(get_stat_module(s_stat)), + ZSW(get_stat_name(s_stat)), new_val); + } else { rpc->rpl_printf(ctx, "%s:%s = %lu (%lu)", - ZSW(get_stat_module(s_stat)), ZSW(get_stat_name(s_stat)), - new_val, old_val); + ZSW(get_stat_module(s_stat)), + ZSW(get_stat_name(s_stat)), new_val, old_val); } - } - else { + } else { reset_stat(s_stat); } } @@ -686,7 +678,7 @@ static void rpc_reset_or_clear_grp_vars_cbk(void* p, str* g, str* n, /** * Group statistics reset/clear-er RPC callback. */ -static void rpc_reset_or_clear_all_grps_cbk(void* p, str* g) +static void rpc_reset_or_clear_all_grps_cbk(void *p, str *g) { counter_iterate_grp_vars(g->s, rpc_reset_or_clear_grp_vars_cbk, p); } @@ -694,7 +686,8 @@ static void rpc_reset_or_clear_all_grps_cbk(void* p, str* g) /** * All statistics reset/clear-er RPC callback. */ -static void stats_reset_or_clear_all(rpc_t* rpc, void* ctx, char* stat, int clear) +static void stats_reset_or_clear_all( + rpc_t *rpc, void *ctx, char *stat, int clear) { int len = strlen(stat); struct rpc_list_params packed_params; @@ -702,41 +695,39 @@ static void stats_reset_or_clear_all(rpc_t* rpc, void* ctx, char* stat, int clea stat_var *s_stat; long old_val, new_val; - if (len==3 && strcmp("all", stat)==0) { - packed_params.rpc = rpc; - packed_params.ctx = ctx; + if(len == 3 && strcmp("all", stat) == 0) { + packed_params.rpc = rpc; + packed_params.ctx = ctx; packed_params.clear = clear; - counter_iterate_grp_names(rpc_reset_or_clear_all_grps_cbk, &packed_params); - } - else if (stat[len-1]==':') { - packed_params.rpc = rpc; - packed_params.ctx = ctx; + counter_iterate_grp_names( + rpc_reset_or_clear_all_grps_cbk, &packed_params); + } else if(stat[len - 1] == ':') { + packed_params.rpc = rpc; + packed_params.ctx = ctx; packed_params.clear = clear; - stat[len-1] = '\0'; - counter_iterate_grp_vars(stat, rpc_reset_or_clear_grp_vars_cbk, &packed_params); - stat[len-1] = ':'; - } - else { + stat[len - 1] = '\0'; + counter_iterate_grp_vars( + stat, rpc_reset_or_clear_grp_vars_cbk, &packed_params); + stat[len - 1] = ':'; + } else { s_statistic.s = stat; s_statistic.len = strlen(stat); s_stat = get_stat(&s_statistic); - if (s_stat) { - if (clear) { - old_val=get_stat_val(s_stat); + if(s_stat) { + if(clear) { + old_val = get_stat_val(s_stat); reset_stat(s_stat); - new_val=get_stat_val(s_stat); - if (old_val==new_val) { + new_val = get_stat_val(s_stat); + if(old_val == new_val) { rpc->rpl_printf(ctx, "%s:%s = %lu", - ZSW(get_stat_module(s_stat)), ZSW(get_stat_name(s_stat)), - new_val); - } - else { + ZSW(get_stat_module(s_stat)), + ZSW(get_stat_name(s_stat)), new_val); + } else { rpc->rpl_printf(ctx, "%s:%s = %lu (%lu)", - ZSW(get_stat_module(s_stat)), ZSW(get_stat_name(s_stat)), - new_val, old_val); + ZSW(get_stat_module(s_stat)), + ZSW(get_stat_name(s_stat)), new_val, old_val); } - } - else { + } else { reset_stat(s_stat); } } @@ -746,20 +737,20 @@ static void stats_reset_or_clear_all(rpc_t* rpc, void* ctx, char* stat, int clea /** * RPC statistics reseter/getter framework. */ -static void stats_reset_or_clear_statistics(rpc_t* rpc, void* ctx, int clear) +static void stats_reset_or_clear_statistics(rpc_t *rpc, void *ctx, int clear) { - char* stat; + char *stat; - if (stats_support()==0) { + if(stats_support() == 0) { rpc->fault(ctx, 400, "stats support not enabled"); return; } - if (rpc->scan(ctx, "s", &stat) < 1) { + if(rpc->scan(ctx, "s", &stat) < 1) { rpc->fault(ctx, 400, "Please provide stats name"); return; } stats_reset_or_clear_all(rpc, ctx, stat, clear); - while((rpc->scan(ctx, "*s", &stat)>0)) { + while((rpc->scan(ctx, "*s", &stat) > 0)) { stats_reset_or_clear_all(rpc, ctx, stat, clear); } return; @@ -769,7 +760,7 @@ static void stats_reset_or_clear_statistics(rpc_t* rpc, void* ctx, int clear) /** * RPC statistics reseter. */ -static void rpc_stats_reset_statistics(rpc_t* rpc, void* ctx) +static void rpc_stats_reset_statistics(rpc_t *rpc, void *ctx) { stats_reset_or_clear_statistics(rpc, ctx, 0); return; @@ -779,7 +770,7 @@ static void rpc_stats_reset_statistics(rpc_t* rpc, void* ctx) /** * RPC statistics clearer. */ -static void rpc_stats_clear_statistics(rpc_t* rpc, void* ctx) +static void rpc_stats_clear_statistics(rpc_t *rpc, void *ctx) { stats_reset_or_clear_statistics(rpc, ctx, 1); return; @@ -789,58 +780,56 @@ static void rpc_stats_clear_statistics(rpc_t* rpc, void* ctx) /** * RPC statistics getter doc. */ -static const char* rpc_stats_get_statistics_doc[2] = - {"get core and modules stats", 0}; +static const char *rpc_stats_get_statistics_doc[2] = { + "get core and modules stats", 0}; /** * RPC statistics getter doc. */ -static const char* rpc_stats_fetchs_statistics_doc[2] = - {"fetch core and modules stats as string values", 0}; +static const char *rpc_stats_fetchs_statistics_doc[2] = { + "fetch core and modules stats as string values", 0}; /** * RPC statistics getter doc. */ -static const char* rpc_stats_fetchn_statistics_doc[2] = - {"fetch core and modules stats as number values", 0}; +static const char *rpc_stats_fetchn_statistics_doc[2] = { + "fetch core and modules stats as number values", 0}; /** * RPC statistics reseter doc. */ -static const char* rpc_stats_reset_statistics_doc[2] = - {"reset core and modules stats (silent operation)", 0}; +static const char *rpc_stats_reset_statistics_doc[2] = { + "reset core and modules stats (silent operation)", 0}; /** * RPC statistics clearer doc. */ -static const char* rpc_stats_clear_statistics_doc[2] = - {"clear core and modules stats (verbose operation)", 0}; +static const char *rpc_stats_clear_statistics_doc[2] = { + "clear core and modules stats (verbose operation)", 0}; /** * Stats RPC commands. */ -rpc_export_t kex_stats_rpc[] = -{ - {"stats.get_statistics", rpc_stats_get_statistics, - rpc_stats_get_statistics_doc, RET_ARRAY}, - {"stats.fetch", rpc_stats_fetchs_statistics, - rpc_stats_fetchs_statistics_doc, 0}, - {"stats.fetchn", rpc_stats_fetchn_statistics, - rpc_stats_fetchn_statistics_doc, 0}, - {"stats.reset_statistics", rpc_stats_reset_statistics, - rpc_stats_reset_statistics_doc, 0}, - {"stats.clear_statistics", rpc_stats_clear_statistics, - rpc_stats_clear_statistics_doc, 0}, - {0, 0, 0, 0} -}; +rpc_export_t kex_stats_rpc[] = { + {"stats.get_statistics", rpc_stats_get_statistics, + rpc_stats_get_statistics_doc, RET_ARRAY}, + {"stats.fetch", rpc_stats_fetchs_statistics, + rpc_stats_fetchs_statistics_doc, 0}, + {"stats.fetchn", rpc_stats_fetchn_statistics, + rpc_stats_fetchn_statistics_doc, 0}, + {"stats.reset_statistics", rpc_stats_reset_statistics, + rpc_stats_reset_statistics_doc, 0}, + {"stats.clear_statistics", rpc_stats_clear_statistics, + rpc_stats_clear_statistics_doc, 0}, + {0, 0, 0, 0}}; /** * Stats RPC initializer. */ int stats_proc_stats_init_rpc(void) { - if (rpc_register_array(kex_stats_rpc)!=0) { + if(rpc_register_array(kex_stats_rpc) != 0) { LM_ERR("failed to register RPC commands\n"); return -1; } @@ -855,7 +844,7 @@ void stats_shm_update(void) { ticks_t t; t = get_ticks(); - if(t!=_stats_shm_tm) { + if(t != _stats_shm_tm) { shm_info(&_stats_shm_rpc); _stats_shm_tm = t; } diff --git a/src/modules/kex/core_stats.h b/src/modules/kex/core_stats.h index 72a5f5becc8..89599ba3b97 100644 --- a/src/modules/kex/core_stats.h +++ b/src/modules/kex/core_stats.h @@ -36,68 +36,68 @@ extern stat_export_t core_stats[]; /*! \brief received requests */ -extern stat_var* rcv_reqs; +extern stat_var *rcv_reqs; /* \brief extended received requests by method */ -extern stat_var* rcv_reqs_invite; -extern stat_var* rcv_reqs_cancel; -extern stat_var* rcv_reqs_ack; -extern stat_var* rcv_reqs_bye; -extern stat_var* rcv_reqs_info; -extern stat_var* rcv_reqs_register; -extern stat_var* rcv_reqs_notify; -extern stat_var* rcv_reqs_message; -extern stat_var* rcv_reqs_options; -extern stat_var* rcv_reqs_prack; -extern stat_var* rcv_reqs_update; -extern stat_var* rcv_reqs_refer; -extern stat_var* rcv_reqs_publish; +extern stat_var *rcv_reqs_invite; +extern stat_var *rcv_reqs_cancel; +extern stat_var *rcv_reqs_ack; +extern stat_var *rcv_reqs_bye; +extern stat_var *rcv_reqs_info; +extern stat_var *rcv_reqs_register; +extern stat_var *rcv_reqs_notify; +extern stat_var *rcv_reqs_message; +extern stat_var *rcv_reqs_options; +extern stat_var *rcv_reqs_prack; +extern stat_var *rcv_reqs_update; +extern stat_var *rcv_reqs_refer; +extern stat_var *rcv_reqs_publish; /*! \brief received replies */ -extern stat_var* rcv_rpls; +extern stat_var *rcv_rpls; /*! \brief extended received replies */ -extern stat_var* rcv_rpls_1xx; -extern stat_var* rcv_rpls_18x; -extern stat_var* rcv_rpls_2xx; -extern stat_var* rcv_rpls_3xx; -extern stat_var* rcv_rpls_4xx; -extern stat_var* rcv_rpls_401; -extern stat_var* rcv_rpls_404; -extern stat_var* rcv_rpls_407; -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; +extern stat_var *rcv_rpls_1xx; +extern stat_var *rcv_rpls_18x; +extern stat_var *rcv_rpls_2xx; +extern stat_var *rcv_rpls_3xx; +extern stat_var *rcv_rpls_4xx; +extern stat_var *rcv_rpls_401; +extern stat_var *rcv_rpls_404; +extern stat_var *rcv_rpls_407; +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; +extern stat_var *fwd_reqs; /*! \brief forwarded replies */ -extern stat_var* fwd_rpls; +extern stat_var *fwd_rpls; /*! \brief dropped requests */ -extern stat_var* drp_reqs; +extern stat_var *drp_reqs; /*! \brief dropped replies */ -extern stat_var* drp_rpls; +extern stat_var *drp_rpls; /*! \brief error requests */ -extern stat_var* err_reqs; +extern stat_var *err_reqs; /*! \brief error replies */ -extern stat_var* err_rpls; +extern stat_var *err_rpls; /*! \brief Set in parse_uri() */ -extern stat_var* bad_URIs; +extern stat_var *bad_URIs; /*! \brief Set in parse_method() */ -extern stat_var* unsupported_methods; +extern stat_var *unsupported_methods; /*! \brief Set in get_hdr_field(). */ -extern stat_var* bad_msg_hdr; +extern stat_var *bad_msg_hdr; int register_core_stats(void); diff --git a/src/modules/kex/flags.c b/src/modules/kex/flags.c index 13243549c14..c00187dd471 100644 --- a/src/modules/kex/flags.c +++ b/src/modules/kex/flags.c @@ -33,13 +33,12 @@ */ int w_issflagset(struct sip_msg *msg, char *flag, str *s2) { - int fval=0; - if(fixup_get_ivalue(msg, (gparam_p)flag, &fval)!=0) - { + int fval = 0; + if(fixup_get_ivalue(msg, (gparam_p)flag, &fval) != 0) { LM_ERR("no flag value\n"); return -1; } - if(fval<0 || fval>31) + if(fval < 0 || fval > 31) return -1; return issflagset((flag_t)fval); } @@ -49,13 +48,12 @@ int w_issflagset(struct sip_msg *msg, char *flag, str *s2) */ int w_resetsflag(struct sip_msg *msg, char *flag, str *s2) { - int fval=0; - if(fixup_get_ivalue(msg, (gparam_p)flag, &fval)!=0) - { + int fval = 0; + if(fixup_get_ivalue(msg, (gparam_p)flag, &fval) != 0) { LM_ERR("no flag value\n"); return -1; } - if(fval<0 || fval>31) + if(fval < 0 || fval > 31) return -1; return resetsflag((flag_t)fval); } @@ -65,13 +63,12 @@ int w_resetsflag(struct sip_msg *msg, char *flag, str *s2) */ int w_setsflag(struct sip_msg *msg, char *flag, char *s2) { - int fval=0; - if(fixup_get_ivalue(msg, (gparam_p)flag, &fval)!=0) - { + int fval = 0; + if(fixup_get_ivalue(msg, (gparam_p)flag, &fval) != 0) { LM_ERR("no flag value\n"); return -1; } - if(fval<0 || fval>31) + if(fval < 0 || fval > 31) return -1; return setsflag((flag_t)fval); } @@ -81,23 +78,20 @@ int w_setsflag(struct sip_msg *msg, char *flag, char *s2) */ int w_isbflagset(struct sip_msg *msg, char *flag, str *idx) { - int fval=0; - int ival=0; - if(fixup_get_ivalue(msg, (gparam_p)flag, &fval)!=0) - { + int fval = 0; + int ival = 0; + if(fixup_get_ivalue(msg, (gparam_p)flag, &fval) != 0) { LM_ERR("no flag value\n"); return -1; } - if(fval<0 || fval>31) + if(fval < 0 || fval > 31) return -1; - if(idx!=0) - { - if(fixup_get_ivalue(msg, (gparam_p)idx, &ival)!=0) - { + if(idx != 0) { + if(fixup_get_ivalue(msg, (gparam_p)idx, &ival) != 0) { LM_ERR("no idx value\n"); return -1; } - if(ival<0) + if(ival < 0) return -1; } return isbflagset(ival, (flag_t)fval); @@ -108,27 +102,23 @@ int w_isbflagset(struct sip_msg *msg, char *flag, str *idx) */ int w_resetbflag(struct sip_msg *msg, char *flag, str *idx) { - int fval=0; - int ival=0; - if(fixup_get_ivalue(msg, (gparam_p)flag, &fval)!=0) - { + int fval = 0; + int ival = 0; + if(fixup_get_ivalue(msg, (gparam_p)flag, &fval) != 0) { LM_ERR("no flag value\n"); return -1; } - if(fval<0 || fval>31) + if(fval < 0 || fval > 31) return -1; - if(idx!=0) - { - if(fixup_get_ivalue(msg, (gparam_p)idx, &ival)!=0) - { + if(idx != 0) { + if(fixup_get_ivalue(msg, (gparam_p)idx, &ival) != 0) { LM_ERR("no idx value\n"); return -1; } - if(ival<0) + if(ival < 0) return -1; } return resetbflag(ival, (flag_t)fval); - } /** @@ -136,23 +126,20 @@ int w_resetbflag(struct sip_msg *msg, char *flag, str *idx) */ int w_setbflag(struct sip_msg *msg, char *flag, char *idx) { - int fval=0; - int ival=0; - if(fixup_get_ivalue(msg, (gparam_p)flag, &fval)!=0) - { + int fval = 0; + int ival = 0; + if(fixup_get_ivalue(msg, (gparam_p)flag, &fval) != 0) { LM_ERR("no flag value\n"); return -1; } - if(fval<0 || fval>31) + if(fval < 0 || fval > 31) return -1; - if(idx!=0) - { - if(fixup_get_ivalue(msg, (gparam_p)idx, &ival)!=0) - { + if(idx != 0) { + if(fixup_get_ivalue(msg, (gparam_p)idx, &ival) != 0) { LM_ERR("no idx value\n"); return -1; } - if(ival<0) + if(ival < 0) return -1; } return setbflag(ival, (flag_t)fval); diff --git a/src/modules/kex/kex_mod.c b/src/modules/kex/kex_mod.c index 1927c7343d3..452639c3cbd 100644 --- a/src/modules/kex/kex_mod.c +++ b/src/modules/kex/kex_mod.c @@ -60,82 +60,69 @@ static void destroy(void); static sruid_t _kex_sruid; -static int pv_get_sruid_val(struct sip_msg *msg, pv_param_t *param, - pv_value_t *res); - -static pv_export_t mod_pvs[] = { - { {"sruid", sizeof("sruid")-1}, PVT_OTHER, pv_get_sruid_val, 0, - 0, 0, 0, 0 }, - { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } -}; - -static cmd_export_t cmds[]={ - {"setsflag", (cmd_function)w_setsflag, 1,fixup_igp_null, - fixup_free_igp_null, ANY_ROUTE }, - {"resetsflag", (cmd_function)w_resetsflag, 1,fixup_igp_null, - fixup_free_igp_null, ANY_ROUTE }, - {"issflagset", (cmd_function)w_issflagset, 1,fixup_igp_null, - fixup_free_igp_null, ANY_ROUTE }, - {"setbflag", (cmd_function)w_setbflag, 1,fixup_igp_null, - fixup_free_igp_null, ANY_ROUTE }, - {"setbflag", (cmd_function)w_setbflag, 2,fixup_igp_igp, - fixup_free_igp_igp, ANY_ROUTE }, - {"resetbflag", (cmd_function)w_resetbflag, 1,fixup_igp_null, - fixup_free_igp_null, ANY_ROUTE }, - {"resetbflag", (cmd_function)w_resetbflag, 2,fixup_igp_igp, - fixup_free_igp_igp, ANY_ROUTE }, - {"isbflagset", (cmd_function)w_isbflagset, 1,fixup_igp_null, - fixup_free_igp_null, ANY_ROUTE }, - {"isbflagset", (cmd_function)w_isbflagset, 2,fixup_igp_igp, - fixup_free_igp_igp, ANY_ROUTE }, - {"setdsturi", (cmd_function)w_setdsturi, 1, fixup_spve_null, - fixup_free_spve_null, ANY_ROUTE }, - {"resetdsturi", (cmd_function)w_resetdsturi, 0, 0, - 0, ANY_ROUTE }, - {"isdsturiset", (cmd_function)w_isdsturiset, 0, 0, - 0, ANY_ROUTE }, - {"pv_printf", (cmd_function)w_pv_printf, 2, pv_printf_fixup, - 0, ANY_ROUTE }, - {"avp_printf", (cmd_function)w_pv_printf, 2, pv_printf_fixup, - 0, ANY_ROUTE }, - {"is_myself", (cmd_function)w_is_myself, 1, fixup_spve_null, - fixup_free_spve_null, ANY_ROUTE }, - {"setdebug", (cmd_function)w_setdebug, 1, fixup_igp_null, - fixup_free_igp_null, ANY_ROUTE }, - {"resetdebug", (cmd_function)w_resetdebug, 0, 0, - 0, ANY_ROUTE }, - - {0,0,0,0,0,0} -}; - -static param_export_t params[]={ - {0,0,0} -}; +static int pv_get_sruid_val( + struct sip_msg *msg, pv_param_t *param, pv_value_t *res); + +static pv_export_t mod_pvs[] = {{{"sruid", sizeof("sruid") - 1}, PVT_OTHER, + pv_get_sruid_val, 0, 0, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + +static cmd_export_t cmds[] = { + {"setsflag", (cmd_function)w_setsflag, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, + {"resetsflag", (cmd_function)w_resetsflag, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, + {"issflagset", (cmd_function)w_issflagset, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, + {"setbflag", (cmd_function)w_setbflag, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, + {"setbflag", (cmd_function)w_setbflag, 2, fixup_igp_igp, + fixup_free_igp_igp, ANY_ROUTE}, + {"resetbflag", (cmd_function)w_resetbflag, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, + {"resetbflag", (cmd_function)w_resetbflag, 2, fixup_igp_igp, + fixup_free_igp_igp, ANY_ROUTE}, + {"isbflagset", (cmd_function)w_isbflagset, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, + {"isbflagset", (cmd_function)w_isbflagset, 2, fixup_igp_igp, + fixup_free_igp_igp, ANY_ROUTE}, + {"setdsturi", (cmd_function)w_setdsturi, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE}, + {"resetdsturi", (cmd_function)w_resetdsturi, 0, 0, 0, ANY_ROUTE}, + {"isdsturiset", (cmd_function)w_isdsturiset, 0, 0, 0, ANY_ROUTE}, + {"pv_printf", (cmd_function)w_pv_printf, 2, pv_printf_fixup, 0, + ANY_ROUTE}, + {"avp_printf", (cmd_function)w_pv_printf, 2, pv_printf_fixup, 0, + ANY_ROUTE}, + {"is_myself", (cmd_function)w_is_myself, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE}, + {"setdebug", (cmd_function)w_setdebug, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, + {"resetdebug", (cmd_function)w_resetdebug, 0, 0, 0, ANY_ROUTE}, + + {0, 0, 0, 0, 0, 0}}; + +static param_export_t params[] = {{0, 0, 0}}; /** module exports */ -struct module_exports exports= { - "kex", - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, - params, - 0, /* exported RPC methods */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - child_init, /* per-child init function */ - destroy -}; +struct module_exports exports = {"kex", DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, params, 0, /* exported RPC methods */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + child_init, /* per-child init function */ + destroy}; /** * init module function */ static int mod_init(void) { - if(sruid_init(&_kex_sruid, '-', NULL, 0)<0) + if(sruid_init(&_kex_sruid, '-', NULL, 0) < 0) return -1; #ifdef STATISTICS - if(register_core_stats()<0) + if(register_core_stats() < 0) return -1; #endif register_pkg_proc_stats(); @@ -153,9 +140,9 @@ static int mod_init(void) static int child_init(int rank) { LM_DBG("rank is (%d)\n", rank); - if(sruid_init(&_kex_sruid, '-', NULL, 0)<0) + if(sruid_init(&_kex_sruid, '-', NULL, 0) < 0) return -1; - if (rank==PROC_INIT) + if(rank == PROC_INIT) return pkg_proc_stats_init(); return pkg_proc_stats_myinit(rank); } @@ -180,34 +167,31 @@ int w_is_myself(struct sip_msg *msg, char *uri, str *s2) str suri; struct sip_uri puri; - if(fixup_get_svalue(msg, (gparam_p)uri, &suri)!=0) - { + if(fixup_get_svalue(msg, (gparam_p)uri, &suri) != 0) { LM_ERR("cannot get the URI parameter\n"); return -1; } - if(suri.len>4 && (strncmp(suri.s, "sip:", 4)==0 - || strncmp(suri.s, "sips:", 5)==0)) - { - if(parse_uri(suri.s, suri.len, &puri)!=0) - { + if(suri.len > 4 + && (strncmp(suri.s, "sip:", 4) == 0 + || strncmp(suri.s, "sips:", 5) == 0)) { + if(parse_uri(suri.s, suri.len, &puri) != 0) { LM_ERR("failed to parse uri [%.*s]\n", suri.len, suri.s); return -1; } - ret = check_self(&puri.host, (puri.port.s)?puri.port_no:0, - (puri.transport_val.s)?puri.proto:0); + ret = check_self(&puri.host, (puri.port.s) ? puri.port_no : 0, + (puri.transport_val.s) ? puri.proto : 0); } else { ret = check_self(&suri, 0, 0); } - if(ret!=1) + if(ret != 1) return -1; return 1; } int w_setdebug(struct sip_msg *msg, char *level, str *s2) { - int lval=0; - if(fixup_get_ivalue(msg, (gparam_p)level, &lval)!=0) - { + int lval = 0; + if(fixup_get_ivalue(msg, (gparam_p)level, &lval) != 0) { LM_ERR("no debug level value\n"); return -1; } @@ -222,12 +206,12 @@ int w_resetdebug(struct sip_msg *msg, char *uri, str *s2) } -static int pv_get_sruid_val(struct sip_msg *msg, pv_param_t *param, - pv_value_t *res) +static int pv_get_sruid_val( + struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - if(res==NULL) + if(res == NULL) return -1; - if(sruid_next(&_kex_sruid)<0) + if(sruid_next(&_kex_sruid) < 0) return pv_get_null(msg, param, res); return pv_get_strval(msg, param, res, &_kex_sruid.uid); } diff --git a/src/modules/kex/km_core.c b/src/modules/kex/km_core.c index 583377379b5..827afa4c8ec 100644 --- a/src/modules/kex/km_core.c +++ b/src/modules/kex/km_core.c @@ -35,23 +35,22 @@ int w_setdsturi(struct sip_msg *msg, char *uri, str *s2) { str suri; - if(fixup_get_svalue(msg, (gparam_t*)uri, &suri)!=0) { + if(fixup_get_svalue(msg, (gparam_t *)uri, &suri) != 0) { LM_ERR("cannot get the URI parameter\n"); return -1; } - if(set_dst_uri(msg, &suri)!=0) + if(set_dst_uri(msg, &suri) != 0) return -1; /* dst_uri changed, so it makes sense to re-use the current uri * for forking */ ruri_mark_new(); /* re-use uri for serial forking */ return 1; - } int w_resetdsturi(struct sip_msg *msg, char *uri, str *s2) { - if(msg->dst_uri.s!=0) + if(msg->dst_uri.s != 0) pkg_free(msg->dst_uri.s); msg->dst_uri.s = 0; msg->dst_uri.len = 0; @@ -60,47 +59,42 @@ int w_resetdsturi(struct sip_msg *msg, char *uri, str *s2) int w_isdsturiset(struct sip_msg *msg, char *uri, str *s2) { - if(msg->dst_uri.s==0 || msg->dst_uri.len<=0) + if(msg->dst_uri.s == 0 || msg->dst_uri.len <= 0) return -1; return 1; } -int pv_printf_fixup(void** param, int param_no) +int pv_printf_fixup(void **param, int param_no) { - pv_spec_t *spec=NULL; - pv_elem_t *pvmodel=NULL; + pv_spec_t *spec = NULL; + pv_elem_t *pvmodel = NULL; str tstr; - if(param_no==1) - { - spec = (pv_spec_t*)pkg_malloc(sizeof(pv_spec_t)); - if(spec==NULL) - { + if(param_no == 1) { + spec = (pv_spec_t *)pkg_malloc(sizeof(pv_spec_t)); + if(spec == NULL) { PKG_MEM_ERROR; return -1; } memset(spec, 0, sizeof(pv_spec_t)); - tstr.s = (char*)(*param); + tstr.s = (char *)(*param); tstr.len = strlen(tstr.s); - if(pv_parse_spec(&tstr, spec)==NULL) - { + if(pv_parse_spec(&tstr, spec) == NULL) { LM_ERR("unknown script variable in first parameter"); pkg_free(spec); return -1; } - if(!pv_is_w(spec)) - { + if(!pv_is_w(spec)) { LM_ERR("read-only script variable in first parameter"); pkg_free(spec); return -1; } *param = spec; - } else if(param_no==2) { + } else if(param_no == 2) { pvmodel = 0; - tstr.s = (char*)(*param); + tstr.s = (char *)(*param); tstr.len = strlen(tstr.s); - if(pv_parse_format(&tstr, &pvmodel)<0) - { + if(pv_parse_format(&tstr, &pvmodel) < 0) { LM_ERR("error in second parameter"); return -1; } @@ -111,23 +105,21 @@ int pv_printf_fixup(void** param, int param_no) int w_pv_printf(struct sip_msg *msg, char *s1, str *s2) { - pv_spec_t *spec=NULL; - pv_elem_t *model=NULL; + pv_spec_t *spec = NULL; + pv_elem_t *model = NULL; pv_value_t val; - spec = (pv_spec_t*)s1; + spec = (pv_spec_t *)s1; - model = (pv_elem_t*)s2; + model = (pv_elem_t *)s2; memset(&val, 0, sizeof(pv_value_t)); - if(pv_printf_s(msg, model, &val.rs)!=0) - { + if(pv_printf_s(msg, model, &val.rs) != 0) { LM_ERR("cannot eval second parameter\n"); goto error; } val.flags = PV_VAL_STR; - if(spec->setf(msg, &spec->pvp, EQ_T, &val)<0) - { + if(spec->setf(msg, &spec->pvp, EQ_T, &val) < 0) { LM_ERR("setting PV failed\n"); goto error; } @@ -136,4 +128,3 @@ int w_pv_printf(struct sip_msg *msg, char *s1, str *s2) error: return -1; } - diff --git a/src/modules/kex/km_core.h b/src/modules/kex/km_core.h index 2217c6f6ffb..12aa0d55689 100644 --- a/src/modules/kex/km_core.h +++ b/src/modules/kex/km_core.h @@ -27,6 +27,6 @@ int w_setdsturi(struct sip_msg *msg, char *uri, str *s2); int w_resetdsturi(struct sip_msg *msg, char *uri, str *s2); int w_isdsturiset(struct sip_msg *msg, char *uri, str *s2); int w_pv_printf(struct sip_msg *msg, char *s1, str *s2); -int pv_printf_fixup(void** param, int param_no); +int pv_printf_fixup(void **param, int param_no); #endif diff --git a/src/modules/kex/mod_stats.c b/src/modules/kex/mod_stats.c index dd73bec522a..65cce371eee 100644 --- a/src/modules/kex/mod_stats.c +++ b/src/modules/kex/mod_stats.c @@ -44,10 +44,10 @@ #include "mod_stats.h" -#define DBG_MOD_PKG_FLAG 1 /* 1<<0 - print pkg memory stats */ -#define DBG_MOD_SHM_FLAG 2 /* 1<<1 - print shm memory stats */ -#define DBG_MOD_ALL_FLAG 3 /* 1|2 - print pkg+shm (1+2) memory stats */ -#define DBG_MOD_INF_FLAG 4 /* 1<<2 - print more info in the stats */ +#define DBG_MOD_PKG_FLAG 1 /* 1<<0 - print pkg memory stats */ +#define DBG_MOD_SHM_FLAG 2 /* 1<<1 - print shm memory stats */ +#define DBG_MOD_ALL_FLAG 3 /* 1|2 - print pkg+shm (1+2) memory stats */ +#define DBG_MOD_INF_FLAG 4 /* 1<<2 - print more info in the stats */ static gen_lock_t *kex_rpc_mod_mem_stats_lock = NULL; @@ -71,32 +71,28 @@ int mod_stats_destroy(void) /** * */ -static const char* rpc_mod_mem_stats_doc[2] = { - "Per module memory usage statistics", - 0 -}; +static const char *rpc_mod_mem_stats_doc[2] = { + "Per module memory usage statistics", 0}; /** * */ -static const char* rpc_mod_mem_statsx_doc[2] = { - "Per module memory use statistics with more details", - 0 -}; +static const char *rpc_mod_mem_statsx_doc[2] = { + "Per module memory use statistics with more details", 0}; /* test if the current mod info was already printed */ -static int rpc_mod_is_printed_one(mem_counter *stats, mem_counter *current) { +static int rpc_mod_is_printed_one(mem_counter *stats, mem_counter *current) +{ mem_counter *iter; - if ( stats == NULL || current == NULL ) - { + if(stats == NULL || current == NULL) { LM_ERR("invalid parameter\n"); return 1; } iter = stats; - while (iter && iter != current) { - if (strcmp(iter->mname, current->mname) == 0) { + while(iter && iter != current) { + if(strcmp(iter->mname, current->mname) == 0) { return 1; } iter = iter->next; @@ -106,38 +102,38 @@ static int rpc_mod_is_printed_one(mem_counter *stats, mem_counter *current) { } /* print memory info for a specific module in a specific stats list */ -static int rpc_mod_print(rpc_t *rpc, void *ctx, const char *mname, - mem_counter *stats, int flag) +static int rpc_mod_print( + rpc_t *rpc, void *ctx, const char *mname, mem_counter *stats, int flag) { char nbuf[128]; char vbuf[128]; - const char *total_str= "Total"; + const char *total_str = "Total"; void *stats_th = NULL; int total = 0; mem_counter *iter = stats; - if (stats == NULL) { + if(stats == NULL) { return -1; } - if (rpc->add(ctx, "{", &stats_th) < 0) { + if(rpc->add(ctx, "{", &stats_th) < 0) { rpc->fault(ctx, 500, "Internal error creating struct rpc"); return -1; } - while (iter) { - if (strcmp(mname, iter->mname) == 0) { + while(iter) { + if(strcmp(mname, iter->mname) == 0) { snprintf(nbuf, 128, "%s(%ld)", iter->func, iter->line); if(flag & DBG_MOD_INF_FLAG) { /* more info in the value */ snprintf(vbuf, 128, "%lu (%d)", iter->size, iter->count); - if (rpc->struct_add(stats_th, "s", nbuf, vbuf) < 0) { + if(rpc->struct_add(stats_th, "s", nbuf, vbuf) < 0) { rpc->fault(ctx, 500, "Internal error adding to struct rpc"); return -1; } } else { /* only allocated size in the value */ - if (rpc->struct_add(stats_th, "d", nbuf, (int)iter->size) < 0) { + if(rpc->struct_add(stats_th, "d", nbuf, (int)iter->size) < 0) { rpc->fault(ctx, 500, "Internal error adding to struct rpc"); return -1; } @@ -147,7 +143,7 @@ static int rpc_mod_print(rpc_t *rpc, void *ctx, const char *mname, iter = iter->next; } - if (rpc->struct_add(stats_th, "d", total_str, total) < 0) { + if(rpc->struct_add(stats_th, "d", total_str, total) < 0) { rpc->fault(ctx, 500, "Internal error adding total to struct rpc"); return -1; } @@ -157,21 +153,21 @@ static int rpc_mod_print(rpc_t *rpc, void *ctx, const char *mname, /* print memory info for a specific module */ static int rpc_mod_print_one(rpc_t *rpc, void *ctx, const char *mname, - mem_counter *pkg_stats, mem_counter *shm_stats, int flag) + mem_counter *pkg_stats, mem_counter *shm_stats, int flag) { - if (rpc->rpl_printf(ctx, "Module: %s", mname) < 0) { + if(rpc->rpl_printf(ctx, "Module: %s", mname) < 0) { rpc->fault(ctx, 500, "Internal error adding module name to ctx"); return -1; } - if (flag & DBG_MOD_PKG_FLAG) { + if(flag & DBG_MOD_PKG_FLAG) { rpc_mod_print(rpc, ctx, mname, pkg_stats, flag); } - if (flag & DBG_MOD_SHM_FLAG) { + if(flag & DBG_MOD_SHM_FLAG) { rpc_mod_print(rpc, ctx, mname, shm_stats, flag); } - if (rpc->rpl_printf(ctx, "") < 0) { + if(rpc->rpl_printf(ctx, "") < 0) { rpc->fault(ctx, 500, "Internal error adding module name to ctx"); return -1; } @@ -180,27 +176,27 @@ static int rpc_mod_print_one(rpc_t *rpc, void *ctx, const char *mname, } /* print memory info for all modules */ -static int rpc_mod_print_all(rpc_t *rpc, void *ctx, - mem_counter *pkg_stats, mem_counter *shm_stats, int flag) +static int rpc_mod_print_all(rpc_t *rpc, void *ctx, mem_counter *pkg_stats, + mem_counter *shm_stats, int flag) { mem_counter *pkg_iter = pkg_stats; mem_counter *shm_iter = shm_stats; /* print unique module info found in pkg_stats */ - while (pkg_iter) { - if (!rpc_mod_is_printed_one(pkg_stats, pkg_iter)) { - rpc_mod_print_one(rpc, ctx, - pkg_iter->mname, pkg_stats, shm_stats, flag); + while(pkg_iter) { + if(!rpc_mod_is_printed_one(pkg_stats, pkg_iter)) { + rpc_mod_print_one( + rpc, ctx, pkg_iter->mname, pkg_stats, shm_stats, flag); } pkg_iter = pkg_iter->next; } /* print unique module info found in shm_stats and not found in pkg_stats */ - while (shm_iter) { - if (!rpc_mod_is_printed_one(shm_stats, shm_iter) + while(shm_iter) { + if(!rpc_mod_is_printed_one(shm_stats, shm_iter) && !rpc_mod_is_printed_one(pkg_stats, shm_iter)) { - rpc_mod_print_one(rpc, ctx, - shm_iter->mname, pkg_stats, shm_stats, flag); + rpc_mod_print_one( + rpc, ctx, shm_iter->mname, pkg_stats, shm_stats, flag); } shm_iter = shm_iter->next; } @@ -219,23 +215,23 @@ static void rpc_mod_mem_stats_mode(rpc_t *rpc, void *ctx, int fmode) mem_counter *pkg_mod_stats_list = NULL; mem_counter *shm_mod_stats_list = NULL; - if (rpc->scan(ctx, "*S", &mname) != 1) { + if(rpc->scan(ctx, "*S", &mname) != 1) { rpc->fault(ctx, 500, "Module name or \"all\" needed"); return; } - if (rpc->scan(ctx, "*S", &mtype) != 1) { + if(rpc->scan(ctx, "*S", &mtype) != 1) { rpc->fault(ctx, 500, "\"pkg\" or \"shm\" or \"all\" needed"); return; } flag |= fmode; - if (strcmp(mtype.s, "pkg") == 0) { + if(strcmp(mtype.s, "pkg") == 0) { flag |= DBG_MOD_PKG_FLAG; - } else if (strcmp(mtype.s, "shm") == 0) { + } else if(strcmp(mtype.s, "shm") == 0) { flag |= DBG_MOD_SHM_FLAG; - } else if (strcmp(mtype.s, "all") == 0) { + } else if(strcmp(mtype.s, "all") == 0) { flag |= DBG_MOD_ALL_FLAG; } @@ -243,12 +239,14 @@ static void rpc_mod_mem_stats_mode(rpc_t *rpc, void *ctx, int fmode) shm_mod_get_stats((void **)&shm_mod_stats_list); /* print info about all modules */ - if (strcmp(mname.s, "all") == 0) { - rpc_mod_print_all(rpc, ctx, pkg_mod_stats_list, shm_mod_stats_list, flag); + if(strcmp(mname.s, "all") == 0) { + rpc_mod_print_all( + rpc, ctx, pkg_mod_stats_list, shm_mod_stats_list, flag); - /* print info about a particular module */ + /* print info about a particular module */ } else { - rpc_mod_print_one(rpc, ctx, mname.s, pkg_mod_stats_list, shm_mod_stats_list, flag); + rpc_mod_print_one(rpc, ctx, mname.s, pkg_mod_stats_list, + shm_mod_stats_list, flag); } pkg_mod_free_stats(pkg_mod_stats_list); @@ -280,11 +278,11 @@ static void rpc_mod_mem_statsx(rpc_t *rpc, void *ctx) * */ rpc_export_t kex_mod_rpc[] = { - {"mod.stats", rpc_mod_mem_stats, rpc_mod_mem_stats_doc, RET_ARRAY}, - {"mod.mem_stats", rpc_mod_mem_stats, rpc_mod_mem_stats_doc, RET_ARRAY}, - {"mod.mem_statsx", rpc_mod_mem_statsx, rpc_mod_mem_statsx_doc, RET_ARRAY}, - {0, 0, 0, 0} -}; + {"mod.stats", rpc_mod_mem_stats, rpc_mod_mem_stats_doc, RET_ARRAY}, + {"mod.mem_stats", rpc_mod_mem_stats, rpc_mod_mem_stats_doc, RET_ARRAY}, + {"mod.mem_statsx", rpc_mod_mem_statsx, rpc_mod_mem_statsx_doc, + RET_ARRAY}, + {0, 0, 0, 0}}; /** * @@ -300,8 +298,7 @@ int mod_stats_init_rpc(void) LM_ERR("failed to init the lock\n"); return -1; } - if (rpc_register_array(kex_mod_rpc)!=0) - { + if(rpc_register_array(kex_mod_rpc) != 0) { LM_ERR("failed to register RPC commands\n"); return -1; } diff --git a/src/modules/kex/pkg_stats.c b/src/modules/kex/pkg_stats.c index 35565cbcd9e..412fdc65792 100644 --- a/src/modules/kex/pkg_stats.c +++ b/src/modules/kex/pkg_stats.c @@ -44,7 +44,8 @@ /** * */ -typedef struct pkg_proc_stats { +typedef struct pkg_proc_stats +{ int rank; unsigned int pid; unsigned long used; @@ -71,19 +72,18 @@ int pkg_proc_stats_init(void) { _pkg_proc_stats_no = get_max_procs(); - if(_pkg_proc_stats_no<=0) + if(_pkg_proc_stats_no <= 0) return -1; - if(_pkg_proc_stats_list!=NULL) + if(_pkg_proc_stats_list != NULL) return -1; - _pkg_proc_stats_list = (pkg_proc_stats_t*)shm_malloc( - _pkg_proc_stats_no*sizeof(pkg_proc_stats_t)); - if(_pkg_proc_stats_list==NULL) - { + _pkg_proc_stats_list = (pkg_proc_stats_t *)shm_malloc( + _pkg_proc_stats_no * sizeof(pkg_proc_stats_t)); + if(_pkg_proc_stats_list == NULL) { SHM_MEM_ERROR; return -1; } memset(_pkg_proc_stats_list, 0, - _pkg_proc_stats_no*sizeof(pkg_proc_stats_t)); + _pkg_proc_stats_no * sizeof(pkg_proc_stats_t)); return 0; } @@ -93,9 +93,9 @@ int pkg_proc_stats_init(void) int pkg_proc_stats_myinit(int rank) { struct mem_info info; - if(_pkg_proc_stats_list==NULL) + if(_pkg_proc_stats_list == NULL) return -1; - if(process_no>=_pkg_proc_stats_no) + if(process_no >= _pkg_proc_stats_no) return -1; _pkg_proc_stats_list[process_no].pid = (unsigned int)my_pid(); _pkg_proc_stats_list[process_no].rank = rank; @@ -115,7 +115,7 @@ int pkg_proc_stats_myinit(int rank) */ int pkg_proc_stats_destroy(void) { - if(_pkg_proc_stats_list==NULL) + if(_pkg_proc_stats_list == NULL) return -1; shm_free(_pkg_proc_stats_list); _pkg_proc_stats_list = 0; @@ -130,9 +130,9 @@ int pkg_proc_stats_destroy(void) static int pkg_proc_update_stats(sr_event_param_t *evp) { struct mem_info info; - if(unlikely(_pkg_proc_stats_list==NULL)) + if(unlikely(_pkg_proc_stats_list == NULL)) return -1; - if(unlikely(process_no>=_pkg_proc_stats_no)) + if(unlikely(process_no >= _pkg_proc_stats_no)) return -1; pkg_info(&info); _pkg_proc_stats_list[process_no].available = info.free_size; @@ -155,10 +155,8 @@ int register_pkg_proc_stats(void) /** * */ -static const char* rpc_pkg_stats_doc[2] = { - "Private memory (pkg) statistics per process", - 0 -}; +static const char *rpc_pkg_stats_doc[2] = { + "Private memory (pkg) statistics per process", 0}; /** * @@ -166,8 +164,7 @@ static const char* rpc_pkg_stats_doc[2] = { int pkg_proc_get_pid_index(unsigned int pid) { int i; - for(i=0; i<_pkg_proc_stats_no; i++) - { + for(i = 0; i < _pkg_proc_stats_no; i++) { if(_pkg_proc_stats_list[i].pid == pid) return i; } @@ -177,17 +174,16 @@ int pkg_proc_get_pid_index(unsigned int pid) /** * */ -static void rpc_pkg_stats(rpc_t* rpc, void* ctx) +static void rpc_pkg_stats(rpc_t *rpc, void *ctx) { int i; int limit; int cval; str cname; - void* th; + void *th; int mode; - if(_pkg_proc_stats_list==NULL) - { + if(_pkg_proc_stats_list == NULL) { rpc->fault(ctx, 500, "Not initialized"); return; } @@ -195,66 +191,57 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) mode = 0; cval = 0; limit = _pkg_proc_stats_no; - if (rpc->scan(ctx, "*S", &cname) == 1) - { - if(cname.len==3 && strncmp(cname.s, "pid", 3)==0) + if(rpc->scan(ctx, "*S", &cname) == 1) { + if(cname.len == 3 && strncmp(cname.s, "pid", 3) == 0) mode = 1; - else if(cname.len==4 && strncmp(cname.s, "rank", 4)==0) + else if(cname.len == 4 && strncmp(cname.s, "rank", 4) == 0) mode = 2; - else if(cname.len==5 && strncmp(cname.s, "index", 5)==0) + else if(cname.len == 5 && strncmp(cname.s, "index", 5) == 0) mode = 3; else { rpc->fault(ctx, 500, "Invalid filter type"); return; } - if (rpc->scan(ctx, "d", &cval) < 1) - { + if(rpc->scan(ctx, "d", &cval) < 1) { rpc->fault(ctx, 500, "One more parameter expected"); return; } - if(mode==1) - { + if(mode == 1) { i = pkg_proc_get_pid_index((unsigned int)cval); - if(i<0) - { + if(i < 0) { rpc->fault(ctx, 500, "No such pid"); return; } limit = i + 1; - } else if(mode==3) { - i=cval; + } else if(mode == 3) { + i = cval; limit = i + 1; } } - for(; iadd(ctx, "{", &th) < 0) - { + if(mode != 2 || _pkg_proc_stats_list[i].rank == cval) { + if(rpc->add(ctx, "{", &th) < 0) { rpc->fault(ctx, 500, "Internal error creating rpc"); return; } - if(_pkg_proc_stats_list[i].pid==0) { + if(_pkg_proc_stats_list[i].pid == 0) { _pkg_proc_stats_list[i].pid = pt[i].pid; - _pkg_proc_stats_list[i].total_size = _pkg_proc_stats_list[0].total_size; + _pkg_proc_stats_list[i].total_size = + _pkg_proc_stats_list[0].total_size; _pkg_proc_stats_list[i].rank = PROC_NOCHLDINIT; } - if(rpc->struct_add(th, "duduuuuus", - "entry", i, - "pid", _pkg_proc_stats_list[i].pid, - "rank", _pkg_proc_stats_list[i].rank, - "used", _pkg_proc_stats_list[i].used, - "free", _pkg_proc_stats_list[i].available, - "real_used", _pkg_proc_stats_list[i].real_used, - "total_size", _pkg_proc_stats_list[i].total_size, - "total_frags", _pkg_proc_stats_list[i].total_frags, - "desc",pt[i].desc - )<0) - { + if(rpc->struct_add(th, "duduuuuus", "entry", i, "pid", + _pkg_proc_stats_list[i].pid, "rank", + _pkg_proc_stats_list[i].rank, "used", + _pkg_proc_stats_list[i].used, "free", + _pkg_proc_stats_list[i].available, "real_used", + _pkg_proc_stats_list[i].real_used, "total_size", + _pkg_proc_stats_list[i].total_size, "total_frags", + _pkg_proc_stats_list[i].total_frags, "desc", pt[i].desc) + < 0) { rpc->fault(ctx, 500, "Internal error creating rpc"); return; } @@ -265,25 +252,23 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) /** * */ -static const char* rpc_pkg_info_doc[2] = { - "Private memory manager details", - 0 -}; +static const char *rpc_pkg_info_doc[2] = {"Private memory manager details", 0}; /** * */ -static void rpc_pkg_info(rpc_t* rpc, void* ctx) +static void rpc_pkg_info(rpc_t *rpc, void *ctx) { - void* th; + void *th; - if (rpc->add(ctx, "{", &th) < 0) { + if(rpc->add(ctx, "{", &th) < 0) { rpc->fault(ctx, 500, "Internal error creating rpc"); return; } - if(rpc->struct_add(th, "su", - "name", (_pkg_root.mname)?_pkg_root.mname:"unknown", - "size", (unsigned int)pkg_mem_size) <0) { + if(rpc->struct_add(th, "su", "name", + (_pkg_root.mname) ? _pkg_root.mname : "unknown", "size", + (unsigned int)pkg_mem_size) + < 0) { rpc->fault(ctx, 500, "Internal error adding fields"); return; } @@ -293,21 +278,17 @@ static void rpc_pkg_info(rpc_t* rpc, void* ctx) * */ rpc_export_t kex_pkg_rpc[] = { - {"pkg.stats", rpc_pkg_stats, rpc_pkg_stats_doc, RET_ARRAY}, - {"pkg.info", rpc_pkg_info, rpc_pkg_info_doc, 0}, - {0, 0, 0, 0} -}; + {"pkg.stats", rpc_pkg_stats, rpc_pkg_stats_doc, RET_ARRAY}, + {"pkg.info", rpc_pkg_info, rpc_pkg_info_doc, 0}, {0, 0, 0, 0}}; /** * */ int pkg_proc_stats_init_rpc(void) { - if (rpc_register_array(kex_pkg_rpc)!=0) - { + if(rpc_register_array(kex_pkg_rpc) != 0) { LM_ERR("failed to register RPC commands\n"); return -1; } return 0; } -