MINOR: dumpstats: split stats_dump_fe_stats() in two parts

This patch splits the function stats_dump_fe_stats() in two parts. The
extracted part is called stats_fill_fe_stats(), and just fill the stats buffer.
This split allows the usage of preformated stats in other parts of HAProxy
like the Lua.

diff --git a/include/proto/dumpstats.h b/include/proto/dumpstats.h
index ac0c0b557aec959033157afbfbfafc53a8111ecd..7a75473b235384cb5ff58807e03ca0d0e30b6f4e 100644 (file)
--- a/include/proto/dumpstats.h
+++ b/include/proto/dumpstats.h
@@ -392,6 +392,7 @@ extern const char *info_field_names[];
 extern const char *stat_field_names[];
 
 int stats_fill_info(struct field *info, int len);
+int stats_fill_fe_stats(struct proxy *px, struct field *stats, int len);
 
 extern struct applet http_stats_applet;
 

diff --git a/src/dumpstats.c b/src/dumpstats.c
index 0474eab9ba7a563af6d88c8a4d01dcbcfb720f63..8bc1d14f2adfca66b9c1cf49804674eec7cf606d 100644 (file)
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -3893,21 +3893,17 @@ static int stats_dump_one_line(const struct field *stats, unsigned int flags, st
                return stats_dump_fields_csv(&trash, stats);
 }
 
-/* Dumps a frontend's line to the trash for the current proxy <px> and uses
- * the state from stream interface <si>. The caller is responsible for clearing
- * the trash if needed. Returns non-zero if it emits anything, zero otherwise.
+/* Fill <stats> with the frontend statistics. <stats> is
+ * preallocated array of length <len>. The length of the array
+ * must be at least ST_F_TOTAL_FIELDS. If this length is less then
+ * this value, the function returns 0, otherwise, it returns 1.
  */
-static int stats_dump_fe_stats(struct stream_interface *si, struct proxy *px)
+int stats_fill_fe_stats(struct proxy *px, struct field *stats, int len)
 {
-       struct appctx *appctx = __objt_appctx(si->end);
-
-       if (!(px->cap & PR_CAP_FE))
+       if (len < ST_F_TOTAL_FIELDS)
                return 0;
 
-       if ((appctx->ctx.stats.flags & STAT_BOUND) && !(appctx->ctx.stats.type & (1 << STATS_TYPE_FE)))
-               return 0;
-
-       memset(&stats, 0, sizeof(stats));
+       memset(stats, 0, sizeof(*stats) * len);
 
        stats[ST_F_PXNAME]   = mkf_str(FO_KEY|FN_NAME|FS_SERVICE, px->id);
        stats[ST_F_SVNAME]   = mkf_str(FO_KEY|FN_NAME|FS_SERVICE, "FRONTEND");
@@ -3957,6 +3953,26 @@ static int stats_dump_fe_stats(struct stream_interface *si, struct proxy *px)
        stats[ST_F_CONN_RATE_MAX] = mkf_u32(FN_MAX, px->fe_counters.cps_max);
        stats[ST_F_CONN_TOT]      = mkf_u64(FN_COUNTER, px->fe_counters.cum_conn);
 
+       return 1;
+}
+
+/* Dumps a frontend's line to the trash for the current proxy <px> and uses
+ * the state from stream interface <si>. The caller is responsible for clearing
+ * the trash if needed. Returns non-zero if it emits anything, zero otherwise.
+ */
+static int stats_dump_fe_stats(struct stream_interface *si, struct proxy *px)
+{
+       struct appctx *appctx = __objt_appctx(si->end);
+
+       if (!(px->cap & PR_CAP_FE))
+               return 0;
+
+       if ((appctx->ctx.stats.flags & STAT_BOUND) && !(appctx->ctx.stats.type & (1 << STATS_TYPE_FE)))
+               return 0;
+
+       if (!stats_fill_fe_stats(px, stats, ST_F_TOTAL_FIELDS))
+               return 0;
+
        return stats_dump_one_line(stats, 0, px, appctx);
 }