perf trace: Honour --max-events in processing syscalls:sys_enter_*
The following commit has been merged into the perf/core branch of tip:
Commit-ID: db25bf98a3861225bc0b2138cf665097141c72ee Gitweb: https://git.kernel.org/tip/db25bf98a3861225bc0b2138cf665097141c72ee Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Fri, 18 Oct 2019 11:48:57 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Fri, 18 Oct 2019 12:19:02 -03:00
perf trace: Honour --max-events in processing syscalls:sys_enter_*
We were doing this only at the sys_exit syscall tracepoint, as for strace-like we count the pair of sys_enter and sys_exit as one event, but when asking specifically for a the syscalls:sys_enter_NAME tracepoint we need to count each of those as an event.
I.e. things like:
# perf trace --max-events=4 -e syscalls:sys_enter_lseek
0.000 pool/2242 syscalls:sys_enter_lseek(fd: 14<anon_inode:[timerfd]>, offset: 0, whence: CUR)
0.034 pool/2242 syscalls:sys_enter_lseek(fd: 15<anon_inode:[timerfd]>, offset: 0, whence: CUR)
0.051 pool/2242 syscalls:sys_enter_lseek(fd: 16<anon_inode:[timerfd]>, offset: 0, whence: CUR)
2307.900 sshd/30800 syscalls:sys_enter_lseek(fd: 3</usr/lib64/libsystemd.so.0.25.0>, offset: 9032, whence: SET)
#Were going on forever, since we only had sys_enter events.
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Luis Cláudio Gonçalves <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-trace.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
tools/perf/builtin-trace.c +7 -6
@@ -2727,12 +2727,6 @@ static int trace__event_handler(struct trace *trace, struct evsel *evsel, }else {trace__fprintf_tp_fields (trace, evsel, sample, thread,NULL ,0 ); } - ++trace->nr_events_printed; - -if (evsel->max_events !=ULONG_MAX && ++evsel->nr_events_printed == evsel->max_events) { -evsel__disable (evsel); -evsel__close (evsel); - } } }
@@ -2743,6 +2737,13 @@ newline:trace__fprintf_callchain (trace, sample); else if (callchain_ret < 0) pr_err("Problem processing %s callchain, skipping...\n", perf_evsel__name(evsel)); + + ++trace->nr_events_printed; + +if (evsel->max_events !=ULONG_MAX && ++evsel->nr_events_printed == evsel->max_events) { +evsel__disable (evsel); +evsel__close (evsel); + } out:thread__put (thread);return 0 ;