Skip to content

tracing: Remove "ftrace" from TRACE_EVENT files

Steven Rostedt lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest19 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/19tracing: Rename trace/ftrace.h to trace/trace_events.hinclude/trace/define_trace.h include/trace/ftrace.h include/trace/trace_events.h+860 -8600 replies
2/19tracing: Move the perf code out of trace_event.hinclude/trace/define_trace.h include/trace/perf.h include/trace/trace_events.h+351 -3510 replies
3/19tracing: Rename ftrace_event.h to trace_events.harch/x86/kvm/mmutrace.h arch/x86/kvm/svm.c arch/x86/kvm/vmx.c +12 more+630 -6300 replies
4/19tracing: Rename ftrace_print_*() functions ta trace_print_*()include/linux/trace_events.h include/trace/trace_events.h kernel/trace/trace_output.c+38 -380 replies
5/19tracing: Rename (un)register_ftrace_event() to (un)register_trace_event()include/linux/trace_events.h include/trace/perf.h kernel/trace/blktrace.c +7 more+29 -290 replies
6/19tracing: Rename ftrace_event_file to trace_event_fileinclude/linux/trace_events.h include/trace/perf.h kernel/trace/trace.c +8 more+169 -1690 replies
7/19tracing: Rename ftrace_event_{call,class} to trace_event_{call,class}include/linux/module.h include/linux/perf_event.h include/linux/syscalls.h +19 more+172 -1720 replies
8/19tracing: Rename ftrace_event_buffer to trace_event_buffer.include/linux/trace_events.h include/trace/perf.h kernel/trace/trace_events.c+13 -130 replies
9/19tracing: Rename ftrace_output functions to trace_outputinclude/linux/trace_events.h include/trace/perf.h include/trace/trace_events.h +1 more+20 -200 replies
10/19tracing: Rename FTRACE_MAX_EVENT to TRACE_EVENT_TYPE_MAXinclude/linux/trace_events.h kernel/trace/trace_output.c tools/perf/util/scripting-engines/trace-event-perl.c +1 more+7 -70 replies
11/19tracing: Rename ftrace_event_name() to trace_event_name()include/linux/trace_events.h kernel/trace/trace_events.c kernel/trace/trace_events_trigger.c +3 more+31 -310 replies
12/19tracing: Rename struct ftrace_subsystem_dir to trace_subsystem_dirinclude/linux/trace_events.h kernel/trace/trace.h kernel/trace/trace_events.c +1 more+22 -220 replies
13/19tracing: Rename FTRACE_EVENT_FL_* flags to EVENT_FILE_FL_*include/linux/trace_events.h include/trace/perf.h kernel/trace/trace.c +3 more+75 -750 replies
14/19tracing: Rename ftrace_trigger_soft_disabled() to trace_trigger_soft_disabled()include/linux/trace_events.h include/trace/perf.h kernel/trace/trace_kprobe.c +2 more+8 -80 replies
15/19tracing: Rename ftrace_raw_##call event structures to trace_event_raw_##callinclude/trace/perf.h include/trace/trace_events.h kernel/trace/trace_events_filter.c +1 more+17 -170 replies
16/19tracing: Rename ftrace_data_offset_##call to trace_event_data_offset_##callinclude/trace/perf.h include/trace/trace_events.h+6 -60 replies
17/19tracing: Rename ftrace_event_type_funcs_##call to trace_event_type_funcs_##callinclude/trace/perf.h include/trace/trace_events.h+4 -40 replies
18/19tracing: Rename ftrace_define_fields_##call() to trace_event_define_fields_##call()include/trace/perf.h include/trace/trace_events.h+3 -30 replies
19/19tracing: Rename ftrace_get_offsets_##call() to trace_event_get_offsets_##call()include/trace/perf.h include/trace/trace_events.h+4 -40 replies

Reviews trailers per patch

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

Read the v1 thread

Cover letter [for-next][PATCH 00/19] tracing: Remove "ftrace" from TRACE_EVENT files

As nobody seemed to respond to the RFC, I'm posting this for real. Before uploading, I'll do one more test against the latest linux-next to make sure it doesn't break anything. I tested it against linux-next before but things could have changed since.

