mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: stats: provide ctx for dumping functions

Browse Source 
This is a minor refactor to allow stats_dump_info_* and stats_dump_fields_*
functions to directly access stat ctx pointer instead of explicitly
passing stat ctx struct members to them.

This will allow dumping functions to benefit from upcoming ctx updates.
This commit is contained in:
Aurelien DARRAGON 2022-12-15 12:10:03 +01:00 committed by Willy Tarreau
parent 4cf0d3f1e8
commit e76a027b0b
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/stats.c
View File

@ -580,9 +580,9 @@ int stats_emit_json_field_tags(struct buffer *out, const struct field *f)
/* Dump all fields from <stats> into <out> using CSV format */ /* Dump all fields from <stats> into <out> using CSV format */
static int stats_dump_fields_csv(struct buffer *out, static int stats_dump_fields_csv(struct buffer *out,
const struct field *stats, size_t stats_count, const struct field *stats, size_t stats_count,
unsigned int flags, struct show_stat_ctx *ctx)
enum stats_domain domain)
{ {
int domain = ctx->domain;
int field; int field;
for (field = 0; field < stats_count; ++field) { for (field = 0; field < stats_count; ++field) {
@ -607,9 +607,10 @@ static int stats_dump_fields_csv(struct buffer *out,
static int stats_dump_fields_typed(struct buffer *out, static int stats_dump_fields_typed(struct buffer *out,
const struct field *stats, const struct field *stats,
size_t stats_count, size_t stats_count,
unsigned int flags, struct show_stat_ctx * ctx)
enum stats_domain domain)
{ {
int flags = ctx->flags;
int domain = ctx->domain;
int field; int field;
for (field = 0; field < stats_count; ++field) { for (field = 0; field < stats_count; ++field) {
@ -657,7 +658,8 @@ static int stats_dump_fields_typed(struct buffer *out,
/* Dump all fields from <stats> into <out> using the "show info json" format */ /* Dump all fields from <stats> into <out> using the "show info json" format */
static int stats_dump_json_info_fields(struct buffer *out, static int stats_dump_json_info_fields(struct buffer *out,
const struct field *info, unsigned int flags) const struct field *info,
struct show_stat_ctx *ctx)
{ {
int field; int field;
int started = 0; int started = 0;
@ -747,9 +749,10 @@ static void stats_print_rslv_field_json(struct buffer *out,
/* Dump all fields from <stats> into <out> using a typed "field:desc:type:value" format */ /* Dump all fields from <stats> into <out> using a typed "field:desc:type:value" format */
static int stats_dump_fields_json(struct buffer *out, static int stats_dump_fields_json(struct buffer *out,
const struct field *stats, size_t stats_count, const struct field *stats, size_t stats_count,
unsigned int flags, struct show_stat_ctx *ctx)
enum stats_domain domain)
{ {
int flags = ctx->flags;
int domain = ctx->domain;
int field; int field;
int started = 0; int started = 0;
@ -817,10 +820,11 @@ static int stats_dump_fields_json(struct buffer *out,
*/ */
static int stats_dump_fields_html(struct buffer *out, static int stats_dump_fields_html(struct buffer *out,
const struct field *stats, const struct field *stats,
unsigned int flags) struct show_stat_ctx *ctx)
{ {
struct buffer src; struct buffer src;
struct stats_module *mod; struct stats_module *mod;
int flags = ctx->flags;
int i = 0, j = 0; int i = 0, j = 0;
if (stats[ST_F_TYPE].u.u32 == STATS_TYPE_FE) { if (stats[ST_F_TYPE].u.u32 == STATS_TYPE_FE) {
@ -1626,13 +1630,13 @@ int stats_dump_one_line(const struct field *stats, size_t stats_count,
int ret; int ret;
if (ctx->flags & STAT_FMT_HTML) if (ctx->flags & STAT_FMT_HTML)
ret = stats_dump_fields_html(&trash, stats, ctx->flags); ret = stats_dump_fields_html(&trash, stats, ctx);
else if (ctx->flags & STAT_FMT_TYPED) else if (ctx->flags & STAT_FMT_TYPED)
ret = stats_dump_fields_typed(&trash, stats, stats_count, ctx->flags, ctx->domain); ret = stats_dump_fields_typed(&trash, stats, stats_count, ctx);
else if (ctx->flags & STAT_FMT_JSON) else if (ctx->flags & STAT_FMT_JSON)
ret = stats_dump_fields_json(&trash, stats, stats_count, ctx->flags, ctx->domain); ret = stats_dump_fields_json(&trash, stats, stats_count, ctx);
else else
ret = stats_dump_fields_csv(&trash, stats, stats_count, ctx->flags, ctx->domain); ret = stats_dump_fields_csv(&trash, stats, stats_count, ctx);
if (ret) if (ret)
ctx->flags |= STAT_STARTED; ctx->flags |= STAT_STARTED;
@ -4401,8 +4405,10 @@ static void http_stats_io_handler(struct appctx *appctx)
/* Dump all fields from <info> into <out> using the "show info" format (name: value) */ /* Dump all fields from <info> into <out> using the "show info" format (name: value) */
static int stats_dump_info_fields(struct buffer *out, static int stats_dump_info_fields(struct buffer *out,
const struct field *info, unsigned int flags) const struct field *info,
struct show_stat_ctx *ctx)
{ {
int flags = ctx->flags;
int field; int field;
for (field = 0; field < INF_TOTAL_FIELDS; field++) { for (field = 0; field < INF_TOTAL_FIELDS; field++) {
@ -4423,8 +4429,10 @@ static int stats_dump_info_fields(struct buffer *out,
/* Dump all fields from <info> into <out> using the "show info typed" format */ /* Dump all fields from <info> into <out> using the "show info typed" format */
static int stats_dump_typed_info_fields(struct buffer *out, static int stats_dump_typed_info_fields(struct buffer *out,
const struct field *info, unsigned int flags) const struct field *info,
struct show_stat_ctx *ctx)
{ {
int flags = ctx->flags;
int field; int field;
for (field = 0; field < INF_TOTAL_FIELDS; field++) { for (field = 0; field < INF_TOTAL_FIELDS; field++) {
@ -4578,11 +4586,11 @@ static int stats_dump_info_to_buffer(struct stconn *sc)
chunk_reset(&trash); chunk_reset(&trash);
if (ctx->flags & STAT_FMT_TYPED) if (ctx->flags & STAT_FMT_TYPED)
stats_dump_typed_info_fields(&trash, info, ctx->flags); stats_dump_typed_info_fields(&trash, info, ctx);
else if (ctx->flags & STAT_FMT_JSON) else if (ctx->flags & STAT_FMT_JSON)
stats_dump_json_info_fields(&trash, info, ctx->flags); stats_dump_json_info_fields(&trash, info, ctx);
else else
stats_dump_info_fields(&trash, info, ctx->flags); stats_dump_info_fields(&trash, info, ctx);
if (applet_putchk(appctx, &trash) == -1) if (applet_putchk(appctx, &trash) == -1)
return 0; return 0;