REORG: include: move freq_ctr to haproxy/
types/freq_ctr.h was moved to haproxy/freq_ctr-t.h and proto/freq_ctr.h
was moved to haproxy/freq_ctr.h. Files were updated accordingly, no other
change was applied.
diff --git a/include/types/freq_ctr.h b/include/haproxy/freq_ctr-t.h
similarity index 90%
rename from include/types/freq_ctr.h
rename to include/haproxy/freq_ctr-t.h
index 3b02cf9..f993653 100644
--- a/include/types/freq_ctr.h
+++ b/include/haproxy/freq_ctr-t.h
@@ -1,8 +1,8 @@
/*
- * include/types/freq_ctr.h
+ * include/haproxy/freq_ctr.h
* This file contains structure declarations for frequency counters.
*
- * Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TYPES_FREQ_CTR_H
-#define _TYPES_FREQ_CTR_H
+#ifndef _HAPROXY_FREQ_CTR_T_H
+#define _HAPROXY_FREQ_CTR_T_H
#include <haproxy/api-t.h>
@@ -45,7 +45,7 @@
unsigned int prev_ctr; /* value for last period */
};
-#endif /* _TYPES_FREQ_CTR_H */
+#endif /* _HAPROXY_FREQ_CTR_T_H */
/*
* Local variables:
diff --git a/include/proto/freq_ctr.h b/include/haproxy/freq_ctr.h
similarity index 97%
rename from include/proto/freq_ctr.h
rename to include/haproxy/freq_ctr.h
index 332d720..ba9de69 100644
--- a/include/proto/freq_ctr.h
+++ b/include/haproxy/freq_ctr.h
@@ -1,8 +1,8 @@
/*
- * include/proto/freq_ctr.h
+ * include/haproxy/freq_ctr.h
* This file contains macros and inline functions for frequency counters.
*
- * Copyright (C) 2000-2014 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _PROTO_FREQ_CTR_H
-#define _PROTO_FREQ_CTR_H
+#ifndef _HAPROXY_FREQ_CTR_H
+#define _HAPROXY_FREQ_CTR_H
#include <haproxy/atomic.h>
#include <haproxy/api.h>
+#include <haproxy/freq_ctr-t.h>
#include <haproxy/intops.h>
#include <haproxy/time.h>
-#include <types/freq_ctr.h>
/* Update a frequency counter by <inc> incremental units. It is automatically
@@ -324,7 +324,7 @@
return (sum + n - 1) / n;
}
-#endif /* _PROTO_FREQ_CTR_H */
+#endif /* _HAPROXY_FREQ_CTR_H */
/*
* Local variables:
diff --git a/include/proto/activity.h b/include/proto/activity.h
index 9ca9a42..ce6a81b 100644
--- a/include/proto/activity.h
+++ b/include/proto/activity.h
@@ -26,7 +26,7 @@
#include <haproxy/api.h>
#include <haproxy/time.h>
#include <types/activity.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
/* bit fields for "profiling" */
#define HA_PROF_TASKS_OFF 0x00000000 /* per-task CPU profiling forced disabled */
diff --git a/include/proto/proxy.h b/include/proto/proxy.h
index 066e807..e1da0f5 100644
--- a/include/proto/proxy.h
+++ b/include/proto/proxy.h
@@ -29,7 +29,7 @@
#include <types/global.h>
#include <types/proxy.h>
#include <types/listener.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
extern struct proxy *proxies_list;
extern struct eb_root used_proxy_id; /* list of proxy IDs in use */
diff --git a/include/proto/server.h b/include/proto/server.h
index d158089..0363f02 100644
--- a/include/proto/server.h
+++ b/include/proto/server.h
@@ -34,7 +34,7 @@
#include <proto/queue.h>
#include <proto/log.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
__decl_thread(extern HA_SPINLOCK_T idle_conn_srv_lock);
diff --git a/include/proto/stream.h b/include/proto/stream.h
index 752c183..b821cba 100644
--- a/include/proto/stream.h
+++ b/include/proto/stream.h
@@ -27,7 +27,7 @@
#include <types/action.h>
#include <types/stream.h>
#include <proto/fd.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
#include <proto/obj_type.h>
#include <proto/queue.h>
#include <proto/stick_table.h>
diff --git a/include/types/activity.h b/include/types/activity.h
index 312380f..5ebbd14 100644
--- a/include/types/activity.h
+++ b/include/types/activity.h
@@ -23,7 +23,7 @@
#define _TYPES_ACTIVITY_H
#include <haproxy/api-t.h>
-#include <types/freq_ctr.h>
+#include <haproxy/freq_ctr-t.h>
/* per-thread activity reports. It's important that it's aligned on cache lines
* because some elements will be updated very often. Most counters are OK on
diff --git a/include/types/applet.h b/include/types/applet.h
index aa1bc31..1f16543 100644
--- a/include/types/applet.h
+++ b/include/types/applet.h
@@ -23,7 +23,7 @@
#define _TYPES_APPLET_H
#include <haproxy/api-t.h>
-#include <types/freq_ctr.h>
+#include <haproxy/freq_ctr-t.h>
#include <types/hlua.h>
#include <types/obj_type.h>
#include <types/proxy.h>
diff --git a/include/types/global.h b/include/types/global.h
index b0beeb1..a00712c 100644
--- a/include/types/global.h
+++ b/include/types/global.h
@@ -27,7 +27,7 @@
#include <haproxy/api-t.h>
#include <haproxy/thread.h>
-#include <types/freq_ctr.h>
+#include <haproxy/freq_ctr-t.h>
#include <types/listener.h>
#include <types/proxy.h>
#include <types/task.h>
diff --git a/include/types/proxy.h b/include/types/proxy.h
index ca642e2..aeec0ed 100644
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -42,7 +42,7 @@
#include <types/checks.h>
#include <types/counters.h>
#include <types/filters.h>
-#include <types/freq_ctr.h>
+#include <haproxy/freq_ctr-t.h>
#include <types/listener.h>
#include <types/log.h>
#include <types/obj_type.h>
diff --git a/include/types/server.h b/include/types/server.h
index e4afff4..9faa2ea 100644
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -35,7 +35,7 @@
#include <types/connection.h>
#include <types/counters.h>
#include <types/dns.h>
-#include <types/freq_ctr.h>
+#include <haproxy/freq_ctr-t.h>
#include <types/obj_type.h>
#include <types/proxy.h>
#include <types/queue.h>
diff --git a/include/types/spoe.h b/include/types/spoe.h
index aa3d5d1..42b4bd5 100644
--- a/include/types/spoe.h
+++ b/include/types/spoe.h
@@ -29,7 +29,7 @@
#include <haproxy/thread.h>
#include <types/filters.h>
-#include <types/freq_ctr.h>
+#include <haproxy/freq_ctr-t.h>
#include <types/log.h>
#include <types/proxy.h>
#include <types/sample.h>
diff --git a/include/types/stick_table.h b/include/types/stick_table.h
index 61ca522..122daea 100644
--- a/include/types/stick_table.h
+++ b/include/types/stick_table.h
@@ -31,7 +31,7 @@
#include <import/eb32tree.h>
#include <common/memory.h>
#include <types/dict.h>
-#include <types/freq_ctr.h>
+#include <haproxy/freq_ctr-t.h>
#include <types/peers.h>
#include <types/sample.h>
diff --git a/src/activity.c b/src/activity.c
index e9a66fc..0732197 100644
--- a/src/activity.c
+++ b/src/activity.c
@@ -17,7 +17,7 @@
#include <types/activity.h>
#include <proto/channel.h>
#include <proto/cli.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
#include <proto/stream_interface.h>
diff --git a/src/cli.c b/src/cli.c
index 6c7bc3f..91e7ffb 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -50,7 +50,7 @@
#include <proto/compression.h>
#include <proto/stats.h>
#include <proto/fd.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
#include <proto/frontend.h>
#include <proto/log.h>
#include <proto/pattern.h>
diff --git a/src/compression.c b/src/compression.c
index a63eeef..154d629 100644
--- a/src/compression.c
+++ b/src/compression.c
@@ -36,7 +36,7 @@
#include <proto/acl.h>
#include <proto/compression.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
#include <proto/stream.h>
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 930c2ec..df67a29 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -27,7 +27,7 @@
#include <proto/arg.h>
#include <proto/backend.h>
#include <proto/filters.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
#include <proto/frontend.h>
#include <proto/http_rules.h>
#include <proto/log.h>
diff --git a/src/freq_ctr.c b/src/freq_ctr.c
index 1620156..8249a3a 100644
--- a/src/freq_ctr.c
+++ b/src/freq_ctr.c
@@ -13,7 +13,7 @@
#include <haproxy/api.h>
#include <common/standard.h>
#include <haproxy/time.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
/* Read a frequency counter taking history into account for missing time in
* current period. Current second is sub-divided in 1000 chunks of one ms,
diff --git a/src/listener.c b/src/listener.c
index 8de3b37..04ce4e3 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -31,7 +31,7 @@
#include <proto/acl.h>
#include <proto/connection.h>
#include <proto/fd.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
#include <proto/log.h>
#include <proto/listener.h>
#include <proto/protocol.h>
diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index 1c13518..446d8de 100644
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -37,7 +37,7 @@
#include <proto/connection.h>
#include <proto/fd.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
#include <proto/listener.h>
#include <proto/log.h>
#include <proto/protocol.h>
diff --git a/src/raw_sock.c b/src/raw_sock.c
index 1d930d8..4033625 100644
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -30,7 +30,7 @@
#include <proto/connection.h>
#include <proto/fd.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
#include <proto/log.h>
#include <proto/pipe.h>
#include <proto/raw_sock.h>
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 729f26c..f5e3405 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -68,7 +68,7 @@
#include <proto/connection.h>
#include <proto/cli.h>
#include <proto/fd.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
#include <proto/frontend.h>
#include <proto/http_rules.h>
#include <proto/listener.h>
diff --git a/src/stats.c b/src/stats.c
index c0d0eb0..a089318 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -52,7 +52,7 @@
#include <proto/dns.h>
#include <proto/stats.h>
#include <proto/fd.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
#include <proto/frontend.h>
#include <proto/http_htx.h>
#include <proto/log.h>
diff --git a/src/stream.c b/src/stream.c
index 7b5620f..92c1b50 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -42,7 +42,7 @@
#include <proto/stats.h>
#include <proto/fd.h>
#include <proto/filters.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
#include <proto/frontend.h>
#include <proto/hlua.h>
#include <proto/http_rules.h>
diff --git a/src/task.c b/src/task.c
index 452530e..96c09a3 100644
--- a/src/task.c
+++ b/src/task.c
@@ -21,7 +21,7 @@
#include <import/eb32tree.h>
#include <proto/fd.h>
-#include <proto/freq_ctr.h>
+#include <haproxy/freq_ctr.h>
#include <proto/proxy.h>
#include <proto/stream.h>
#include <proto/task.h>