Skip to content

tracing: Clean up trace.c and move some code into other files

Steven Rostedt linux-trace-kernel lkml 2 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest10 patches 0 repliesNew
  2. v112 patches 1 replySuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/10tracing: Make tracing_disabled global for tracing systemkernel/trace/trace.c kernel/trace/trace.h kernel/trace/trace_events.c +1 more+8 -120 replies
2/10tracing: Make tracing_selftest_running global to the tracing subsystemkernel/trace/trace.c kernel/trace/trace.h+3 -20 replies
3/10tracing: Move __trace_buffer_{un}lock_*() functions to trace.hkernel/trace/trace.c kernel/trace/trace.h+41 -420 replies
4/10tracing: Move ftrace_trace_stack() out of trace.c and into trace.hkernel/trace/trace.c kernel/trace/trace.h+35 -410 replies
5/10tracing: Make printk_trace global for tracing systemkernel/trace/trace.c kernel/trace/trace.h+3 -10 replies
6/10tracing: Make tracing_update_buffers() take NULL for global_tracekernel/trace/trace.c+4 -10 replies
7/10tracing: Have trace_printk functions use flags instead of using global_tracekernel/trace/trace.c+5 -40 replies
8/10tracing: Use system_state in trace_printk_init_buffers()kernel/trace/trace.c+2 -30 replies
9/10tracing: Move trace_printk functions out of trace.c and into trace_printk.ckernel/trace/trace.c kernel/trace/trace.h kernel/trace/trace_printk.c+432 -4310 replies
10/10tracing: Move pid filtering into trace_pid.ckernel/trace/Makefile kernel/trace/trace.c kernel/trace/trace_pid.c+247 -2420 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 00/10] tracing: Clean up trace.c and move some code into other files

The trace.c file was a dumping ground for most tracing code. Start organizing it better by moving various functions out into their own files.

The trace.c file is almost 12000 lines in size, this is an effort to bring that number down.

- Move some generic always_inline functions into trace.h

- Move the trace_printk functions into the existing trace_printk.c file. This also required some clean up of the code.

- Move the pid filtering code into a new file: trace_pid.c.

This is mostly a non-functional change. But due to some clean ups, there is still slightly some functional changes (but for the better).

This will also cause some existing code being worked on to conflict, but I'll handle that.

Changes since v1: https://lore.kernel.org/linux-trace-kernel/[email protected]/

- These patches did not change, but the snapshot code movement was removed.

- This version has been tested more, but still needs more testing.

Steven Rostedt (10):
tracing: Make tracing_disabled global for tracing system
tracing: Make tracing_selftest_running global to the tracing subsystem
tracing: Move __trace_buffer_{un}lock_*() functions to trace.h
tracing: Move ftrace_trace_stack() out of trace.c and into trace.h
tracing: Make printk_trace global for tracing system
tracing: Make tracing_update_buffers() take NULL for global_trace
tracing: Have trace_printk functions use flags instead of using global_trace
tracing: Use system_state in trace_printk_init_buffers()
tracing: Move trace_printk functions out of trace.c and into trace_printk.c
tracing: Move pid filtering into trace_pid.c

----

 kernel/trace/Makefile       |   1 +
 kernel/trace/trace.c        | 779 +-------------------------------------------
 kernel/trace/trace.h        |  80 ++++-
 kernel/trace/trace_events.c |   2 +-
 kernel/trace/trace_kprobe.c |   2 +-
 kernel/trace/trace_pid.c    | 246 ++++++++++++++
 kernel/trace/trace_printk.c | 431 ++++++++++++++++++++++++
 7 files changed, 771 insertions(+), 770 deletions(-)
 create mode 100644 kernel/trace/trace_pid.c