File perf-stat-honour-timeout-for-forked-workloads.p... of Package perf.23962

Overview Repositories Revisions Requests Users Attributes Meta

File perf-stat-honour-timeout-for-forked-workloads.patch of Package perf.23962

From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Wed, 15 Apr 2020 12:31:26 -0300
Subject: perf stat: Honour --timeout for forked workloads
Git-commit: cfbd41b786519d4a15e1c15181556689bcf6635a
References: git-fixes

When --timeout is used and a workload is specified to be started by
'perf stat', i.e.

$ perf stat --timeout 1000 sleep 1h

The --timeout wasn't being honoured, i.e. the workload, 'sleep 1h' in
the above example, should be terminated after 1000ms, but it wasn't,
'perf stat' was waiting for it to finish.

Fix it by sending a SIGTERM when the timeout expires.

Now it works:

# perf stat -e cycles --timeout 1234 sleep 1h
  sleep: Terminated

Performance counter stats for 'sleep 1h':

1,066,692      cycles

1.234314838 seconds time elapsed

0.000750000 seconds user
         0.000000000 seconds sys

Fixes: f1f8ad52f8bf ("perf stat: Add support to print counts after a period of time")
Reported-by: Konstantin Kharlamov <hi-angel@yandex.ru>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207243
Tested-by: Konstantin Kharlamov <hi-angel@yandex.ru>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Tested-by: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: yuzhoujian <yuzhoujian@didichuxing.com>
Link: https://lore.kernel.org/lkml/20200415153803.GB20324@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Tony Jones <tonyj@suse.de>
---
 tools/perf/builtin-stat.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
 					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));

Places

File perf-stat-honour-timeout-for-forked-workloads.patch of Package perf.23962

Places