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 3b02cf9080494d2afdfc7ae47c61071dcf6152dc..f99365367afdea7830c2228ef121a5e1f9c75575 100644 (file)
--- 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 @@ struct freq_ctr_period {
        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 98%
rename from include/proto/freq_ctr.h
rename to include/haproxy/freq_ctr.h
index 332d720b3fddd1990e1310feab932d2c6751f132..ba9de6995e195642cb18f909b682aeb1093130de 100644 (file)
--- 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 @@ static inline unsigned int swrate_avg(unsigned int sum, unsigned int n)
        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 9ca9a4294eb57c8cf5825032d7b554e2e3501c8b..ce6a81b5fd305531c7730b109276234fec7e5c3d 100644 (file)
--- 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 066e8076a834b3fa1220a0c21e015d73bc5af91f..e1da0f58f59331e48bd7aeb71e1df9afcf2e7024 100644 (file)
--- 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 d15808953fcdd42f97bb4b9a0c7bf583ba7a70a5..0363f02d58f944b5080f5bfaa9136ece7290e693 100644 (file)
--- 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 752c183f9af2ac1036c051e7fb84b301348ad2f3..b821cbae269dc41aaa071dfc541aa60d65f9fbc9 100644 (file)
--- 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 312380f288327de9f4b58a71bed710c6e5098c02..5ebbd1405e6bc7e04f10115d725fb87828ea6666 100644 (file)
--- 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 aa1bc31ddb2f61d42b359555e1404dc786b531a2..1f16543821e5a2c06f9ab93cad5afc5c09285e13 100644 (file)
--- 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 b0beeb1b6f5ae6b47d762739a44863b9c5694b77..a00712c072c3d8c64bc1de1df7cae2d0eac5a0a3 100644 (file)
--- 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 ca642e2a4bfaf429cb369b94fb34b36cc7428945..aeec0ed92aac2e572701bd4dcc21588983acdb72 100644 (file)
--- 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 e4afff4a6e23cb07aa243cdbab4fc67104fb6eff..9faa2ea3c00809f05584bd6ee4e22e793546ea93 100644 (file)
--- 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 aa3d5d103d85a3b4f90375caacddff6e3a71ae8d..42b4bd5a4188aaf1d0a5cf52529190c8458686d3 100644 (file)
--- 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 61ca5223a3cb1dc1dee77747b073178c11828c95..122daeab3c5c5597847b3f72379e3c10de10ffad 100644 (file)
--- 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 e9a66fce130564ae42750996e49b6d4538bef2bb..0732197a302af99afe4c654a33b388ac1718bc4d 100644 (file)
--- 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 6c7bc3f525c54a8352d48de024cefefbe1a9133a..91e7ffb1978c0ba093ede90ce1da9732ae070752 100644 (file)
--- 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 a63eeef14c8a11b93c7f79ddd71ccc4e12d12c54..154d629f8ed589c21823e2876dae3b81ab4328a8 100644 (file)
--- 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 930c2ecbf6a547d2ce71728fff9a130021fc4673..df67a29d7a3c1cc02b97ca9604aea9ab23920c87 100644 (file)
--- 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 16201560db944ac3d59f7ffb11d7e2df0e13743c..8249a3aa55b3a9bb496e855540512e01ad084ab9 100644 (file)
--- 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 8de3b37e94a1254839b20cfcf9d836b5c558082c..04ce4e33f14a2c63b145ce767892e6c2735da2ee 100644 (file)
--- 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 1c13518002ede141d5194bf020b20baf36c43531..446d8dee331f18fbef447fe06d90e5ea6d4f0764 100644 (file)
--- 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 1d930d80f4f255907d5662876ded920c3ccded41..4033625feb0f019fc1e42413d0c2e2dbf9cafddf 100644 (file)
--- 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 729f26c7ac895915b6085ab145ac79d49136f6fd..f5e34055ea2cb8a91c8429a4fb8a4d04b026a706 100644 (file)
--- 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 c0d0eb0732518081bbd1de3546ee0ce29702302a..a089318318c1f822d6a68a529952d8faba50abd1 100644 (file)
--- 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 7b5620f9734a299f0ae5e4011823780aa0f19b5c..92c1b506405865e4c45f76bee72986da20052bc2 100644 (file)
--- 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 452530ef33dda8849e6dc8400144599f7b97dccc..96c09a388ea1169f547d3f0f5624fe8e6d8c3f3f 100644 (file)
--- 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>