From 6634794992ee62411c3241cfc3a00ee6f6ed6aff Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 1 Jun 2020 12:18:08 +0200 Subject: [PATCH] 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. --- include/{types/freq_ctr.h => haproxy/freq_ctr-t.h} | 10 +++++----- include/{proto => haproxy}/freq_ctr.h | 12 ++++++------ include/proto/activity.h | 2 +- include/proto/proxy.h | 2 +- include/proto/server.h | 2 +- include/proto/stream.h | 2 +- include/types/activity.h | 2 +- include/types/applet.h | 2 +- include/types/global.h | 2 +- include/types/proxy.h | 2 +- include/types/server.h | 2 +- include/types/spoe.h | 2 +- include/types/stick_table.h | 2 +- src/activity.c | 2 +- src/cli.c | 2 +- src/compression.c | 2 +- src/flt_spoe.c | 2 +- src/freq_ctr.c | 2 +- src/listener.c | 2 +- src/proto_sockpair.c | 2 +- src/raw_sock.c | 2 +- src/ssl_sock.c | 2 +- src/stats.c | 2 +- src/stream.c | 2 +- src/task.c | 2 +- 25 files changed, 34 insertions(+), 34 deletions(-) rename include/{types/freq_ctr.h => haproxy/freq_ctr-t.h} (90%) rename include/{proto => haproxy}/freq_ctr.h (98%) 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 3b02cf908..f99365367 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 @@ -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 332d720b3..ba9de6995 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 #include +#include #include #include -#include /* Update a frequency counter by 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 9ca9a4294..ce6a81b5f 100644 --- a/include/proto/activity.h +++ b/include/proto/activity.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include /* 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 066e8076a..e1da0f58f 100644 --- a/include/proto/proxy.h +++ b/include/proto/proxy.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include 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 d15808953..0363f02d5 100644 --- a/include/proto/server.h +++ b/include/proto/server.h @@ -34,7 +34,7 @@ #include #include -#include +#include __decl_thread(extern HA_SPINLOCK_T idle_conn_srv_lock); diff --git a/include/proto/stream.h b/include/proto/stream.h index 752c183f9..b821cbae2 100644 --- a/include/proto/stream.h +++ b/include/proto/stream.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/types/activity.h b/include/types/activity.h index 312380f28..5ebbd1405 100644 --- a/include/types/activity.h +++ b/include/types/activity.h @@ -23,7 +23,7 @@ #define _TYPES_ACTIVITY_H #include -#include +#include /* 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 aa1bc31dd..1f1654382 100644 --- a/include/types/applet.h +++ b/include/types/applet.h @@ -23,7 +23,7 @@ #define _TYPES_APPLET_H #include -#include +#include #include #include #include diff --git a/include/types/global.h b/include/types/global.h index b0beeb1b6..a00712c07 100644 --- a/include/types/global.h +++ b/include/types/global.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/types/proxy.h b/include/types/proxy.h index ca642e2a4..aeec0ed92 100644 --- a/include/types/proxy.h +++ b/include/types/proxy.h @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/types/server.h b/include/types/server.h index e4afff4a6..9faa2ea3c 100644 --- a/include/types/server.h +++ b/include/types/server.h @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/types/spoe.h b/include/types/spoe.h index aa3d5d103..42b4bd5a4 100644 --- a/include/types/spoe.h +++ b/include/types/spoe.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/types/stick_table.h b/include/types/stick_table.h index 61ca5223a..122daeab3 100644 --- a/include/types/stick_table.h +++ b/include/types/stick_table.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/activity.c b/src/activity.c index e9a66fce1..0732197a3 100644 --- a/src/activity.c +++ b/src/activity.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include diff --git a/src/cli.c b/src/cli.c index 6c7bc3f52..91e7ffb19 100644 --- a/src/cli.c +++ b/src/cli.c @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/compression.c b/src/compression.c index a63eeef14..154d629f8 100644 --- a/src/compression.c +++ b/src/compression.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include diff --git a/src/flt_spoe.c b/src/flt_spoe.c index 930c2ecbf..df67a29d7 100644 --- a/src/flt_spoe.c +++ b/src/flt_spoe.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/freq_ctr.c b/src/freq_ctr.c index 16201560d..8249a3aa5 100644 --- a/src/freq_ctr.c +++ b/src/freq_ctr.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include /* 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 8de3b37e9..04ce4e33f 100644 --- a/src/listener.c +++ b/src/listener.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c index 1c1351800..446d8dee3 100644 --- a/src/proto_sockpair.c +++ b/src/proto_sockpair.c @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/raw_sock.c b/src/raw_sock.c index 1d930d80f..4033625fe 100644 --- a/src/raw_sock.c +++ b/src/raw_sock.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/ssl_sock.c b/src/ssl_sock.c index 729f26c7a..f5e34055e 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/stats.c b/src/stats.c index c0d0eb073..a08931831 100644 --- a/src/stats.c +++ b/src/stats.c @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/stream.c b/src/stream.c index 7b5620f97..92c1b5064 100644 --- a/src/stream.c +++ b/src/stream.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/task.c b/src/task.c index 452530ef3..96c09a388 100644 --- a/src/task.c +++ b/src/task.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include