From: Thierry Fournier <tfournier@arpalert.org>
Date: Fri, 25 Mar 2016 07:19:23 +0000 (+0100)
Subject: MINOR: dumpstats: split stats_dump_info_to_buffer() in two parts
X-Git-Tag: v1.7-dev3~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb2c767681d912b8f45d37e9ea91ee14bd0b6e23;p=thirdparty%2Fhaproxy.git

MINOR: dumpstats: split stats_dump_info_to_buffer() in two parts

This patch splits the function stats_dump_info_to_buffer() in two parts. The
extracted part is called stats_fill_info(), 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 9db2eece08..ac0c0b557a 100644
--- a/include/proto/dumpstats.h
+++ b/include/proto/dumpstats.h
@@ -391,6 +391,8 @@ static inline struct field mkf_str(uint32_t type, const char *value)
 extern const char *info_field_names[];
 extern const char *stat_field_names[];
 
+int stats_fill_info(struct field *info, int len);
+
 extern struct applet http_stats_applet;
 
 void stats_io_handler(struct stream_interface *si);
diff --git a/src/dumpstats.c b/src/dumpstats.c
index 833dd9f8c0..0474eab9ba 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -2948,15 +2948,15 @@ static int stats_dump_typed_info_fields(struct chunk *out, const struct field *i
 	return 1;
 }
 
-/* This function dumps information onto the stream interface's read buffer.
- * It returns 0 as long as it does not complete, non-zero upon completion.
- * No state is used.
+/* Fill <info> with HAProxy global info. <info> is preallocated
+ * array of length <len>. The length of the aray must be
+ * INF_TOTAL_FIELDS. If this length is less then this value, the
+ * function returns 0, otherwise, it returns 1.
  */
-static int stats_dump_info_to_buffer(struct stream_interface *si)
+int stats_fill_info(struct field *info, int len)
 {
 	unsigned int up = (now.tv_sec - start_date.tv_sec);
 	struct chunk *out = get_trash_chunk();
-	struct appctx *appctx = __objt_appctx(si->end);
 
 #ifdef USE_OPENSSL
 	int ssl_sess_rate = read_freq_ctr(&global.ssl_per_sec);
@@ -2969,8 +2969,11 @@ static int stats_dump_info_to_buffer(struct stream_interface *si)
 	}
 #endif
 
+	if (len < INF_TOTAL_FIELDS)
+		return 0;
+
 	chunk_reset(out);
-	memset(&info, 0, sizeof(info));
+	memset(info, 0, sizeof(*info) * len);
 
 	info[INF_NAME]                           = mkf_str(FO_PRODUCT|FN_OUTPUT|FS_SERVICE, PRODUCT_NAME);
 	info[INF_VERSION]                        = mkf_str(FO_PRODUCT|FN_OUTPUT|FS_SERVICE, HAPROXY_VERSION);
@@ -3036,6 +3039,20 @@ static int stats_dump_info_to_buffer(struct stream_interface *si)
 	if (global.desc)
 		info[INF_DESCRIPTION]            = mkf_str(FO_CONFIG|FN_OUTPUT|FS_SERVICE, global.desc);
 
+	return 1;
+}
+
+/* This function dumps information onto the stream interface's read buffer.
+ * It returns 0 as long as it does not complete, non-zero upon completion.
+ * No state is used.
+ */
+static int stats_dump_info_to_buffer(struct stream_interface *si)
+{
+	struct appctx *appctx = __objt_appctx(si->end);
+
+	if (!stats_fill_info(info, INF_TOTAL_FIELDS))
+		return 0;
+
 	chunk_reset(&trash);
 
 	if (appctx->ctx.stats.flags & STAT_FMT_TYPED)