-- Steve

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next

Head SHA1: d0ee8f4a1f5f3df933cdc9a80f5dea13e2fb5022

Steven Rostedt (Red Hat) (19):
tracing: Rename trace/ftrace.h to trace/trace_events.h
tracing: Move the perf code out of trace_event.h
tracing: Rename ftrace_event.h to trace_events.h
tracing: Rename ftrace_print_*() functions ta trace_print_*()
tracing: Rename (un)register_ftrace_event() to (un)register_trace_event()
tracing: Rename ftrace_event_file to trace_event_file
tracing: Rename ftrace_event_{call,class} to trace_event_{call,class}
tracing: Rename ftrace_event_buffer to trace_event_buffer.
tracing: Rename ftrace_output functions to trace_output
tracing: Rename FTRACE_MAX_EVENT to TRACE_EVENT_TYPE_MAX
tracing: Rename ftrace_event_name() to trace_event_name()
tracing: Rename struct ftrace_subsystem_dir to trace_subsystem_dir
tracing: Rename FTRACE_EVENT_FL_* flags to EVENT_FILE_FL_*
tracing: Rename ftrace_trigger_soft_disabled() to trace_trigger_soft_disabled()
tracing: Rename ftrace_raw_##call event structures to trace_event_raw_##call
tracing: Rename ftrace_data_offset_##call to trace_event_data_offset_##call
tracing: Rename ftrace_event_type_funcs_##call to trace_event_type_funcs_##call
tracing: Rename ftrace_define_fields_##call() to trace_event_define_fields_##call()
tracing: Rename ftrace_get_offsets_##call() to trace_event_get_offsets_##call()

----

 arch/x86/kvm/mmutrace.h                            |   2 +-
 arch/x86/kvm/svm.c                                 |   2 +-
 arch/x86/kvm/vmx.c                                 |   2 +-
 include/linux/ftrace_event.h                       | 616 ---------------
 include/linux/module.h                             |   2 +-
 include/linux/perf_event.h                         |   2 +-
 include/linux/syscalls.h                           |  12 +-
 include/linux/trace_events.h                       | 616 +++++++++++++++
 include/trace/define_trace.h                       |   3 +-
 include/trace/events/power.h                       |   2 +-
 include/trace/ftrace.h                             | 859 ---------------------
 include/trace/perf.h                               | 350 +++++++++
 include/trace/syscall.h                            |   6 +-
 include/trace/trace_events.h                       | 508 ++++++++++++
 kernel/events/core.c                               |   2 +-
 kernel/module.c                                    |   2 +-
 kernel/rcu/tiny.c                                  |   2 +-
 kernel/rcu/tree.c                                  |   2 +-
 kernel/trace/blktrace.c                            |   4 +-
 kernel/trace/ring_buffer.c                         |   2 +-
 kernel/trace/trace.c                               |  22 +-
 kernel/trace/trace.h                               |  42 +-
 kernel/trace/trace_branch.c                        |   4 +-
 kernel/trace/trace_event_perf.c                    |  20 +-
 kernel/trace/trace_events.c                        | 304 ++++----
 kernel/trace/trace_events_filter.c                 |  86 +--
 kernel/trace/trace_events_trigger.c                |  70 +-
 kernel/trace/trace_export.c                        |  10 +-
 kernel/trace/trace_functions_graph.c               |   8 +-
 kernel/trace/trace_kprobe.c                        |  70 +-
 kernel/trace/trace_mmiotrace.c                     |   4 +-
 kernel/trace/trace_output.c                        |  78 +-
 kernel/trace/trace_output.h                        |   2 +-
 kernel/trace/trace_probe.h                         |   8 +-
 kernel/trace/trace_sched_wakeup.c                  |   4 +-
 kernel/trace/trace_syscalls.c                      |  72 +-
 kernel/trace/trace_uprobe.c                        |  46 +-
 mm/debug.c                                         |   2 +-
 .../perf/util/scripting-engines/trace-event-perl.c |   4 +-
 .../util/scripting-engines/trace-event-python.c    |   4 +-
 40 files changed, 1928 insertions(+), 1928 deletions(-)