[LTP] [PATCH 4/4] syscalls/kill06:Cleanup && Convert to new library
Feiyu Zhu
zhufy.jy@cn.fujitsu.com
Thu Aug 20 12:26:08 CEST 2020
1) Take use of some safe macros
Reviewed-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
Signed-off-by: Feiyu Zhu <zhufy.jy@cn.fujitsu.com>
---
testcases/kernel/syscalls/kill/kill06.c | 208 ++++++--------------------------
1 file changed, 37 insertions(+), 171 deletions(-)
diff --git a/testcases/kernel/syscalls/kill/kill06.c b/testcases/kernel/syscalls/kill/kill06.c
index 7a1e8bf..8fcc8bc 100644
--- a/testcases/kernel/syscalls/kill/kill06.c
+++ b/testcases/kernel/syscalls/kill/kill06.c
@@ -1,187 +1,53 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
+ * Copyright (c) International Business Machines Corp., 2001
*
- * Copyright (c) International Business Machines Corp., 2001
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/*
- * NAME
- * kill06.c
- *
- * DESCRIPTION
- * Test case to check the basic functionality of kill() when killing an
- * entire process group with a negative pid.
- *
- * ALGORITHM
- * call setup
- * loop if the -i option was given
- * fork 5 children
- * execute the kill system call
- * check the return value
- * if return value is -1
- * issue a FAIL message, break remaining tests and cleanup
- * if we are doing functional testing
- * if the processes were terminated with the expected signal.
- * issue a PASS message
- * otherwise
- * issue a FAIL message
- * call cleanup
- *
- * USAGE
- * kill06 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- * where, -c n : Run n copies concurrently.
- * -f : Turn off functionality Testing.
- * -i n : Execute test n times.
- * -I x : Execute test for x seconds.
- * -P x : Pause for x seconds between iterations.
- * -t : Turn on syscall timing.
+ * Test case to check the basic functionality of kill() when killing an
+ * entire process group with a negative pid.
*
* HISTORY
* 07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * This test should be run as a non-root user.
*/
-#include "test.h"
-
+#include <sys/types.h>
#include <signal.h>
-#include <errno.h>
#include <sys/wait.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "tst_test.h"
-void cleanup(void);
-void setup(void);
-void do_child(void);
-
-char *TCID = "kill06";
-int TST_TOTAL = 1;
-
-#define TEST_SIG SIGKILL
-
-int main(int ac, char **av)
+static void verify_kill(void)
{
- int lc;
- pid_t pid1, pid2;
- int exno, status, nsig, i;
-
- tst_parse_opts(ac, av, NULL, NULL);
-#ifdef UCLINUX
- maybe_run_child(&do_child, "");
-#endif
-
- setup(); /* global setup */
-
- /* The following loop checks looping state if -i option given */
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- /* reset tst_count in case we are looping */
- tst_count = 0;
- status = 1;
- exno = 1;
-
- /* Fork a process and set the process group so that */
- /* it is different from this one. Fork 5 more children. */
-
- pid1 = FORK_OR_VFORK();
- if (pid1 < 0) {
- tst_brkm(TBROK, cleanup, "Fork of first child failed");
- } else if (pid1 == 0) {
- setpgrp();
- for (i = 0; i < 5; i++) {
- pid2 = FORK_OR_VFORK();
- if (pid2 < 0) {
- tst_brkm(TBROK, cleanup, "Fork failed");
- } else if (pid2 == 0) {
-#ifdef UCLINUX
- if (self_exec(av[0], "") < 0) {
- tst_brkm(TBROK, cleanup,
- "self_exec of "
- "child failed");
- }
-#else
- do_child();
-#endif
- }
- }
- /* Kill all processes in this process group */
- TEST(kill(-getpgrp(), TEST_SIG));
- sleep(300);
-
- tst_resm(TINFO, "%d never received a"
- " signal", getpid());
- exit(exno);
- } else {
- waitpid(pid1, &status, 0);
- if (TEST_RETURN != 0) {
- tst_brkm(TFAIL, cleanup, "%s failed - errno = "
- "%d : %s", TCID, TEST_ERRNO,
- strerror(TEST_ERRNO));
- }
+ pid_t pid, child_pid[5];
+ int nsig, i, status;
+
+ pid = SAFE_FORK();
+ if (pid == 0) {
+ setpgrp();
+ for (i = 0; i < 5; i++) {
+ child_pid[i] = SAFE_FORK();
+ if (!child_pid[i])
+ pause();
}
- /*
- * Check to see if the process was terminated with the
- * expected signal.
- */
- nsig = WTERMSIG(status);
- if (!nsig) {
- tst_resm(TFAIL, "Did not receive any signal");
- } else if (nsig == TEST_SIG) {
- tst_resm(TPASS, "received expected signal %d",
- nsig);
- } else {
- tst_resm(TFAIL,
- "expected signal %d received %d",
- TEST_SIG, nsig);
- }
+ TEST(kill(-getpgrp(), SIGKILL));
+ if (TST_RET != 0)
+ tst_res(TFAIL | TTERRNO, "kill failed");
+ tst_res(TINFO, "%d never received a signal", getpid());
+ exit(0);
}
-
- cleanup();
- tst_exit();
-}
-
-/*
- * do_child()
- */
-void do_child(void)
-{
- int exno = 1;
-
- sleep(299);
-
- tst_resm(TINFO, "%d never received a" " signal", getpid());
- exit(exno);
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void setup(void)
-{
- /* Setup default signal handling */
- tst_sig(FORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
+
+ SAFE_WAITPID(pid, &status, 0);
+ nsig = WTERMSIG(status);
+ if (nsig != SIGKILL) {
+ tst_res(TFAIL, "wait: unexpected signal %d returned, "
+ "expected SIGKILL(9)", nsig);
+ return;
+ }
+ tst_res(TPASS, "receive expected signal SIGKILL(9)");
}
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * or premature exit.
- */
-void cleanup(void)
-{
-
-}
+static struct tst_test test = {
+ .forks_child = 1,
+ .test_all = verify_kill,
+};
--
1.8.3.1
More information about the ltp
mailing list