perf: Add PERF_RECORD_SWITCH to indicate context switches
Adrian Hunter
reviewerv4 cover perf: Add PERF_RECORD_SWITCH to indicate context switches
Hi
Here is V4 of PERF_RECORD_SWITCH.
Changes in V4:
perf: Add PERF_RECORD_SWITCH to indicate context switches
Use a separate record format PERF_RECORD_SWITCH_CPU_WIDE for the CPU-wide case that includes the next/previous pid/tid
perf tools: Add new PERF_RECORD_SWITCH event
Amended to handle PERF_RECORD_SWITCH_CPU_WIDE
perf record: Add option --switch-events to select PERF_RECORD_SWITCH events
Add PERF_RECORD_SWITCH_CPU_WIDE to documentation
perf script: Don't assume evsel position of tracking events
New patch
perf script: Add option --show-switch-events
Add PERF_RECORD_SWITCH_CPU_WIDE to documentation
Changes in V3:
Rename 'perf_event_switch()' parameter 'out' to be 'sched_in' and invert meaning.
Changes in V2 (RFC):
The event now shows scheduling in and out, and I added next/prev pid/tid for cpu-wide contexts, plus there are some tools patches that apply to Arnaldo's perf/core branch.
Adrian Hunter (5):
perf: Add PERF_RECORD_SWITCH to indicate context switches
perf tools: Add new PERF_RECORD_SWITCH event
perf record: Add option --switch-events to select PERF_RECORD_SWITCH events perf script: Don't assume evsel position of tracking events perf script: Add option --show-switch-events
include/uapi/linux/perf_event.h | 31 +++++++++- kernel/events/core.c | 103 +++++++++++++++++++++++++++++++ tools/perf/Documentation/perf-record.txt | 4 ++ tools/perf/Documentation/perf-script.txt | 4 ++ tools/perf/builtin-inject.c | 1 + tools/perf/builtin-record.c | 7 +++ tools/perf/builtin-script.c | 41 ++++++++++-- tools/perf/perf.h | 1 + tools/perf/util/event.c | 28 +++++++++ tools/perf/util/event.h | 12 ++++ tools/perf/util/evlist.h | 1 + tools/perf/util/evsel.c | 4 ++ tools/perf/util/machine.c | 11 ++++ tools/perf/util/machine.h | 2 + tools/perf/util/record.c | 10 +++ tools/perf/util/session.c | 20 ++++++ tools/perf/util/tool.h | 1 + 17 files changed, 275 insertions(+), 6 deletions(-)
Regards
Adrian
Adrian Hunter
reviewerPATCH v4 1/5 perf: Add PERF_RECORD_SWITCH to indicate context switches
There are already two events for context switches, namely the tracepoint sched:sched_switch and the software event context_switches. Unfortunately neither are suitable for use by non-privileged users for the purpose of synchronizing hardware trace data (e.g. Intel PT) to the context switch.
Tracepoints are no good at all for non-privileged users because they need either CAP_SYS_ADMIN or /proc/sys/kernel/perf_event_paranoid <= -1.
On the other hand, kernel software events need either CAP_SYS_ADMIN or /proc/sys/kernel/perf_event_paranoid <= 1.
Now many distributions do default perf_event_paranoid to 1 making context_switches a contender, except it has another problem (which is also shared with sched:sched_switch) which is that it happens before perf schedules events out instead of after perf schedules events in. Whereas a privileged user can see all the events anyway, a non-privileged user only sees events for their own processes, in other words they see when their process was scheduled out not when it was scheduled in. That presents two problems to use the event: 1. the information comes too late, so tools have to look ahead in the event stream to find out what the current state is 2. if they are unlucky tracing might have stopped before the context-switches event is recorded.
This new PERF_RECORD_SWITCH event does not have those problems and it also has a couple of other small advantages. It is easier to use because it is an auxiliary event (like mmap, comm and task events) which can be enabled by setting a single bit. It is smaller than sched:sched_switch and easier to parse.
To make the event useful for privileged users also, if the context is cpu-wide then the event record will be PERF_RECORD_SWITCH_CPU_WIDE which is the same as PERF_RECORD_SWITCH except it also provides the next or previous pid/tid.
--- include/uapi/linux/perf_event.h | 31 +++++++++++- kernel/events/core.c | 103 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 1 deletion(-)
include/uapi/linux/perf_event.h +30 -1
@@ -330,7 +330,8 @@ struct perf_event_attr { mmap2 : 1, /* include mmap with inode data */ comm_exec : 1, /* flag comm events that are due to an exec */ use_clockid : 1, /* use @clockid for time fields */ - __reserved_1 : 38; + context_switch : 1, /* context switch data */ + __reserved_1 : 37;union {__u32 wakeup_events;/* wakeup every n events */
@@ -572,9 +573,11 @@ struct perf_event_mmap_page {/* * PERF_RECORD_MISC_MMAP_DATA and PERF_RECORD_MISC_COMM_EXEC are used on * different events so can reuse the same bit position. +* Ditto PERF_RECORD_MISC_SWITCH_OUT. */ #define PERF_RECORD_MISC_MMAP_DATA (1 << 13)#define PERF_RECORD_MISC_COMM_EXEC (1 << 13) +#define PERF_RECORD_MISC_SWITCH_OUT (1 << 13)/* * Indicates that the content of PERF_SAMPLE_IP points to * the actual instruction that triggered the event. See also
@@ -818,6 +821,32 @@ enum perf_event_type {*/ PERF_RECORD_LOST_SAMPLES =13 , +/* +* Records a context switch in or out (flagged by +* PERF_RECORD_MISC_SWITCH_OUT). See also +* PERF_RECORD_SWITCH_CPU_WIDE. +* +* struct { +* struct perf_event_header header; +* struct sample_id sample_id; +* }; +*/ +PERF_RECORD_SWITCH =14 , + +/* +* CPU-wide version of PERF_RECORD_SWITCH with next_prev_pid and +* next_prev_tid that are the next (switching out) or previous +* (switching in) pid/tid. +* +* struct { +* struct perf_event_header header; +* u32 next_prev_pid; +* u32 next_prev_tid; +* struct sample_id sample_id; +* }; +*/ +PERF_RECORD_SWITCH_CPU_WIDE =15 , + PERF_RECORD_MAX, /* non-ABI */ };
kernel/events/core.c +103 -0
145 lines not on this page · raw message
Signature · 1 line
1.9.1
Quoted 33 lines · Adrian Hunter
There are already two events for context switches, namely the tracepoint sched:sched_switch and the software event
context_switches. Unfortunately neither are suitable for use by non-privileged users for the purpose of synchronizing hardware trace data (e.g. Intel PT) to the context switch.Tracepoints are no good at all for non-privileged users because they need either
CAP_SYS_ADMINor/proc/sys/kernel/perf_event_paranoid<= -1.On the other hand, kernel software events need either
CAP_SYS_ADMINor/proc/sys/kernel/perf_event_paranoid<= 1.Now many distributions do default
perf_event_paranoidto 1 makingcontext_switchesa contender, except it has another problem (which is also shared with sched:sched_switch) which is that it happens before perf schedules events out instead of after perf schedules events in. Whereas a privileged user can see all the events anyway, a non-privileged user only sees events for their own processes, in other words they see when their process was scheduled out not when it was scheduled in. That presents two problems to use the event: 1. the information comes too late, so tools have to look ahead in the event stream to find out what the current state is 2. if they are unlucky tracing might have stopped before the context-switches event is recorded.This new
PERF_RECORD_SWITCHevent does not have those problems and it also has a couple of other small advantages. It is easier to use because it is an auxiliary event (like mmap, comm and task events) which can be enabled by setting a single bit. It is smaller than sched:sched_switch and easier to parse.
Quoted 7 lines
To make the event useful for privileged users also, if the context is cpu-wide then the event record will be
PERF_RECORD_SWITCH_CPU_WIDEwhich is the same asPERF_RECORD_SWITCHexcept it also provides the next or previous pid/tid.Signed-off-by Adrian Hunter <[email protected]>
Acme, if you agree with the tools part, feel free to take the lot.
Arnaldo Carvalho de Melo
maintainerEm Tue, Jul 21, 2015 at 12:29:55PM +0200, Peter Zijlstra escreveu:
Quoted 40 lines · Adrian Hunter
Quoted 39 lines
There are already two events for context switches, namely the tracepoint sched:sched_switch and the software event
context_switches. Unfortunately neither are suitable for use by non-privileged users for the purpose of synchronizing hardware trace data (e.g. Intel PT) to the context switch.Tracepoints are no good at all for non-privileged users because they need either
CAP_SYS_ADMINor/proc/sys/kernel/perf_event_paranoid<= -1.On the other hand, kernel software events need either
CAP_SYS_ADMINor/proc/sys/kernel/perf_event_paranoid<= 1.Now many distributions do default
perf_event_paranoidto 1 makingcontext_switchesa contender, except it has another problem (which is also shared with sched:sched_switch) which is that it happens before perf schedules events out instead of after perf schedules events in. Whereas a privileged user can see all the events anyway, a non-privileged user only sees events for their own processes, in other words they see when their process was scheduled out not when it was scheduled in. That presents two problems to use the event: 1. the information comes too late, so tools have to look ahead in the event stream to find out what the current state is 2. if they are unlucky tracing might have stopped before the context-switches event is recorded.This new
PERF_RECORD_SWITCHevent does not have those problems and it also has a couple of other small advantages. It is easier to use because it is an auxiliary event (like mmap, comm and task events) which can be enabled by setting a single bit. It is smaller than sched:sched_switch and easier to parse.To make the event useful for privileged users also, if the context is cpu-wide then the event record will be
PERF_RECORD_SWITCH_CPU_WIDEwhich is the same asPERF_RECORD_SWITCHexcept it also provides the next or previous pid/tid.
Quoted 3 lines
Quoted 1 line
Signed-off-by Adrian Hunter <[email protected]>Acme, if you agree with the tools part, feel free to take the lot.
Looking at it, if all is well, I'll do it
Quoted 1 line
Arnaldo Carvalho de Melo
maintainerEm Tue, Jul 21, 2015 at 02:54:54PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 7 lines
Em Tue, Jul 21, 2015 at 12:29:55PM +0200, Peter Zijlstra escreveu:
Quoted 1 line
Acme, if you agree with the tools part, feel free to take the lot.
Looking at it, if all is well, I'll do it
Quoted 1 line
All seems ok, building a kernel to test it all, patch by patch, will be on my next pull req to Ingo for perf/core.
Thanks,
- Arnaldo
Quoted 11 lines · Arnaldo Carvalho de Melo
Em Tue, Jul 21, 2015 at 02:54:54PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 7 lines
Em Tue, Jul 21, 2015 at 12:29:55PM +0200, Peter Zijlstra escreveu:
Quoted 1 line
Acme, if you agree with the tools part, feel free to take the lot.
Looking at it, if all is well, I'll do it
Quoted 1 line
All seems ok, building a kernel to test it all, patch by patch, will be on my next pull req to Ingo for perf/core.
tested, looks ok
jirka
tip-bot for Adrian Hunter
merge botperf: Add PERF_RECORD_SWITCH to indicate context switches
Commit-ID: 45ac1403f564f411c6a383a2448688ba8dd705a4 Gitweb: http://git.kernel.org/tip/45ac1403f564f411c6a383a2448688ba8dd705a4 Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 21 Jul 2015 12:44:02 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 23 Jul 2015 22:51:12 -0300
perf: Add PERF_RECORD_SWITCH to indicate context switches
There are already two events for context switches, namely the tracepoint sched:sched_switch and the software event context_switches. Unfortunately neither are suitable for use by non-privileged users for the purpose of synchronizing hardware trace data (e.g. Intel PT) to the context switch.
Tracepoints are no good at all for non-privileged users because they need either CAP_SYS_ADMIN or /proc/sys/kernel/perf_event_paranoid <= -1.
On the other hand, kernel software events need either CAP_SYS_ADMIN or /proc/sys/kernel/perf_event_paranoid <= 1.
Now many distributions do default perf_event_paranoid to 1 making context_switches a contender, except it has another problem (which is also shared with sched:sched_switch) which is that it happens before perf schedules events out instead of after perf schedules events in. Whereas a privileged user can see all the events anyway, a non-privileged user only sees events for their own processes, in other words they see when their process was scheduled out not when it was scheduled in. That presents two problems to use the event:
1. the information comes too late, so tools have to look ahead in the event stream to find out what the current state is
2. if they are unlucky tracing might have stopped before the context-switches event is recorded.
This new PERF_RECORD_SWITCH event does not have those problems and it also has a couple of other small advantages.
It is easier to use because it is an auxiliary event (like mmap, comm and task events) which can be enabled by setting a single bit. It is smaller than sched:sched_switch and easier to parse.
To make the event useful for privileged users also, if the context is cpu-wide then the event record will be PERF_RECORD_SWITCH_CPU_WIDE which is the same as PERF_RECORD_SWITCH except it also provides the next or previous pid/tid.
--- include/uapi/linux/perf_event.h | 31 +++++++++++- kernel/events/core.c | 103 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 1 deletion(-)
include/uapi/linux/perf_event.h +30 -1
@@ -330,7 +330,8 @@ struct perf_event_attr { mmap2 : 1, /* include mmap with inode data */ comm_exec : 1, /* flag comm events that are due to an exec */ use_clockid : 1, /* use @clockid for time fields */ - __reserved_1 : 38; + context_switch : 1, /* context switch data */ + __reserved_1 : 37;union {__u32 wakeup_events;/* wakeup every n events */
@@ -572,9 +573,11 @@ struct perf_event_mmap_page {/* * PERF_RECORD_MISC_MMAP_DATA and PERF_RECORD_MISC_COMM_EXEC are used on * different events so can reuse the same bit position. +* Ditto PERF_RECORD_MISC_SWITCH_OUT. */ #define PERF_RECORD_MISC_MMAP_DATA (1 << 13)#define PERF_RECORD_MISC_COMM_EXEC (1 << 13) +#define PERF_RECORD_MISC_SWITCH_OUT (1 << 13)/* * Indicates that the content of PERF_SAMPLE_IP points to * the actual instruction that triggered the event. See also
@@ -818,6 +821,32 @@ enum perf_event_type {*/ PERF_RECORD_LOST_SAMPLES =13 , +/* +* Records a context switch in or out (flagged by +* PERF_RECORD_MISC_SWITCH_OUT). See also +* PERF_RECORD_SWITCH_CPU_WIDE. +* +* struct { +* struct perf_event_header header; +* struct sample_id sample_id; +* }; +*/ +PERF_RECORD_SWITCH =14 , + +/* +* CPU-wide version of PERF_RECORD_SWITCH with next_prev_pid and +* next_prev_tid that are the next (switching out) or previous +* (switching in) pid/tid. +* +* struct { +* struct perf_event_header header; +* u32 next_prev_pid; +* u32 next_prev_tid; +* struct sample_id sample_id; +* }; +*/ +PERF_RECORD_SWITCH_CPU_WIDE =15 , + PERF_RECORD_MAX, /* non-ABI */ };
kernel/events/core.c +103 -0
145 lines not on this page · raw message
Adrian Hunter
reviewerPATCH v4 2/5 perf tools: Add new PERF_RECORD_SWITCH event
In reply to Adrian HunterSupport processing of PERF_RECORD_SWITCH events and PERF_RECORD_SWITCH_CPU_WIDE events. There is a single tools callback for them both so that the tool must check the event type before using the extra members in PERF_RECORD_SWITCH_CPU_WIDE.
There is still no way to select the events, though. That is added in a subsequest patch.
--- tools/perf/builtin-inject.c | 1 + tools/perf/util/event.c | 28 ++++++++++++++++++++++++++++ tools/perf/util/event.h | 12 ++++++++++++ tools/perf/util/evsel.c | 1 + tools/perf/util/machine.c | 11 +++++++++++ tools/perf/util/machine.h | 2 ++ tools/perf/util/session.c | 20 ++++++++++++++++++++ tools/perf/util/tool.h | 1 + 8 files changed, 76 insertions(+)
tools/perf/builtin-inject.c +1 -0
@@ -561,6 +561,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) .lost = perf_event__repipe, .aux = perf_event__repipe, .itrace_start = perf_event__repipe, + .context_switch = perf_event__repipe, .read = perf_event__repipe_sample, .throttle = perf_event__repipe, .unthrottle = perf_event__repipe,
tools/perf/util/event.c +28 -0
@@ -26,6 +26,8 @@ static const char *perf_event__names[] = { [PERF_RECORD_AUX] = "AUX", [PERF_RECORD_ITRACE_START] = "ITRACE_START", [PERF_RECORD_LOST_SAMPLES] = "LOST_SAMPLES", + [PERF_RECORD_SWITCH] = "SWITCH", + [PERF_RECORD_SWITCH_CPU_WIDE] = "SWITCH_CPU_WIDE", [PERF_RECORD_HEADER_ATTR] = "ATTR", [PERF_RECORD_HEADER_EVENT_TYPE] = "EVENT_TYPE", [PERF_RECORD_HEADER_TRACING_DATA] = "TRACING_DATA",
@@ -749,6 +751,14 @@ int perf_event__process_lost_samples(struct perf_tool *tool __maybe_unused,return machine__process_lost_samples_event (machine, event, sample); } +int perf_event__process_switch (struct perf_tool *tool__maybe_unused , +union perf_event *event, +struct perf_sample *sample__maybe_unused , +struct machine *machine) +{ +return machine__process_switch_event (machine, event); +} +size_t perf_event__fprintf_mmap (union perf_event *event,FILE *fp) { return fprintf(fp, " %d/%d: [%#" PRIx64 "(%#" PRIx64 ") @ %#" PRIx64 "]: %c %s\n",
@@ -827,6 +837,20 @@ size_t perf_event__fprintf_itrace_start(union perf_event *event, FILE *fp) event->itrace_start.pid, event->itrace_start.tid); } +size_t perf_event__fprintf_switch (union perf_event *event,FILE *fp) +{ +bool out = event->header.misc &PERF_RECORD_MISC_SWITCH_OUT ; +const char *in_out = out ?"OUT" :"IN " ; + +if (event->header.type ==PERF_RECORD_SWITCH ) +return fprintf (fp," %s\n" , in_out); + +return fprintf (fp," %s %s pid/tid: %5u/%-5u\n" , + in_out, out ?"next" :"prev" , + event->context_switch.next_prev_pid, + event->context_switch.next_prev_tid); +} +size_t perf_event__fprintf (union perf_event *event,FILE *fp) { size_t ret = fprintf(fp, "PERF_RECORD_%s",
@@ -852,6 +876,10 @@ size_t perf_event__fprintf(union perf_event *event, FILE *fp)case PERF_RECORD_ITRACE_START : ret +=perf_event__fprintf_itrace_start (event, fp);break ; +case PERF_RECORD_SWITCH : +case PERF_RECORD_SWITCH_CPU_WIDE : + ret +=perf_event__fprintf_switch (event, fp); +break ;default : ret +=fprintf (fp,"\n" ); }
tools/perf/util/event.h +12 -0
@@ -348,6 +348,12 @@ struct itrace_start_event {u32 pid, tid; }; +struct context_switch_event { +struct perf_event_header header; +u32 next_prev_pid; +u32 next_prev_tid; +}; +union perf_event {struct perf_event_header header;struct mmap_event mmap;
@@ -369,6 +375,7 @@ union perf_event {struct auxtrace_error_event auxtrace_error;struct aux_event aux;struct itrace_start_event itrace_start; +struct context_switch_event context_switch; };void perf_event__print_totals (void );
@@ -418,6 +425,10 @@ int perf_event__process_itrace_start(struct perf_tool *tool,union perf_event *event, struct perf_sample *sample, struct machine *machine); +int perf_event__process_switch (struct perf_tool *tool, +union perf_event *event, +struct perf_sample *sample, +struct machine *machine); int perf_event__process_mmap(struct perf_tool *tool, union perf_event *event, struct perf_sample *sample,
@@ -480,6 +491,7 @@ size_t perf_event__fprintf_mmap2(union perf_event *event, FILE *fp);size_t perf_event__fprintf_task (union perf_event *event,FILE *fp);size_t perf_event__fprintf_aux (union perf_event *event,FILE *fp);size_t perf_event__fprintf_itrace_start (union perf_event *event,FILE *fp); +size_t perf_event__fprintf_switch (union perf_event *event,FILE *fp);size_t perf_event__fprintf (union perf_event *event,FILE *fp); u64 kallsyms__get_function_start(const char *kallsyms_filename,
tools/perf/util/evsel.c +1 -0
@@ -1127,6 +1127,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,PRINT_ATTRf (mmap2, p_unsigned);PRINT_ATTRf (comm_exec, p_unsigned);PRINT_ATTRf (use_clockid, p_unsigned); +PRINT_ATTRf (context_switch, p_unsigned);PRINT_ATTRn ("{ wakeup_events, wakeup_watermark }" , wakeup_events, p_unsigned);PRINT_ATTRf (bp_type, p_unsigned);
tools/perf/util/machine.c +11 -0
@@ -550,6 +550,14 @@ int machine__process_itrace_start_event(struct machine *machine __maybe_unused,return 0 ; } +int machine__process_switch_event (struct machine *machine__maybe_unused , +union perf_event *event) +{ +if (dump_trace) +perf_event__fprintf_switch (event, stdout); +return 0 ; +} +struct map *machine__findnew_module_map (struct machine *machine,u64 start,const char *filename) {
@@ -1451,6 +1459,9 @@ int machine__process_event(struct machine *machine, union perf_event *event, ret =machine__process_itrace_start_event (machine, event);break ;case PERF_RECORD_LOST_SAMPLES : ret =machine__process_lost_samples_event (machine, event, sample);break ; +case PERF_RECORD_SWITCH : +case PERF_RECORD_SWITCH_CPU_WIDE : + ret =machine__process_switch_event (machine, event);break ;default : ret =-1 ;break ;
tools/perf/util/machine.h +2 -0
@@ -87,6 +87,8 @@ int machine__process_aux_event(struct machine *machine, union perf_event *event);int machine__process_itrace_start_event (struct machine *machine,union perf_event *event); +int machine__process_switch_event (struct machine *machine__maybe_unused , +union perf_event *event);int machine__process_mmap_event (struct machine *machine,union perf_event *event,struct perf_sample *sample); int machine__process_mmap2_event(struct machine *machine, union perf_event *event,
tools/perf/util/session.c +20 -0
@@ -332,6 +332,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool) tool->aux = perf_event__process_aux;if (tool->itrace_start ==NULL ) tool->itrace_start = perf_event__process_itrace_start; +if (tool->context_switch ==NULL ) + tool->context_switch = perf_event__process_switch;if (tool->read ==NULL ) tool->read = process_event_sample_stub;if (tool->throttle ==NULL )
@@ -470,6 +472,19 @@ static void perf_event__itrace_start_swap(union perf_event *event,swap_sample_id_all (event, &event->itrace_start +1 ); } +static void perf_event__switch_swap (union perf_event *event,bool sample_id_all) +{ +if (event->header.type ==PERF_RECORD_SWITCH_CPU_WIDE ) { + event->context_switch.next_prev_pid = +bswap_32 (event->context_switch.next_prev_pid); + event->context_switch.next_prev_tid = +bswap_32 (event->context_switch.next_prev_tid); + } + +if (sample_id_all) +swap_sample_id_all (event, &event->context_switch +1 ); +} +static void perf_event__throttle_swap (union perf_event *event,bool sample_id_all) {
@@ -632,6 +647,8 @@ static perf_event__swap_op perf_event__swap_ops[] = { [PERF_RECORD_AUX] = perf_event__aux_swap, [PERF_RECORD_ITRACE_START] = perf_event__itrace_start_swap, [PERF_RECORD_LOST_SAMPLES] = perf_event__all64_swap, + [PERF_RECORD_SWITCH] = perf_event__switch_swap, + [PERF_RECORD_SWITCH_CPU_WIDE] = perf_event__switch_swap, [PERF_RECORD_HEADER_ATTR] = perf_event__hdr_attr_swap, [PERF_RECORD_HEADER_EVENT_TYPE] = perf_event__event_type_swap, [PERF_RECORD_HEADER_TRACING_DATA] = perf_event__tracing_data_swap,
@@ -1093,6 +1110,9 @@ static int machines__deliver_event(struct machines *machines,return tool->aux (tool, event, sample, machine);case PERF_RECORD_ITRACE_START :return tool->itrace_start (tool, event, sample, machine); +case PERF_RECORD_SWITCH : +case PERF_RECORD_SWITCH_CPU_WIDE : +return tool->context_switch (tool, event, sample, machine);default : ++evlist->stats.nr_unknown_events;return -1 ;
tools/perf/util/tool.h +1 -0
@@ -46,6 +46,7 @@ struct perf_tool { lost_samples, aux, itrace_start, + context_switch, throttle, unthrottle;event_attr_op attr;
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf tools: Add new PERF_RECORD_SWITCH event
perf tools: Add new PERF_RECORD_SWITCH event
Commit-ID: 0286039f777ec0b6684868c34f7b16f97a069d6e Gitweb: http://git.kernel.org/tip/0286039f777ec0b6684868c34f7b16f97a069d6e Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 21 Jul 2015 12:44:03 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 23 Jul 2015 22:51:13 -0300
perf tools: Add new PERF_RECORD_SWITCH event
Support processing of PERF_RECORD_SWITCH events and PERF_RECORD_SWITCH_CPU_WIDE events. There is a single tools callback for them both so that the tool must check the event type before using the extra members in PERF_RECORD_SWITCH_CPU_WIDE.
There is still no way to select the events, though. That is added in a subsequest patch.
--- tools/perf/builtin-inject.c | 1 + tools/perf/util/event.c | 28 ++++++++++++++++++++++++++++ tools/perf/util/event.h | 12 ++++++++++++ tools/perf/util/evsel.c | 1 + tools/perf/util/machine.c | 11 +++++++++++ tools/perf/util/machine.h | 2 ++ tools/perf/util/session.c | 20 ++++++++++++++++++++ tools/perf/util/tool.h | 1 + 8 files changed, 76 insertions(+)
tools/perf/builtin-inject.c +1 -0
@@ -561,6 +561,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) .lost = perf_event__repipe, .aux = perf_event__repipe, .itrace_start = perf_event__repipe, + .context_switch = perf_event__repipe, .read = perf_event__repipe_sample, .throttle = perf_event__repipe, .unthrottle = perf_event__repipe,
tools/perf/util/event.c +28 -0
@@ -26,6 +26,8 @@ static const char *perf_event__names[] = { [PERF_RECORD_AUX] = "AUX", [PERF_RECORD_ITRACE_START] = "ITRACE_START", [PERF_RECORD_LOST_SAMPLES] = "LOST_SAMPLES", + [PERF_RECORD_SWITCH] = "SWITCH", + [PERF_RECORD_SWITCH_CPU_WIDE] = "SWITCH_CPU_WIDE", [PERF_RECORD_HEADER_ATTR] = "ATTR", [PERF_RECORD_HEADER_EVENT_TYPE] = "EVENT_TYPE", [PERF_RECORD_HEADER_TRACING_DATA] = "TRACING_DATA",
@@ -749,6 +751,14 @@ int perf_event__process_lost_samples(struct perf_tool *tool __maybe_unused,return machine__process_lost_samples_event (machine, event, sample); } +int perf_event__process_switch (struct perf_tool *tool__maybe_unused , +union perf_event *event, +struct perf_sample *sample__maybe_unused , +struct machine *machine) +{ +return machine__process_switch_event (machine, event); +} +size_t perf_event__fprintf_mmap (union perf_event *event,FILE *fp) { return fprintf(fp, " %d/%d: [%#" PRIx64 "(%#" PRIx64 ") @ %#" PRIx64 "]: %c %s\n",
@@ -827,6 +837,20 @@ size_t perf_event__fprintf_itrace_start(union perf_event *event, FILE *fp) event->itrace_start.pid, event->itrace_start.tid); } +size_t perf_event__fprintf_switch (union perf_event *event,FILE *fp) +{ +bool out = event->header.misc &PERF_RECORD_MISC_SWITCH_OUT ; +const char *in_out = out ?"OUT" :"IN " ; + +if (event->header.type ==PERF_RECORD_SWITCH ) +return fprintf (fp," %s\n" , in_out); + +return fprintf (fp," %s %s pid/tid: %5u/%-5u\n" , + in_out, out ?"next" :"prev" , + event->context_switch.next_prev_pid, + event->context_switch.next_prev_tid); +} +size_t perf_event__fprintf (union perf_event *event,FILE *fp) { size_t ret = fprintf(fp, "PERF_RECORD_%s",
@@ -852,6 +876,10 @@ size_t perf_event__fprintf(union perf_event *event, FILE *fp)case PERF_RECORD_ITRACE_START : ret +=perf_event__fprintf_itrace_start (event, fp);break ; +case PERF_RECORD_SWITCH : +case PERF_RECORD_SWITCH_CPU_WIDE : + ret +=perf_event__fprintf_switch (event, fp); +break ;default : ret +=fprintf (fp,"\n" ); }
tools/perf/util/event.h +12 -0
@@ -348,6 +348,12 @@ struct itrace_start_event {u32 pid, tid; }; +struct context_switch_event { +struct perf_event_header header; +u32 next_prev_pid; +u32 next_prev_tid; +}; +union perf_event {struct perf_event_header header;struct mmap_event mmap;
@@ -369,6 +375,7 @@ union perf_event {struct auxtrace_error_event auxtrace_error;struct aux_event aux;struct itrace_start_event itrace_start; +struct context_switch_event context_switch; };void perf_event__print_totals (void );
@@ -418,6 +425,10 @@ int perf_event__process_itrace_start(struct perf_tool *tool,union perf_event *event, struct perf_sample *sample, struct machine *machine); +int perf_event__process_switch (struct perf_tool *tool, +union perf_event *event, +struct perf_sample *sample, +struct machine *machine); int perf_event__process_mmap(struct perf_tool *tool, union perf_event *event, struct perf_sample *sample,
@@ -480,6 +491,7 @@ size_t perf_event__fprintf_mmap2(union perf_event *event, FILE *fp);size_t perf_event__fprintf_task (union perf_event *event,FILE *fp);size_t perf_event__fprintf_aux (union perf_event *event,FILE *fp);size_t perf_event__fprintf_itrace_start (union perf_event *event,FILE *fp); +size_t perf_event__fprintf_switch (union perf_event *event,FILE *fp);size_t perf_event__fprintf (union perf_event *event,FILE *fp); u64 kallsyms__get_function_start(const char *kallsyms_filename,
tools/perf/util/evsel.c +1 -0
@@ -1127,6 +1127,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,PRINT_ATTRf (mmap2, p_unsigned);PRINT_ATTRf (comm_exec, p_unsigned);PRINT_ATTRf (use_clockid, p_unsigned); +PRINT_ATTRf (context_switch, p_unsigned);PRINT_ATTRn ("{ wakeup_events, wakeup_watermark }" , wakeup_events, p_unsigned);PRINT_ATTRf (bp_type, p_unsigned);
tools/perf/util/machine.c +11 -0
@@ -550,6 +550,14 @@ int machine__process_itrace_start_event(struct machine *machine __maybe_unused,return 0 ; } +int machine__process_switch_event (struct machine *machine__maybe_unused , +union perf_event *event) +{ +if (dump_trace) +perf_event__fprintf_switch (event, stdout); +return 0 ; +} +struct map *machine__findnew_module_map (struct machine *machine,u64 start,const char *filename) {
@@ -1451,6 +1459,9 @@ int machine__process_event(struct machine *machine, union perf_event *event, ret =machine__process_itrace_start_event (machine, event);break ;case PERF_RECORD_LOST_SAMPLES : ret =machine__process_lost_samples_event (machine, event, sample);break ; +case PERF_RECORD_SWITCH : +case PERF_RECORD_SWITCH_CPU_WIDE : + ret =machine__process_switch_event (machine, event);break ;default : ret =-1 ;break ;
tools/perf/util/machine.h +2 -0
@@ -87,6 +87,8 @@ int machine__process_aux_event(struct machine *machine, union perf_event *event);int machine__process_itrace_start_event (struct machine *machine,union perf_event *event); +int machine__process_switch_event (struct machine *machine__maybe_unused , +union perf_event *event);int machine__process_mmap_event (struct machine *machine,union perf_event *event,struct perf_sample *sample); int machine__process_mmap2_event(struct machine *machine, union perf_event *event,
tools/perf/util/session.c +20 -0
@@ -333,6 +333,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool) tool->aux = perf_event__process_aux;if (tool->itrace_start ==NULL ) tool->itrace_start = perf_event__process_itrace_start; +if (tool->context_switch ==NULL ) + tool->context_switch = perf_event__process_switch;if (tool->read ==NULL ) tool->read = process_event_sample_stub;if (tool->throttle ==NULL )
@@ -471,6 +473,19 @@ static void perf_event__itrace_start_swap(union perf_event *event,swap_sample_id_all (event, &event->itrace_start +1 ); } +static void perf_event__switch_swap (union perf_event *event,bool sample_id_all) +{ +if (event->header.type ==PERF_RECORD_SWITCH_CPU_WIDE ) { + event->context_switch.next_prev_pid = +bswap_32 (event->context_switch.next_prev_pid); + event->context_switch.next_prev_tid = +bswap_32 (event->context_switch.next_prev_tid); + } + +if (sample_id_all) +swap_sample_id_all (event, &event->context_switch +1 ); +} +static void perf_event__throttle_swap (union perf_event *event,bool sample_id_all) {
@@ -633,6 +648,8 @@ static perf_event__swap_op perf_event__swap_ops[] = { [PERF_RECORD_AUX] = perf_event__aux_swap, [PERF_RECORD_ITRACE_START] = perf_event__itrace_start_swap, [PERF_RECORD_LOST_SAMPLES] = perf_event__all64_swap, + [PERF_RECORD_SWITCH] = perf_event__switch_swap, + [PERF_RECORD_SWITCH_CPU_WIDE] = perf_event__switch_swap, [PERF_RECORD_HEADER_ATTR] = perf_event__hdr_attr_swap, [PERF_RECORD_HEADER_EVENT_TYPE] = perf_event__event_type_swap, [PERF_RECORD_HEADER_TRACING_DATA] = perf_event__tracing_data_swap,
@@ -1094,6 +1111,9 @@ static int machines__deliver_event(struct machines *machines,return tool->aux (tool, event, sample, machine);case PERF_RECORD_ITRACE_START :return tool->itrace_start (tool, event, sample, machine); +case PERF_RECORD_SWITCH : +case PERF_RECORD_SWITCH_CPU_WIDE : +return tool->context_switch (tool, event, sample, machine);default : ++evlist->stats.nr_unknown_events;return -1 ;
tools/perf/util/tool.h +1 -0
@@ -46,6 +46,7 @@ struct perf_tool { lost_samples, aux, itrace_start, + context_switch, throttle, unthrottle;event_attr_op attr;
Adrian Hunter
reviewerPATCH v4 3/5 perf record: Add option --switch-events to select PERF_RECORD_SWITCH events
In reply to Adrian HunterAdd an option to select PERF_RECORD_SWITCH events.
--- tools/perf/Documentation/perf-record.txt | 4 ++++ tools/perf/builtin-record.c | 7 +++++++ tools/perf/perf.h | 1 + tools/perf/util/evlist.h | 1 + tools/perf/util/evsel.c | 3 +++ tools/perf/util/record.c | 10 ++++++++++ 6 files changed, 26 insertions(+)
tools/perf/Documentation/perf-record.txt +4 -0
@@ -293,6 +293,10 @@ When processing pre-existing threads /proc/XXX/mmap, it may take a long time, because the file may be huge. A time out is needed in such cases. This option sets the time out limit. The default value is 500 ms. +--switch-events:: +Record context switch events i.e. events of type PERF_RECORD_SWITCH or +PERF_RECORD_SWITCH_CPU_WIDE. + SEE ALSO -------- linkperf:perf-stat[1], linkperf:perf-list[1]
tools/perf/builtin-record.c +7 -0
@@ -1075,6 +1075,8 @@ struct option __record_options[] = { "opts", "AUX area tracing Snapshot Mode", ""),OPT_UINTEGER (0 ,"proc-map-timeout" , &record.opts.proc_map_timeout,"per thread proc mmap processing timeout in ms" ), +OPT_BOOLEAN (0 ,"switch-events" , &record.opts.record_switch_events, +"Record context switch events" ), OPT_END() };
@@ -1102,6 +1104,11 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) " system-wide mode\n");usage_with_options (record_usage, record_options); } +if (rec->opts.record_switch_events && + !perf_can_record_switch_events ()) { +ui__error ("kernel does not support recording context switch events (--switch-events option)\n" ); +usage_with_options (record_usage, record_options); + }if (!rec->itr) { rec->itr =auxtrace_record__init (rec->evlist, &err);
tools/perf/perf.h +1 -0
@@ -57,6 +57,7 @@ struct record_opts {bool running_time;bool full_auxtrace;bool auxtrace_snapshot_mode; +bool record_switch_events;unsigned int freq;unsigned int mmap_pages;unsigned int auxtrace_mmap_pages;
tools/perf/util/evlist.h +1 -0
@@ -114,6 +114,7 @@ void perf_evlist__close(struct perf_evlist *evlist);void perf_evlist__set_id_pos (struct perf_evlist *evlist);bool perf_can_sample_identifier (void ); +bool perf_can_record_switch_events (void );void perf_evlist__config (struct perf_evlist *evlist,struct record_opts *opts);int record_opts__config (struct record_opts *opts);
tools/perf/util/evsel.c +3 -0
@@ -738,6 +738,9 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts) attr->mmap2 = track && !perf_missing_features.mmap2; attr->comm = track; +if (opts->record_switch_events) + attr->context_switch = track; +if (opts->sample_transaction)perf_evsel__set_sample_bit (evsel,TRANSACTION );
tools/perf/util/record.c +10 -0
@@ -85,6 +85,11 @@ static void perf_probe_comm_exec(struct perf_evsel *evsel) evsel->attr.comm_exec =1 ; } +static void perf_probe_context_switch (struct perf_evsel *evsel) +{ + evsel->attr.context_switch =1 ; +} +bool perf_can_sample_identifier (void ) {return perf_probe_api (perf_probe_sample_identifier);
@@ -95,6 +100,11 @@ static bool perf_can_comm_exec(void)return perf_probe_api (perf_probe_comm_exec); } +bool perf_can_record_switch_events (void ) +{ +return perf_probe_api (perf_probe_context_switch); +} +void perf_evlist__config (struct perf_evlist *evlist,struct record_opts *opts) {struct perf_evsel *evsel;
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf record: Add option --switch-events to select PERF_RECORD_SWITCH events
perf record: Add option --switch-events to select PERF_RECORD_SWITCH events
Commit-ID: b757bb09134f479a087ece08d2cd2a6ba31c9210 Gitweb: http://git.kernel.org/tip/b757bb09134f479a087ece08d2cd2a6ba31c9210 Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 21 Jul 2015 12:44:04 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 23 Jul 2015 22:51:13 -0300
perf record: Add option --switch-events to select PERF_RECORD_SWITCH events
Add an option to select PERF_RECORD_SWITCH events.
--- tools/perf/Documentation/perf-record.txt | 4 ++++ tools/perf/builtin-record.c | 7 +++++++ tools/perf/perf.h | 1 + tools/perf/util/evlist.h | 1 + tools/perf/util/evsel.c | 3 +++ tools/perf/util/record.c | 10 ++++++++++ 6 files changed, 26 insertions(+)
tools/perf/Documentation/perf-record.txt +4 -0
@@ -293,6 +293,10 @@ When processing pre-existing threads /proc/XXX/mmap, it may take a long time, because the file may be huge. A time out is needed in such cases. This option sets the time out limit. The default value is 500 ms. +--switch-events:: +Record context switch events i.e. events of type PERF_RECORD_SWITCH or +PERF_RECORD_SWITCH_CPU_WIDE. + SEE ALSO -------- linkperf:perf-stat[1], linkperf:perf-list[1]
tools/perf/builtin-record.c +7 -0
@@ -1075,6 +1075,8 @@ struct option __record_options[] = { "opts", "AUX area tracing Snapshot Mode", ""),OPT_UINTEGER (0 ,"proc-map-timeout" , &record.opts.proc_map_timeout,"per thread proc mmap processing timeout in ms" ), +OPT_BOOLEAN (0 ,"switch-events" , &record.opts.record_switch_events, +"Record context switch events" ), OPT_END() };
@@ -1102,6 +1104,11 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) " system-wide mode\n");usage_with_options (record_usage, record_options); } +if (rec->opts.record_switch_events && + !perf_can_record_switch_events ()) { +ui__error ("kernel does not support recording context switch events (--switch-events option)\n" ); +usage_with_options (record_usage, record_options); + }if (!rec->itr) { rec->itr =auxtrace_record__init (rec->evlist, &err);
tools/perf/perf.h +1 -0
@@ -57,6 +57,7 @@ struct record_opts {bool running_time;bool full_auxtrace;bool auxtrace_snapshot_mode; +bool record_switch_events;unsigned int freq;unsigned int mmap_pages;unsigned int auxtrace_mmap_pages;
tools/perf/util/evlist.h +1 -0
@@ -114,6 +114,7 @@ void perf_evlist__close(struct perf_evlist *evlist);void perf_evlist__set_id_pos (struct perf_evlist *evlist);bool perf_can_sample_identifier (void ); +bool perf_can_record_switch_events (void );void perf_evlist__config (struct perf_evlist *evlist,struct record_opts *opts);int record_opts__config (struct record_opts *opts);
tools/perf/util/evsel.c +3 -0
@@ -738,6 +738,9 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts) attr->mmap2 = track && !perf_missing_features.mmap2; attr->comm = track; +if (opts->record_switch_events) + attr->context_switch = track; +if (opts->sample_transaction)perf_evsel__set_sample_bit (evsel,TRANSACTION );
tools/perf/util/record.c +10 -0
@@ -85,6 +85,11 @@ static void perf_probe_comm_exec(struct perf_evsel *evsel) evsel->attr.comm_exec =1 ; } +static void perf_probe_context_switch (struct perf_evsel *evsel) +{ + evsel->attr.context_switch =1 ; +} +bool perf_can_sample_identifier (void ) {return perf_probe_api (perf_probe_sample_identifier);
@@ -95,6 +100,11 @@ static bool perf_can_comm_exec(void)return perf_probe_api (perf_probe_comm_exec); } +bool perf_can_record_switch_events (void ) +{ +return perf_probe_api (perf_probe_context_switch); +} +void perf_evlist__config (struct perf_evlist *evlist,struct record_opts *opts) {struct perf_evsel *evsel;
Adrian Hunter
reviewerPATCH v4 4/5 perf script: Don't assume evsel position of tracking events
In reply to Adrian HunterThe tracking event does not have to be the first event so replace perf_evlist__first() with perf_evlist__id2evsel() which uses the event ID to find the correct evsel.
--- tools/perf/builtin-script.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tools/perf/builtin-script.c +5 -5
@@ -661,7 +661,7 @@ static int process_comm_event(struct perf_tool *tool,struct thread *thread; struct perf_script *script = container_of(tool, struct perf_script, tool);struct perf_session *session = script->session; -struct perf_evsel *evsel =perf_evlist__first (session->evlist); +struct perf_evsel *evsel =perf_evlist__id2evsel (session->evlist, sample->id);int ret =-1 ; thread =machine__findnew_thread (machine, event->comm.pid, event->comm.tid);
@@ -695,7 +695,7 @@ static int process_fork_event(struct perf_tool *tool,struct thread *thread; struct perf_script *script = container_of(tool, struct perf_script, tool);struct perf_session *session = script->session; -struct perf_evsel *evsel =perf_evlist__first (session->evlist); +struct perf_evsel *evsel =perf_evlist__id2evsel (session->evlist, sample->id);if (perf_event__process_fork (tool, event, sample, machine) <0 )return -1 ;
@@ -727,7 +727,7 @@ static int process_exit_event(struct perf_tool *tool,struct thread *thread; struct perf_script *script = container_of(tool, struct perf_script, tool);struct perf_session *session = script->session; -struct perf_evsel *evsel =perf_evlist__first (session->evlist); +struct perf_evsel *evsel =perf_evlist__id2evsel (session->evlist, sample->id); thread =machine__findnew_thread (machine, event->fork.pid, event->fork.tid);if (thread ==NULL ) {
@@ -759,7 +759,7 @@ static int process_mmap_event(struct perf_tool *tool,struct thread *thread; struct perf_script *script = container_of(tool, struct perf_script, tool);struct perf_session *session = script->session; -struct perf_evsel *evsel =perf_evlist__first (session->evlist); +struct perf_evsel *evsel =perf_evlist__id2evsel (session->evlist, sample->id);if (perf_event__process_mmap (tool, event, sample, machine) <0 )return -1 ;
@@ -790,7 +790,7 @@ static int process_mmap2_event(struct perf_tool *tool,struct thread *thread; struct perf_script *script = container_of(tool, struct perf_script, tool);struct perf_session *session = script->session; -struct perf_evsel *evsel =perf_evlist__first (session->evlist); +struct perf_evsel *evsel =perf_evlist__id2evsel (session->evlist, sample->id);if (perf_event__process_mmap2 (tool, event, sample, machine) <0 )return -1 ;
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf script: Don' t assume evsel position of tracking events
perf script: Don't assume evsel position of tracking events
Commit-ID: 06b234ec26fde8d0fce54030fe0858e218636410 Gitweb: http://git.kernel.org/tip/06b234ec26fde8d0fce54030fe0858e218636410 Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 21 Jul 2015 12:44:05 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 23 Jul 2015 22:51:14 -0300
perf script: Don't assume evsel position of tracking events
The tracking event does not have to be the first event so replace perf_evlist__first() with perf_evlist__id2evsel() which uses the event ID to find the correct evsel.
--- tools/perf/builtin-script.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tools/perf/builtin-script.c +5 -5
@@ -661,7 +661,7 @@ static int process_comm_event(struct perf_tool *tool,struct thread *thread; struct perf_script *script = container_of(tool, struct perf_script, tool);struct perf_session *session = script->session; -struct perf_evsel *evsel =perf_evlist__first (session->evlist); +struct perf_evsel *evsel =perf_evlist__id2evsel (session->evlist, sample->id);int ret =-1 ; thread =machine__findnew_thread (machine, event->comm.pid, event->comm.tid);
@@ -695,7 +695,7 @@ static int process_fork_event(struct perf_tool *tool,struct thread *thread; struct perf_script *script = container_of(tool, struct perf_script, tool);struct perf_session *session = script->session; -struct perf_evsel *evsel =perf_evlist__first (session->evlist); +struct perf_evsel *evsel =perf_evlist__id2evsel (session->evlist, sample->id);if (perf_event__process_fork (tool, event, sample, machine) <0 )return -1 ;
@@ -727,7 +727,7 @@ static int process_exit_event(struct perf_tool *tool,struct thread *thread; struct perf_script *script = container_of(tool, struct perf_script, tool);struct perf_session *session = script->session; -struct perf_evsel *evsel =perf_evlist__first (session->evlist); +struct perf_evsel *evsel =perf_evlist__id2evsel (session->evlist, sample->id); thread =machine__findnew_thread (machine, event->fork.pid, event->fork.tid);if (thread ==NULL ) {
@@ -759,7 +759,7 @@ static int process_mmap_event(struct perf_tool *tool,struct thread *thread; struct perf_script *script = container_of(tool, struct perf_script, tool);struct perf_session *session = script->session; -struct perf_evsel *evsel =perf_evlist__first (session->evlist); +struct perf_evsel *evsel =perf_evlist__id2evsel (session->evlist, sample->id);if (perf_event__process_mmap (tool, event, sample, machine) <0 )return -1 ;
@@ -790,7 +790,7 @@ static int process_mmap2_event(struct perf_tool *tool,struct thread *thread; struct perf_script *script = container_of(tool, struct perf_script, tool);struct perf_session *session = script->session; -struct perf_evsel *evsel =perf_evlist__first (session->evlist); +struct perf_evsel *evsel =perf_evlist__id2evsel (session->evlist, sample->id);if (perf_event__process_mmap2 (tool, event, sample, machine) <0 )return -1 ;
Adrian Hunter
reviewerPATCH v4 5/5 perf script: Add option --show-switch-events
In reply to Adrian HunterAdd option --show-switch-events to show switch events in a similar fashion to --show-task-events and --show-mmap-events.
--- tools/perf/Documentation/perf-script.txt | 4 ++++ tools/perf/builtin-script.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+)
tools/perf/Documentation/perf-script.txt +4 -0
@@ -222,6 +222,10 @@ OPTIONS --show-mmap-events Display mmap related events (e.g. MMAP, MMAP2). +--show-switch-events + Display context switch events i.e. events of type PERF_RECORD_SWITCH or + PERF_RECORD_SWITCH_CPU_WIDE. + --header Show perf.data header.
tools/perf/builtin-script.c +31 -0
@@ -623,6 +623,7 @@ struct perf_script {struct perf_session *session;bool show_task_events;bool show_mmap_events; +bool show_switch_events; }; static int process_attr(struct perf_tool *tool, union perf_event *event,
@@ -813,6 +814,32 @@ static int process_mmap2_event(struct perf_tool *tool,return 0 ; } +static int process_switch_event (struct perf_tool *tool, +union perf_event *event, +struct perf_sample *sample, +struct machine *machine) +{ +struct thread *thread; + struct perf_script *script = container_of(tool, struct perf_script, tool); +struct perf_session *session = script->session; +struct perf_evsel *evsel =perf_evlist__id2evsel (session->evlist, sample->id); + +if (perf_event__process_switch (tool, event, sample, machine) <0 ) +return -1 ; + + thread =machine__findnew_thread (machine, sample->pid, + sample->tid); +if (thread ==NULL ) { +pr_debug ("problem processing SWITCH event, skipping it.\n" ); +return -1 ; + } + +print_sample_start (sample, thread, evsel); +perf_event__fprintf (event, stdout); +thread__put (thread); +return 0 ; +} +static void sig_handler (int sig__maybe_unused ) { session_done =1 ;
@@ -834,6 +861,8 @@ static int __cmd_script(struct perf_script *script) script->tool.mmap = process_mmap_event; script->tool.mmap2 = process_mmap2_event; } +if (script->show_switch_events) + script->tool.context_switch = process_switch_event; ret =perf_session__process_events (script->session);
@@ -1618,6 +1647,8 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) "Show the fork/comm/exit events"),OPT_BOOLEAN ('\0' ,"show-mmap-events" , &script.show_mmap_events,"Show the mmap events" ), +OPT_BOOLEAN ('\0' ,"show-switch-events" , &script.show_switch_events, +"Show context switch events (if recorded)" ),OPT_BOOLEAN ('f' ,"force" , &file.force,"don't complain, do it" ), OPT_CALLBACK_OPTARG(0, "itrace", &itrace_synth_opts, NULL, "opts", "Instruction Tracing options",
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf script: Add option --show-switch-events
perf script: Add option --show-switch-events
Commit-ID: 7c14898ba9386ee5c939bb418643ac6baff52840 Gitweb: http://git.kernel.org/tip/7c14898ba9386ee5c939bb418643ac6baff52840 Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 21 Jul 2015 12:44:06 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 23 Jul 2015 22:51:14 -0300
perf script: Add option --show-switch-events
Add option --show-switch-events to show switch events in a similar fashion to --show-task-events and --show-mmap-events.
--- tools/perf/Documentation/perf-script.txt | 4 ++++ tools/perf/builtin-script.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+)
tools/perf/Documentation/perf-script.txt +4 -0
@@ -222,6 +222,10 @@ OPTIONS --show-mmap-events Display mmap related events (e.g. MMAP, MMAP2). +--show-switch-events + Display context switch events i.e. events of type PERF_RECORD_SWITCH or + PERF_RECORD_SWITCH_CPU_WIDE. + --header Show perf.data header.
tools/perf/builtin-script.c +31 -0
@@ -623,6 +623,7 @@ struct perf_script {struct perf_session *session;bool show_task_events;bool show_mmap_events; +bool show_switch_events; }; static int process_attr(struct perf_tool *tool, union perf_event *event,
@@ -813,6 +814,32 @@ static int process_mmap2_event(struct perf_tool *tool,return 0 ; } +static int process_switch_event (struct perf_tool *tool, +union perf_event *event, +struct perf_sample *sample, +struct machine *machine) +{ +struct thread *thread; + struct perf_script *script = container_of(tool, struct perf_script, tool); +struct perf_session *session = script->session; +struct perf_evsel *evsel =perf_evlist__id2evsel (session->evlist, sample->id); + +if (perf_event__process_switch (tool, event, sample, machine) <0 ) +return -1 ; + + thread =machine__findnew_thread (machine, sample->pid, + sample->tid); +if (thread ==NULL ) { +pr_debug ("problem processing SWITCH event, skipping it.\n" ); +return -1 ; + } + +print_sample_start (sample, thread, evsel); +perf_event__fprintf (event, stdout); +thread__put (thread); +return 0 ; +} +static void sig_handler (int sig__maybe_unused ) { session_done =1 ;
@@ -834,6 +861,8 @@ static int __cmd_script(struct perf_script *script) script->tool.mmap = process_mmap_event; script->tool.mmap2 = process_mmap2_event; } +if (script->show_switch_events) + script->tool.context_switch = process_switch_event; ret =perf_session__process_events (script->session);
@@ -1618,6 +1647,8 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) "Show the fork/comm/exit events"),OPT_BOOLEAN ('\0' ,"show-mmap-events" , &script.show_mmap_events,"Show the mmap events" ), +OPT_BOOLEAN ('\0' ,"show-switch-events" , &script.show_switch_events, +"Show context switch events (if recorded)" ),OPT_BOOLEAN ('f' ,"force" , &file.force,"don't complain, do it" ), OPT_CALLBACK_OPTARG(0, "itrace", &itrace_synth_opts, NULL, "opts", "Instruction Tracing options",