tracing, boottrace: Move include/trace/boot.h to include/linux/boottrace.h
Subsystems (5)
PATCH 1/2 tracing, boottrace: Move include/trace/boot.h to include/linux/boottrace.h
Impact: refactor code, no functionality changed
Files in include/trace/ should be definition of tracepoints, and header file for boot trace should put to include/linux/.
---
include/{trace/boot.h => linux/boottrace.h} | 0
init/main.c | 2 +-
kernel/trace/trace.h | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename include/{trace/boot.h => linux/boottrace.h} (100%)include/linux/boottrace.h renamed from include/trace/boot.h +0 -0
init/main.c +1 -1
@@ -66,7 +66,7 @@#include <linux/ftrace.h> #include <linux/async.h> #include <linux/kmemtrace.h> -#include <trace/boot.h> +#include <linux/boottrace.h> #include <asm/io.h> #include <asm/bugs.h>
kernel/trace/trace.h +1 -1
@@ -8,7 +8,7 @@#include <linux/ring_buffer.h> #include <linux/mmiotrace.h> #include <linux/ftrace.h> -#include <trace/boot.h> +#include <linux/boottrace.h> #include <linux/kmemtrace.h> #include <trace/power.h>
Signature · 1 line
1.5.5.3
PATCH 2/2 tracing, syscalltrace: Move include/trace/syscall.h to include/linux/syscalltrace.h
Impact: refactor code, no functionality changed
Files in include/trace/ should be definition of tracepoints, and header file for syscall trace should put to include/linux/.
---
arch/x86/kernel/ftrace.c | 3 +--
arch/x86/kernel/ptrace.c | 3 +--
include/linux/syscalls.h | 2 +-
include/{trace/syscall.h => linux/syscalltrace.h} | 0
kernel/trace/trace_syscalls.c | 2 +-
5 files changed, 4 insertions(+), 6 deletions(-)
rename include/{trace/syscall.h => linux/syscalltrace.h} (100%)arch/x86/kernel/ftrace.c +1 -2
@@ -17,8 +17,7 @@#include <linux/sched.h> #include <linux/init.h> #include <linux/list.h> - -#include <trace/syscall.h> +#include <linux/syscalltrace.h> #include <asm/cacheflush.h> #include <asm/ftrace.h>
arch/x86/kernel/ptrace.c +1 -2
@@ -22,6 +22,7 @@#include <linux/seccomp.h> #include <linux/signal.h> #include <linux/workqueue.h> +#include <linux/syscalltrace.h> #include <asm/uaccess.h> #include <asm/pgtable.h>
@@ -35,8 +36,6 @@#include <asm/proto.h> #include <asm/ds.h> -#include <trace/syscall.h> -#include "tls.h" enum x86_regset {
include/linux/syscalls.h +1 -1
@@ -66,7 +66,7 @@ struct perf_counter_hw_event;#include <asm/signal.h> #include <linux/quota.h> #include <linux/key.h> -#include <trace/syscall.h> +#include <linux/syscalltrace.h> #define __SC_DECL1 (t1, a1) t1 a1#define __SC_DECL2 (t2, a2, ...) t2 a2, __SC_DECL1(__VA_ARGS__)
include/linux/syscalltrace.h renamed from include/trace/syscall.h +0 -0
kernel/trace/trace_syscalls.c +1 -1
@@ -1,4 +1,4 @@ -#include <trace/syscall.h> +#include <linux/syscalltrace.h> #include <linux/kernel.h> #include <asm/syscall.h>
Signature · 1 line
1.5.5.3
Re: [PATCH 2/2] tracing, syscalltrace: Move include/trace/syscall.h to include/linux/syscalltrace.h
Quoted 7 lines · Zhaolei
Impact: refactor code, no functionality changed
Files in
include/trace/should be definition of tracepoints, and header file for syscall trace should put toinclude/linux/.Signed-off-by Zhao Lei <[email protected]>---
Same than for boot tracer change.
I'm fine with it if you prefer that the role of include/trace/* gains more strict limitations, but I would like to know the opinion of tracing maintainers.
Thanks,
Frederic.
Quoted 74 lines
arch/x86/kernel/ftrace.c | 3 +-- arch/x86/kernel/ptrace.c | 3 +-- include/linux/syscalls.h | 2 +- include/{trace/syscall.h => linux/syscalltrace.h} | 0 kernel/trace/trace_syscalls.c | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) rename include/{trace/syscall.h => linux/syscalltrace.h} (100%)arch/x86/kernel/ftrace.c +1
-2@@ -17,8 +17,7 @@#include <linux/sched.h> #include <linux/init.h> #include <linux/list.h> - -#include <trace/syscall.h> +#include <linux/syscalltrace.h> #include <asm/cacheflush.h> #include <asm/ftrace.h> arch/x86/kernel/ptrace.c +1
-2@@ -22,6 +22,7 @@#include <linux/seccomp.h> #include <linux/signal.h> #include <linux/workqueue.h> +#include <linux/syscalltrace.h> #include <asm/uaccess.h> #include <asm/pgtable.h> @@ -35,8 +36,6 @@#include <asm/proto.h> #include <asm/ds.h> -#include <trace/syscall.h> -#include "tls.h" enum x86_regset {include/linux/syscalls.h +1
-1@@ -66,7 +66,7 @@ struct perf_counter_hw_event;#include <asm/signal.h> #include <linux/quota.h> #include <linux/key.h> -#include <trace/syscall.h> +#include <linux/syscalltrace.h> #define __SC_DECL1 (t1, a1) t1 a1#define __SC_DECL2 (t2, a2, ...) t2 a2, __SC_DECL1(__VA_ARGS__)include/linux/syscalltrace.h renamed from include/trace/syscall.h +0
-0kernel/trace/trace_syscalls.c +1
-1@@ -1,4 +1,4 @@ -#include <trace/syscall.h> +#include <linux/syscalltrace.h> #include <linux/kernel.h> #include <asm/syscall.h> Signature · 1 line
1.5.5.3
Quoted 7 lines · Zhaolei
Impact: refactor code, no functionality changed
Files in
include/trace/should be definition of tracepoints, and header file for boot trace should put toinclude/linux/.Signed-off-by Zhao Lei <[email protected]>---
Until now I had the opinion that it's good to let every tracing headers to be placed in include/trace/* because they are not useful for anything else than the tracer itself so that we don't encumber include/linux for private things.
So that we have both tracepoints/trace_events plus the low-level tracers headers in include/trace/*
I'm not opposite to this change, but seeing this patch and the recent divide of kmemtrace headers, I would like to know the opinion of Ingo and Steven about the strict role of include/trace/*
Is it only for tracepoints-like bits, or oslo intended for every private tracing purposes?
Thanks.
Quoted 40 lines
include/{trace/boot.h => linux/boottrace.h} | 0 init/main.c | 2 +- kernel/trace/trace.h | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename include/{trace/boot.h => linux/boottrace.h} (100%)include/linux/boottrace.h renamed from include/trace/boot.h +0
-0init/main.c +1
-1@@ -66,7 +66,7 @@#include <linux/ftrace.h> #include <linux/async.h> #include <linux/kmemtrace.h> -#include <trace/boot.h> +#include <linux/boottrace.h> #include <asm/io.h> #include <asm/bugs.h> kernel/trace/trace.h +1
-1@@ -8,7 +8,7 @@#include <linux/ring_buffer.h> #include <linux/mmiotrace.h> #include <linux/ftrace.h> -#include <trace/boot.h> +#include <linux/boottrace.h> #include <linux/kmemtrace.h> #include <trace/power.h> Signature · 1 line
1.5.5.3
Quoted 14 lines · Frederic Weisbecker
Quoted 7 lines · Zhaolei
Impact: refactor code, no functionality changed
Files in
include/trace/should be definition of tracepoints, and header file for boot trace should put toinclude/linux/.Signed-off-by Zhao Lei <[email protected]>---
Until now I had the opinion that it's good to let every tracing headers to be placed in
include/trace/*because they are not useful for anything else than the tracer itself so that we don't encumberinclude/linuxfor private things.
Quoted 8 lines
So that we have both tracepoints/trace_events plus the low-level tracers headers in
include/trace/*I'm not opposite to this change, but seeing this patch and the recent divide of kmemtrace headers, I would like to know the opinion of Ingo and Steven about the strict role of
include/trace/*Is it only for tracepoints-like bits, or oslo intended for every private tracing purposes?
The header split itself is probably good to do - to keep the 'pure' portions of tracepoint definitions cleanly separated from more functional details like kmem tracer initialization.
The move to include/linux/ is indeed more debatable. I think if a header says 'footrace.h' in its name, it could easily be in include/trace/foo.h instead? Makes for a tidier structure - include/linux/ is massively over-crowded already.
Steve, what do you think?
Ingo
Steven Rostedt
maintainerQuoted 30 lines · Ingo Molnar
Quoted 14 lines · Frederic Weisbecker
Quoted 7 lines · Zhaolei
Impact: refactor code, no functionality changed
Files in
include/trace/should be definition of tracepoints, and header file for boot trace should put toinclude/linux/.Signed-off-by Zhao Lei <[email protected]>---
Until now I had the opinion that it's good to let every tracing headers to be placed in
include/trace/*because they are not useful for anything else than the tracer itself so that we don't encumberinclude/linuxfor private things.Quoted 8 lines
So that we have both tracepoints/trace_events plus the low-level tracers headers in
include/trace/*I'm not opposite to this change, but seeing this patch and the recent divide of kmemtrace headers, I would like to know the opinion of Ingo and Steven about the strict role of
include/trace/*Is it only for tracepoints-like bits, or oslo intended for every private tracing purposes?The header split itself is probably good to do - to keep the 'pure' portions of tracepoint definitions cleanly separated from more functional details like kmem tracer initialization.
Quoted 6 lines
The move to
include/linux/is indeed more debatable. I think if a header says 'footrace.h' in its name, it could easily be ininclude/trace/foo.hinstead? Makes for a tidier structure -include/linux/is massively over-crowded already.Steve, what do you think?
We actually discussed this a little at the Linux Collaboration Summit. The idea was to keep only the tracepoints aka TRACE_EVENT code in include/trace/ and perhaps special headers that work with the TRACE_EVENT macros. But the infrastructure of the tracers would stay in include/linux.
The rational is that we have a separate directory reserved only for trace points / trace events. Adding more headers into that directory would make it a bit harder to see right away what trace events where defined for a particular kernel source.
I'm getting ready to post my code to allow trace events for modules, and it cleans up this directory a little.
-- Steve
Quoted 46 lines · Steven Rostedt
Quoted 30 lines · Ingo Molnar
Quoted 14 lines · Frederic Weisbecker
Quoted 7 lines · Zhaolei
Impact: refactor code, no functionality changed
Files in
include/trace/should be definition of tracepoints, and header file for boot trace should put toinclude/linux/.Signed-off-by Zhao Lei <[email protected]>---
Until now I had the opinion that it's good to let every tracing headers to be placed in
include/trace/*because they are not useful for anything else than the tracer itself so that we don't encumberinclude/linuxfor private things.Quoted 8 lines
So that we have both tracepoints/trace_events plus the low-level tracers headers in
include/trace/*I'm not opposite to this change, but seeing this patch and the recent divide of kmemtrace headers, I would like to know the opinion of Ingo and Steven about the strict role of
include/trace/*Is it only for tracepoints-like bits, or oslo intended for every private tracing purposes?The header split itself is probably good to do - to keep the 'pure' portions of tracepoint definitions cleanly separated from more functional details like kmem tracer initialization.
Quoted 6 lines
The move to
include/linux/is indeed more debatable. I think if a header says 'footrace.h' in its name, it could easily be ininclude/trace/foo.hinstead? Makes for a tidier structure -include/linux/is massively over-crowded already.Steve, what do you think?
We actually discussed this a little at the Linux Collaboration Summit. The idea was to keep only the tracepoints aka
TRACE_EVENTcode ininclude/trace/and perhaps special headers that work with theTRACE_EVENTmacros. But the infrastructure of the tracers would stay ininclude/linux.
Quoted 4 lines
The rational is that we have a separate directory reserved only for trace points / trace events. Adding more headers into that directory would make it a bit harder to see right away what trace events where defined for a particular kernel source.
Hm, i have to say that is true committee design ;-)
The sane thing would be to put event headers into include/trace/events/ and put more generic/utility headers into include/trace/.
Reserving a full subdirectory for one singular purpose is a needless waste of a nice (and unique) name-space resource.
Ingo
Steven Rostedt
maintainerQuoted 7 lines · Ingo Molnar
The sane thing would be to put event headers into
include/trace/events/and put more generic/utility headers intoinclude/trace/.Reserving a full subdirectory for one singular purpose is a needless waste of a nice (and unique) name-space resource.
That's fine with me too. I just want the trace points to be easily seen. But by making a sub directory, wont we need to have all users of tracepoints do something like:
#include <trace/events/sched.h>
That might be fine too.
-- Steve
Quoted 9 lines · Steven Rostedt
Quoted 7 lines · Ingo Molnar
The sane thing would be to put event headers into
include/trace/events/and put more generic/utility headers intoinclude/trace/.Reserving a full subdirectory for one singular purpose is a needless waste of a nice (and unique) name-space resource.
Quoted 7 lines
That's fine with me too. I just want the trace points to be easily seen. But by making a sub directory, wont we need to have all users of tracepoints do something like:
#include <
trace/events/sched.h>That might be fine too.
Yes - it would allow the dropping of the annoyingly repetitive _event string from those definition files as well?
Ingo
Steven Rostedt
maintainerQuoted 16 lines · Ingo Molnar
Quoted 13 lines · Steven Rostedt
Quoted 7 lines · Ingo Molnar
The sane thing would be to put event headers into
include/trace/events/and put more generic/utility headers intoinclude/trace/.Reserving a full subdirectory for one singular purpose is a needless waste of a nice (and unique) name-space resource.
That's fine with me too. I just want the trace points to be easily seen. But by making a sub directory, wont we need to have all users of tracepoints do something like:
Quoted 6 lines
Quoted 3 lines
#include <
trace/events/sched.h>That might be fine too.
Yes - it would allow the dropping of the annoyingly repetitive
_eventstring from those definition files as well?
The coming patches for modules already does that ;-)
-- Steve
Quoted 8 lines · Steven Rostedt
Quoted 6 lines
Quoted 3 lines
#include <
trace/events/sched.h>That might be fine too.
Yes - it would allow the dropping of the annoyingly repetitive
_eventstring from those definition files as well?The coming patches for modules already does that ;-)
Cool. Cannot wait! :-)
Ingo