Append 'y' sign to 'S' tag designating the type of context switch out event so
'S' means preemption context switch and 'Sy' means synchronization context
switch. Documentation is extended to cover new presentation changes.
perf script --show-switch-events -F +misc -I -i system-wide.perf:
rcu_sched 8 [003] 113800.748548: PERF_RECORD_SWITCH_CPU_WIDE IN
prev pid/tid: 0/0
perf 31479 [000] S 113800.748548: PERF_RECORD_SWITCH_CPU_WIDE OUT
next pid/tid: 59/59
kworker/0:1 59 [000] 113800.748549: PERF_RECORD_SWITCH_CPU_WIDE IN
prev pid/tid: 31479/31479
rcu_sched 8 [003] Sy 113800.748551: PERF_RECORD_SWITCH_CPU_WIDE OUT
yield next pid/tid: 0/0
swapper 0 [003] 113800.748551: PERF_RECORD_SWITCH_CPU_WIDE IN
prev pid/tid: 8/8
Signed-off-by: Alexey Budankov <[email protected]>
---
tools/perf/Documentation/perf-script.txt | 17 +++++++++--------
tools/perf/builtin-script.c | 5 ++++-
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/tools/perf/Documentation/perf-script.txt
b/tools/perf/Documentation/perf-script.txt
index 36ec0257f8d3..80e94cbbf520 100644
--- a/tools/perf/Documentation/perf-script.txt
+++ b/tools/perf/Documentation/perf-script.txt
@@ -228,14 +228,15 @@ OPTIONS
For sample events it's possible to display misc field with -F +misc
option,
following letters are displayed for each bit:
- PERF_RECORD_MISC_KERNEL K
- PERF_RECORD_MISC_USER U
- PERF_RECORD_MISC_HYPERVISOR H
- PERF_RECORD_MISC_GUEST_KERNEL G
- PERF_RECORD_MISC_GUEST_USER g
- PERF_RECORD_MISC_MMAP_DATA* M
- PERF_RECORD_MISC_COMM_EXEC E
- PERF_RECORD_MISC_SWITCH_OUT S
+ PERF_RECORD_MISC_KERNEL K
+ PERF_RECORD_MISC_USER U
+ PERF_RECORD_MISC_HYPERVISOR H
+ PERF_RECORD_MISC_GUEST_KERNEL G
+ PERF_RECORD_MISC_GUEST_USER g
+ PERF_RECORD_MISC_MMAP_DATA* M
+ PERF_RECORD_MISC_COMM_EXEC E
+ PERF_RECORD_MISC_SWITCH_OUT S
+ PERF_RECORD_MISC_SWITCH_OUT_YIELD Sy
$ perf script -F +misc ...
sched-messaging 1414 K 28690.636582: 4590 cycles ...
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 313c42423393..c0a3a7297c8a 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -657,8 +657,11 @@ static int perf_sample__fprintf_start(struct perf_sample
*sample,
break;
case PERF_RECORD_SWITCH:
case PERF_RECORD_SWITCH_CPU_WIDE:
- if (has(SWITCH_OUT))
+ if (has(SWITCH_OUT)) {
ret += fprintf(fp, "S");
+ if (sample->misc &
PERF_RECORD_MISC_SWITCH_OUT_YIELD)
+ ret += fprintf(fp, "y");
+ }
default:
break;
}
