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/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/freq_ctr.h b/include/types/freq_ctr.h
deleted file mode 100644
index 3b02cf9..0000000
--- a/include/types/freq_ctr.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * include/types/freq_ctr.h
- * This file contains structure declarations for frequency counters.
- *
- * Copyright (C) 2000-2010 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
- * License as published by the Free Software Foundation, version 2.1
- * exclusively.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef _TYPES_FREQ_CTR_H
-#define _TYPES_FREQ_CTR_H
-
-#include <haproxy/api-t.h>
-
-/* The implicit freq_ctr counter counts a rate of events per second. It is the
- * preferred form to count rates over a one-second period, because it does not
- * involve any divide.
- */
-struct freq_ctr {
- unsigned int curr_sec; /* start date of current period (seconds from now.tv_sec) */
- unsigned int curr_ctr; /* cumulated value for current period */
- unsigned int prev_ctr; /* value for last period */
-};
-
-/* The generic freq_ctr_period counter counts a rate of events per period, where
- * the period has to be known by the user. The period is measured in ticks and
- * must be at least 2 ticks long. This form is slightly more CPU intensive than
- * the per-second form.
- */
-struct freq_ctr_period {
- unsigned int curr_tick; /* start date of current period (wrapping ticks) */
- unsigned int curr_ctr; /* cumulated value for current period */
- unsigned int prev_ctr; /* value for last period */
-};
-
-#endif /* _TYPES_FREQ_CTR_H */
-
-/*
- * Local variables:
- * c-indent-level: 8
- * c-basic-offset: 8
- * End:
- */
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>