REORG: include: move activity to haproxy/
This moves types/activity.h to haproxy/activity-t.h and
proto/activity.h to haproxy/activity.h.
The macros defining the bit field values for the profiling variable
were moved to the type file to be more future-proof.
diff --git a/include/common/buffer.h b/include/common/buffer.h
index a42fc25..4e19c22 100644
--- a/include/common/buffer.h
+++ b/include/common/buffer.h
@@ -33,7 +33,7 @@
#include <haproxy/istbuf.h>
#include <haproxy/pool.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
/* an element of the <buffer_wq> list. It represents an object that need to
* acquire a buffer to continue its process. */
diff --git a/include/types/activity.h b/include/haproxy/activity-t.h
similarity index 84%
rename from include/types/activity.h
rename to include/haproxy/activity-t.h
index 5ebbd14..3bc81b3 100644
--- a/include/types/activity.h
+++ b/include/haproxy/activity-t.h
@@ -1,8 +1,8 @@
/*
- * include/types/activity.h
+ * include/haproxy/activity-t.h
* This file contains structure declarations for activity measurements.
*
- * Copyright (C) 2000-2018 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,12 +19,18 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TYPES_ACTIVITY_H
-#define _TYPES_ACTIVITY_H
+#ifndef _HAPROXY_ACTIVITY_T_H
+#define _HAPROXY_ACTIVITY_T_H
#include <haproxy/api-t.h>
#include <haproxy/freq_ctr-t.h>
+/* bit fields for the "profiling" global variable */
+#define HA_PROF_TASKS_OFF 0x00000000 /* per-task CPU profiling forced disabled */
+#define HA_PROF_TASKS_AUTO 0x00000001 /* per-task CPU profiling automatic */
+#define HA_PROF_TASKS_ON 0x00000002 /* per-task CPU profiling forced enabled */
+#define HA_PROF_TASKS_MASK 0x00000003 /* per-task CPU profiling mask */
+
/* 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
* 32-bit since this will be used during debugging sessions for troubleshooting
@@ -65,7 +71,7 @@
char __end[0] __attribute__((aligned(64))); // align size to 64.
};
-#endif /* _TYPES_ACTIVITY_H */
+#endif /* _HAPROXY_ACTIVITY_T_H */
/*
* Local variables:
diff --git a/include/proto/activity.h b/include/haproxy/activity.h
similarity index 84%
rename from include/proto/activity.h
rename to include/haproxy/activity.h
index ce6a81b..452e5f8 100644
--- a/include/proto/activity.h
+++ b/include/haproxy/activity.h
@@ -1,8 +1,8 @@
/*
- * include/proto/activity.h
+ * include/haproxy/activity.h
* This file contains macros and inline functions for activity measurements.
*
- * Copyright (C) 2000-2018 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,26 +19,19 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _PROTO_ACTIVITY_H
-#define _PROTO_ACTIVITY_H
+#ifndef _HAPROXY_ACTIVITY_H
+#define _HAPROXY_ACTIVITY_H
#include <haproxy/atomic.h>
#include <haproxy/api.h>
#include <haproxy/time.h>
-#include <types/activity.h>
+#include <haproxy/activity-t.h>
#include <haproxy/freq_ctr.h>
-/* bit fields for "profiling" */
-#define HA_PROF_TASKS_OFF 0x00000000 /* per-task CPU profiling forced disabled */
-#define HA_PROF_TASKS_AUTO 0x00000001 /* per-task CPU profiling automatic */
-#define HA_PROF_TASKS_ON 0x00000002 /* per-task CPU profiling forced enabled */
-#define HA_PROF_TASKS_MASK 0x00000003 /* per-task CPU profiling mask */
-
extern unsigned int profiling;
extern unsigned long task_profiling_mask;
extern struct activity activity[MAX_THREADS];
-
void report_stolen_time(uint64_t stolen);
/* Collect date and time information before calling poll(). This will be used
@@ -99,7 +92,7 @@
}
-#endif /* _PROTO_ACTIVITY_H */
+#endif /* _HAPROXY_ACTIVITY_H */
/*
* Local variables:
diff --git a/include/proto/fd.h b/include/proto/fd.h
index f882b54..2d45e06 100644
--- a/include/proto/fd.h
+++ b/include/proto/fd.h
@@ -31,7 +31,7 @@
#include <common/ticks.h>
#include <haproxy/time.h>
#include <types/fd.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
/* public variables */
diff --git a/src/activity.c b/src/activity.c
index 0732197..c0da3e8 100644
--- a/src/activity.c
+++ b/src/activity.c
@@ -14,7 +14,7 @@
#include <common/cfgparse.h>
#include <common/standard.h>
#include <haproxy/thread-t.h>
-#include <types/activity.h>
+#include <haproxy/activity-t.h>
#include <proto/channel.h>
#include <proto/cli.h>
#include <haproxy/freq_ctr.h>
diff --git a/src/cli.c b/src/cli.c
index 8084dfd..b9a2369 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -41,7 +41,7 @@
#include <types/dns.h>
#include <types/stats.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/backend.h>
#include <proto/channel.h>
#include <proto/checks.h>
diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index 8378383..4ddf8c5 100644
--- a/src/ev_epoll.c
+++ b/src/ev_epoll.c
@@ -22,7 +22,7 @@
#include <types/global.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/fd.h>
#include <proto/signal.h>
diff --git a/src/ev_evports.c b/src/ev_evports.c
index 359acf9..b65c18e 100644
--- a/src/ev_evports.c
+++ b/src/ev_evports.c
@@ -25,7 +25,7 @@
#include <types/global.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/fd.h>
#include <proto/log.h>
#include <proto/signal.h>
diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c
index efc2ecf..ee88020 100644
--- a/src/ev_kqueue.c
+++ b/src/ev_kqueue.c
@@ -24,7 +24,7 @@
#include <types/global.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/fd.h>
#include <proto/signal.h>
diff --git a/src/ev_poll.c b/src/ev_poll.c
index 7239732..0d0c147 100644
--- a/src/ev_poll.c
+++ b/src/ev_poll.c
@@ -24,7 +24,7 @@
#include <types/global.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/fd.h>
diff --git a/src/ev_select.c b/src/ev_select.c
index 9168f59..c1e3edf 100644
--- a/src/ev_select.c
+++ b/src/ev_select.c
@@ -21,7 +21,7 @@
#include <types/global.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/fd.h>
diff --git a/src/haproxy.c b/src/haproxy.c
index 40d31d7..99e8907 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -105,7 +105,7 @@
#include <types/peers.h>
#include <proto/acl.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/arg.h>
#include <proto/auth.h>
#include <proto/backend.h>
diff --git a/src/pool.c b/src/pool.c
index 3a4b34c..2ad2be6 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -23,7 +23,7 @@
#include <haproxy/list.h>
#include <common/standard.h>
-#include <types/activity.h>
+#include <haproxy/activity-t.h>
#include <proto/applet.h>
#include <proto/cli.h>
diff --git a/src/stream.c b/src/stream.c
index 955bc44..b6b2e14 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -30,7 +30,7 @@
#include <proto/acl.h>
#include <proto/action.h>
-#include <proto/activity.h>
+#include <haproxy/activity.h>
#include <proto/arg.h>
#include <proto/backend.h>
#include <proto/channel.h>