]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: counters: add common struct and flags to {fe,be}_counters_shared
authorAurelien DARRAGON <adarragon@haproxy.com>
Fri, 9 May 2025 08:42:49 +0000 (10:42 +0200)
committerAurelien DARRAGON <adarragon@haproxy.com>
Thu, 5 Jun 2025 07:59:10 +0000 (09:59 +0200)
fe_counters_shared and be_counters_shared may share some common members
since they are quite similar, so we add a common struct part shared
between the two. struct counters_shared is added for convenience as
a generic pointer to manipulate common members from fe or be shared
counters pointer.

Also, the first common member is added: shared fe and be counters now
have a flags member.

include/haproxy/counters-t.h

index a91d88e88e5d3d26199d6d592486259339db7f53..28f456ea413b715ed452932c6eb6c7d4e90514c8 100644 (file)
 
 #include <haproxy/freq_ctr-t.h>
 
+#define COUNTERS_SHARED_F_NONE    0x0000
+
+// common to fe_counters_shared and be_counters_shared
+#define COUNTERS_SHARED                                                              \
+       struct {                                                                     \
+               uint16_t flags;                         /* COUNTERS_SHARED_F flags */\
+       }
+
+// for convenience (generic pointer)
+struct counters_shared {
+       COUNTERS_SHARED;
+};
+
 /* counters used by listeners and frontends */
 struct fe_counters_shared {
+       COUNTERS_SHARED;
        long long internal_errors;              /* internal processing errors */
        long long failed_rewrites;              /* failed rewrites (warning) */
        long long denied_sess;                  /* denied session requests (tcp-req-sess rules) */
@@ -86,6 +100,7 @@ struct fe_counters {
 };
 
 struct be_counters_shared {
+       COUNTERS_SHARED;
        long long internal_errors;              /* internal processing errors */
 
        long long  cum_lbconn;                  /* cumulated number of sessions processed by load balancing (BE only) */