From: Cyril Hrubis <chrubis@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH] tst_test: Propagate SIGINT to test process
Date: Thu, 4 Aug 2016 16:45:08 +0200 [thread overview]
Message-ID: <20160804144508.GA8001@rei.lan> (raw)
Since the test runs in separate process and separate process group
pressing Ctrl+C only sends SIGINT to the library process.
This commit adds SIGINT handler for the library process that kills the
whole test process group. The upside is that system resources allocated
in the library are cleaned up even in this case.
We also reset signal handlers in the test process after the fork now.
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
lib/tst_test.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/lib/tst_test.c b/lib/tst_test.c
index 1bd2619..cd5b049 100644
--- a/lib/tst_test.c
+++ b/lib/tst_test.c
@@ -724,6 +724,16 @@ static void heartbeat_handler(int sig LTP_ATTRIBUTE_UNUSED)
alarm(results->timeout);
}
+#define SIGINT_MSG "Sending SIGKILL to test process...\n"
+
+static void sigint_handler(int sig LTP_ATTRIBUTE_UNUSED)
+{
+ if (test_pid > 0) {
+ (void)write(2, SIGINT_MSG, sizeof(SIGINT_MSG) - 1);
+ kill(-test_pid, SIGKILL);
+ }
+}
+
void tst_set_timeout(unsigned int timeout)
{
char *mul = getenv("LTP_TIMEOUT_MUL");
@@ -767,18 +777,23 @@ void tst_run_tcases(int argc, char *argv[], struct tst_test *self)
else
tst_set_timeout(300);
+ SAFE_SIGNAL(SIGINT, sigint_handler);
+
test_pid = fork();
if (test_pid < 0)
tst_brk(TBROK | TERRNO, "fork()");
if (!test_pid) {
+ SAFE_SIGNAL(SIGALRM, SIG_DFL);
+ SAFE_SIGNAL(SIGUSR1, SIG_DFL);
+ SAFE_SIGNAL(SIGINT, SIG_DFL);
SAFE_SETPGID(0, 0);
testrun();
}
SAFE_WAITPID(test_pid, &status, 0);
-
alarm(0);
+ SAFE_SIGNAL(SIGINT, SIG_DFL);
if (WIFEXITED(status) && WEXITSTATUS(status))
do_exit(WEXITSTATUS(status));
--
2.7.3
--
Cyril Hrubis
chrubis@suse.cz
next reply other threads:[~2016-08-04 14:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-04 14:45 Cyril Hrubis [this message]
2016-08-05 13:34 ` [LTP] [PATCH] tst_test: Propagate SIGINT to test process Jan Stancek
2016-08-05 13:51 ` Peter Maydell
2016-08-09 9:26 ` Cyril Hrubis
2016-08-16 11:34 ` Cyril Hrubis
2016-08-16 11:50 ` Jan Stancek
2016-08-16 12:06 ` Cyril Hrubis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160804144508.GA8001@rei.lan \
--to=chrubis@suse.cz \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox