From: Willy Tarreau Date: Tue, 23 Jul 2013 13:09:35 +0000 (+0200) Subject: MEDIUM: counters: factor out smp_fetch_sc*_conn_rate X-Git-Tag: v1.5-dev20~314 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8c65700de05636693cdfbe9fb81f12b1c0b0f84;p=thirdparty%2Fhaproxy.git MEDIUM: counters: factor out smp_fetch_sc*_conn_rate smp_fetch_sc0_conn_rate, smp_fetch_sc1_conn_rate, smp_fetch_sc2_conn_rate, smp_fetch_src_conn_rate and smp_fetch_conn_rate were merged into a single function which relies on the fetch name to decide what to return. --- diff --git a/src/session.c b/src/session.c index 8b73e8cfb6..0e362a4650 100644 --- a/src/session.c +++ b/src/session.c @@ -2761,80 +2761,32 @@ smp_fetch_sc_conn_cnt(struct proxy *px, struct session *l4, void *l7, unsigned i return 1; } -/* set temp integer to the connection rate in the stksess entry over the configured period */ +/* set to the connection rate from the session's tracked frontend + * counters. Supports being called as "sc[0-9]_conn_rate" or "src_conn_rate" + * only. + */ static int -smp_fetch_conn_rate(struct stktable *table, struct sample *smp, struct stksess *ts) +smp_fetch_sc_conn_rate(struct proxy *px, struct session *l4, void *l7, unsigned int opt, + const struct arg *args, struct sample *smp, const char *kw) { + struct stkctr *stkctr = smp_fetch_sc_stkctr(l4, args, kw); + + if (!stkctr) + return 0; + smp->flags = SMP_F_VOL_TEST; smp->type = SMP_T_UINT; smp->data.uint = 0; - if (ts != NULL) { - void *ptr = stktable_data_ptr(table, ts, STKTABLE_DT_CONN_RATE); + if (stkctr->entry != NULL) { + void *ptr = stktable_data_ptr(stkctr->table, stkctr->entry, STKTABLE_DT_CONN_RATE); if (!ptr) return 0; /* parameter not stored */ smp->data.uint = read_freq_ctr_period(&stktable_data_cast(ptr, conn_rate), - table->data_arg[STKTABLE_DT_CONN_RATE].u); + stkctr->table->data_arg[STKTABLE_DT_CONN_RATE].u); } return 1; } -/* set temp integer to the connection rate from the session's tracked FE counters over - * the configured period. - */ -static int -smp_fetch_sc0_conn_rate(struct proxy *px, struct session *l4, void *l7, unsigned int opt, - const struct arg *args, struct sample *smp, const char *kw) -{ - if (!l4->stkctr[0].entry) - return 0; - - return smp_fetch_conn_rate(l4->stkctr[0].table, smp, l4->stkctr[0].entry); -} - -/* set temp integer to the connection rate from the session's tracked BE counters over - * the configured period. - */ -static int -smp_fetch_sc1_conn_rate(struct proxy *px, struct session *l4, void *l7, unsigned int opt, - const struct arg *args, struct sample *smp, const char *kw) -{ - if (!l4->stkctr[1].entry) - return 0; - - return smp_fetch_conn_rate(l4->stkctr[1].table, smp, l4->stkctr[1].entry); -} - -/* set temp integer to the connection rate from the session's tracked BE counters over - * the configured period. - */ -static int -smp_fetch_sc2_conn_rate(struct proxy *px, struct session *l4, void *l7, unsigned int opt, - const struct arg *args, struct sample *smp, const char *kw) -{ - if (!l4->stkctr[2].entry) - return 0; - - return smp_fetch_conn_rate(l4->stkctr[2].table, smp, l4->stkctr[2].entry); -} - -/* set temp integer to the connection rate from the session's source address in the - * table pointed to by expr, over the configured period. - * Accepts exactly 1 argument of type table. - */ -static int -smp_fetch_src_conn_rate(struct proxy *px, struct session *l4, void *l7, unsigned int opt, - const struct arg *args, struct sample *smp, const char *kw) -{ - struct stktable_key *key; - - key = addr_to_stktable_key(&l4->si[0].conn->addr.from); - if (!key) - return 0; - - px = args->data.prx; - return smp_fetch_conn_rate(&px->table, smp, stktable_lookup_key(&px->table, key)); -} - /* set temp integer to the number of connections from the session's source address * in the table pointed to by expr, after updating it. * Accepts exactly 1 argument of type table. @@ -3734,7 +3686,7 @@ static struct sample_fetch_kw_list smp_fetch_keywords = {ILH, { { "sc0_clr_gpc0", smp_fetch_sc_clr_gpc0, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, { "sc0_conn_cnt", smp_fetch_sc_conn_cnt, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, { "sc0_conn_cur", smp_fetch_sc0_conn_cur, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, - { "sc0_conn_rate", smp_fetch_sc0_conn_rate, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, + { "sc0_conn_rate", smp_fetch_sc_conn_rate, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, { "sc0_get_gpc0", smp_fetch_sc_get_gpc0, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, { "sc0_gpc0_rate", smp_fetch_sc_gpc0_rate, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, { "sc0_http_err_cnt", smp_fetch_sc0_http_err_cnt, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, @@ -3753,7 +3705,7 @@ static struct sample_fetch_kw_list smp_fetch_keywords = {ILH, { { "sc1_clr_gpc0", smp_fetch_sc_clr_gpc0, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, { "sc1_conn_cnt", smp_fetch_sc_conn_cnt, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, { "sc1_conn_cur", smp_fetch_sc1_conn_cur, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, - { "sc1_conn_rate", smp_fetch_sc1_conn_rate, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, + { "sc1_conn_rate", smp_fetch_sc_conn_rate, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, { "sc1_get_gpc0", smp_fetch_sc_get_gpc0, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, { "sc1_gpc0_rate", smp_fetch_sc_gpc0_rate, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, { "sc1_http_err_cnt", smp_fetch_sc1_http_err_cnt, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, @@ -3772,7 +3724,7 @@ static struct sample_fetch_kw_list smp_fetch_keywords = {ILH, { { "sc2_clr_gpc0", smp_fetch_sc_clr_gpc0, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, { "sc2_conn_cnt", smp_fetch_sc_conn_cnt, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, { "sc2_conn_cur", smp_fetch_sc2_conn_cur, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, - { "sc2_conn_rate", smp_fetch_sc2_conn_rate, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, + { "sc2_conn_rate", smp_fetch_sc_conn_rate, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, { "sc2_get_gpc0", smp_fetch_sc_get_gpc0, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, { "sc2_gpc0_rate", smp_fetch_sc_gpc0_rate, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, { "sc2_http_err_cnt", smp_fetch_sc2_http_err_cnt, 0, NULL, SMP_T_UINT, SMP_USE_INTRN, }, @@ -3791,7 +3743,7 @@ static struct sample_fetch_kw_list smp_fetch_keywords = {ILH, { { "src_clr_gpc0", smp_fetch_sc_clr_gpc0, ARG1(1,TAB), NULL, SMP_T_UINT, SMP_USE_L4CLI, }, { "src_conn_cnt", smp_fetch_sc_conn_cnt, ARG1(1,TAB), NULL, SMP_T_UINT, SMP_USE_L4CLI, }, { "src_conn_cur", smp_fetch_src_conn_cur, ARG1(1,TAB), NULL, SMP_T_UINT, SMP_USE_L4CLI, }, - { "src_conn_rate", smp_fetch_src_conn_rate, ARG1(1,TAB), NULL, SMP_T_UINT, SMP_USE_L4CLI, }, + { "src_conn_rate", smp_fetch_sc_conn_rate, ARG1(1,TAB), NULL, SMP_T_UINT, SMP_USE_L4CLI, }, { "src_get_gpc0", smp_fetch_sc_get_gpc0, ARG1(1,TAB), NULL, SMP_T_UINT, SMP_USE_L4CLI, }, { "src_gpc0_rate", smp_fetch_sc_gpc0_rate, ARG1(1,TAB), NULL, SMP_T_UINT, SMP_USE_L4CLI, }, { "src_http_err_cnt", smp_fetch_src_http_err_cnt, ARG1(1,TAB), NULL, SMP_T_UINT, SMP_USE_L4CLI, },