diff options
| author | Alexei Starovoitov <[email protected]> | 2020-05-06 17:12:44 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <[email protected]> | 2020-05-06 17:12:44 -0700 |
| commit | f87b87a1c969f767b9938d435f0211d293e323db (patch) | |
| tree | b315d103bc610caf0682329320839ec8dc51fa59 /tools/perf/builtin-stat.c | |
| parent | a085a1eeea5ed4ae7aa0c19031449ade145110fc (diff) | |
| parent | 980737282232b752bb14dab96d77665c15889c36 (diff) | |
Merge tag 'perf-for-bpf-2020-05-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into bpf-next
CAP_PERFMON for BPF
Diffstat (limited to 'tools/perf/builtin-stat.c')
| -rw-r--r-- | tools/perf/builtin-stat.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index ec053dc1e35c..9207b6c45475 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -686,8 +686,11 @@ try_again_reset: break; } } - if (child_pid != -1) + if (child_pid != -1) { + if (timeout) + kill(child_pid, SIGTERM); wait4(child_pid, &status, 0, &stat_config.ru_data); + } if (workload_exec_errno) { const char *emsg = str_error_r(workload_exec_errno, msg, sizeof(msg)); |