aboutsummaryrefslogtreecommitdiffstats
path: root/tools/lib/traceevent/plugin_hrtimer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-08-26 14:25:21 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-26 14:25:21 -0400
commitd207ea8e74ff45be0838afa12bdd2492fa9dc8bc (patch)
tree97cfb3ed5c1bb42790e98e62b823526f61000b9f /tools/lib/traceevent/plugin_hrtimer.c
parent2a8a2b7c49d6eb5f3348892c4676267376cfd40b (diff)
parent66e5db4a1ccc64f278653bc69dc406d184dc750a (diff)
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf updates from Thomas Gleixner: "Kernel: - Improve kallsyms coverage - Add x86 entry trampolines to kcore - Fix ARM SPE handling - Correct PPC event post processing Tools: - Make the build system more robust - Small fixes and enhancements all over the place - Update kernel ABI header copies - Preparatory work for converting libtraceevnt to a shared library - License cleanups" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (100 commits) tools arch: Update arch/x86/lib/memcpy_64.S copy used in 'perf bench mem memcpy' tools arch x86: Update tools's copy of cpufeatures.h perf python: Fix pyrf_evlist__read_on_cpu() interface perf mmap: Store real cpu number in 'struct perf_mmap' perf tools: Remove ext from struct kmod_path perf tools: Add gzip_is_compressed function perf tools: Add lzma_is_compressed function perf tools: Add is_compressed callback to compressions array perf tools: Move the temp file processing into decompress_kmodule perf tools: Use compression id in decompress_kmodule() perf tools: Store compression id into struct dso perf tools: Add compression id into 'struct kmod_path' perf tools: Make is_supported_compression() static perf tools: Make decompress_to_file() function static perf tools: Get rid of dso__needs_decompress() call in __open_dso() perf tools: Get rid of dso__needs_decompress() call in symbol__disassemble() perf tools: Get rid of dso__needs_decompress() call in read_object_code() tools lib traceevent: Change to SPDX License format perf llvm: Allow passing options to llc in addition to clang perf parser: Improve error message for PMU address filters ...
Diffstat (limited to 'tools/lib/traceevent/plugin_hrtimer.c')
-rw-r--r--tools/lib/traceevent/plugin_hrtimer.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/tools/lib/traceevent/plugin_hrtimer.c b/tools/lib/traceevent/plugin_hrtimer.c
index 12bf14cc1152..b43bfec565d8 100644
--- a/tools/lib/traceevent/plugin_hrtimer.c
+++ b/tools/lib/traceevent/plugin_hrtimer.c
@@ -25,64 +25,64 @@
25#include "event-parse.h" 25#include "event-parse.h"
26 26
27static int timer_expire_handler(struct trace_seq *s, 27static int timer_expire_handler(struct trace_seq *s,
28 struct pevent_record *record, 28 struct tep_record *record,
29 struct event_format *event, void *context) 29 struct event_format *event, void *context)
30{ 30{
31 trace_seq_printf(s, "hrtimer="); 31 trace_seq_printf(s, "hrtimer=");
32 32
33 if (pevent_print_num_field(s, "0x%llx", event, "timer", 33 if (tep_print_num_field(s, "0x%llx", event, "timer",
34 record, 0) == -1) 34 record, 0) == -1)
35 pevent_print_num_field(s, "0x%llx", event, "hrtimer", 35 tep_print_num_field(s, "0x%llx", event, "hrtimer",
36 record, 1); 36 record, 1);
37 37
38 trace_seq_printf(s, " now="); 38 trace_seq_printf(s, " now=");
39 39
40 pevent_print_num_field(s, "%llu", event, "now", record, 1); 40 tep_print_num_field(s, "%llu", event, "now", record, 1);
41 41
42 pevent_print_func_field(s, " function=%s", event, "function", 42 tep_print_func_field(s, " function=%s", event, "function",
43 record, 0); 43 record, 0);
44 return 0; 44 return 0;
45} 45}
46 46
47static int timer_start_handler(struct trace_seq *s, 47static int timer_start_handler(struct trace_seq *s,
48 struct pevent_record *record, 48 struct tep_record *record,
49 struct event_format *event, void *context) 49 struct event_format *event, void *context)
50{ 50{
51 trace_seq_printf(s, "hrtimer="); 51 trace_seq_printf(s, "hrtimer=");
52 52
53 if (pevent_print_num_field(s, "0x%llx", event, "timer", 53 if (tep_print_num_field(s, "0x%llx", event, "timer",
54 record, 0) == -1) 54 record, 0) == -1)
55 pevent_print_num_field(s, "0x%llx", event, "hrtimer", 55 tep_print_num_field(s, "0x%llx", event, "hrtimer",
56 record, 1); 56 record, 1);
57 57
58 pevent_print_func_field(s, " function=%s", event, "function", 58 tep_print_func_field(s, " function=%s", event, "function",
59 record, 0); 59 record, 0);
60 60
61 trace_seq_printf(s, " expires="); 61 trace_seq_printf(s, " expires=");
62 pevent_print_num_field(s, "%llu", event, "expires", record, 1); 62 tep_print_num_field(s, "%llu", event, "expires", record, 1);
63 63
64 trace_seq_printf(s, " softexpires="); 64 trace_seq_printf(s, " softexpires=");
65 pevent_print_num_field(s, "%llu", event, "softexpires", record, 1); 65 tep_print_num_field(s, "%llu", event, "softexpires", record, 1);
66 return 0; 66 return 0;
67} 67}
68 68
69int PEVENT_PLUGIN_LOADER(struct pevent *pevent) 69int TEP_PLUGIN_LOADER(struct tep_handle *pevent)
70{ 70{
71 pevent_register_event_handler(pevent, -1, 71 tep_register_event_handler(pevent, -1,
72 "timer", "hrtimer_expire_entry", 72 "timer", "hrtimer_expire_entry",
73 timer_expire_handler, NULL); 73 timer_expire_handler, NULL);
74 74
75 pevent_register_event_handler(pevent, -1, "timer", "hrtimer_start", 75 tep_register_event_handler(pevent, -1, "timer", "hrtimer_start",
76 timer_start_handler, NULL); 76 timer_start_handler, NULL);
77 return 0; 77 return 0;
78} 78}
79 79
80void PEVENT_PLUGIN_UNLOADER(struct pevent *pevent) 80void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent)
81{ 81{
82 pevent_unregister_event_handler(pevent, -1, 82 tep_unregister_event_handler(pevent, -1,
83 "timer", "hrtimer_expire_entry", 83 "timer", "hrtimer_expire_entry",
84 timer_expire_handler, NULL); 84 timer_expire_handler, NULL);
85 85
86 pevent_unregister_event_handler(pevent, -1, "timer", "hrtimer_start", 86 tep_unregister_event_handler(pevent, -1, "timer", "hrtimer_start",
87 timer_start_handler, NULL); 87 timer_start_handler, NULL);
88} 88}