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>