perf test: Add a signal handler to kill forked child processes
Ian Rogers
reviewerPATCH 1/1 perf test: Add a signal handler to kill forked child processes
If the perf test process is killed the child tests continue running and may run indefinitely. Propagate SIGINT (ctrl-C) and SIGTERM (kill) signals to the running child processes so that they terminate when the parent is killed.
Signed-off-by Ian Rogers <[email protected]>
---
This change is on top of the 8 patch parallel test series:
https://lore.kernel.org/lkml/[email protected]/
--- tools/perf/tests/builtin-test.c | 34 +++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-)
tools/perf/tests/builtin-test.c +32 -2
@@ -469,13 +469,22 @@ static int start_test(struct test_suite *test, int i, int subi, struct child_tesfor (j =0 , k =0 ; j <ARRAY_SIZE (tests); j++, k =0 ) \while ((t = tests[j][k++]) !=NULL ) +/* State outside of __cmd_test for the sake of the signal handler. */ + +static size_t num_tests; +static struct child_test **child_tests; +static jmp_buf cmd_test_jmp_buf; + +static void cmd_test_sig_handler (int sig) +{ +siglongjmp (cmd_test_jmp_buf, sig); +} +static int __cmd_test (int argc,const char *argv[],struct intlist *skiplist) {struct test_suite *t;int width =0 ;unsigned int j, k; -size_t num_tests =0 ; -struct child_test **child_tests;int err =0 ;for_each_test (j, k, t) {
@@ -499,6 +508,25 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist)if (!child_tests)return -ENOMEM ; + err =sigsetjmp (cmd_test_jmp_buf,1 ); +if (err) { +pr_err ("Signal while running tests. Terminating tests with signal %d\n" , err); +for (size_t x =0 ; x < num_tests; x++) { +struct child_test *child_test = child_tests[x]; + +if (!child_test) +continue ; + +pr_debug3 ("Killing %3d pid %d\n" , + child_test->test_num +1 , + child_test->process.pid); +kill (child_test->process.pid,SIGTERM ); + } + goto err_out; + } +signal (SIGINT , cmd_test_sig_handler); +signal (SIGTERM , cmd_test_sig_handler); +/* * In parallel mode pass 1 runs non-exclusive tests in parallel, pass 2 * runs the exclusive tests sequentially. In other modes all tests are
@@ -559,6 +587,8 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) } } err_out: +signal (SIGINT ,SIG_DFL ); +signal (SIGTERM ,SIG_DFL );if (err) {pr_err ("Internal test harness failure. Completing any started tests:\n:" );for (size_t x =0 ; x < num_tests; x++)
Signature · 1 line
2.47.0.105.g07ac214952-goog