[LTP] [PATCH 6/8] waitpid12: use the new API
Stanislav Kholmanskikh
stanislav.kholmanskikh@oracle.com
Fri Jul 15 16:39:47 CEST 2016
Signed-off-by: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
---
testcases/kernel/syscalls/waitpid/waitpid12.c | 250 ++++++-------------------
1 files changed, 60 insertions(+), 190 deletions(-)
diff --git a/testcases/kernel/syscalls/waitpid/waitpid12.c b/testcases/kernel/syscalls/waitpid/waitpid12.c
index bf64662..a5b1fe9 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid12.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid12.c
@@ -1,184 +1,88 @@
/*
+ * 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 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.
*
- * 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
- * waitpid12.c
- *
- * DESCRIPTION
- * Tests to see if pid's returned from fork and waitpid are same
- *
- * ALGORITHM
- * Check proper functioning of waitpid with pid = -1 and arg = WNOHANG
- *
- * USAGE: <for command-line>
- * waitpid12 [-c n] [-t]
- * where, -c n : Run n copies concurrently.
- * -t : Turn on syscall timing.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
*
* History
* 07/2001 John George
* -Ported
* 04/2002 wjhuie sigset testx for SIG_ERR not < 0, TPASS|TFAIL issued
* 04/2002 wjhuie sigset cleanups
- *
- * Restrictions
- * None
*/
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-#include <sys/wait.h>
-#include "test.h"
-
-#define MAXKIDS 8
-
-char *TCID = "waitpid12";
-int TST_TOTAL = 1;
+/*
-volatile int intintr;
-static void setup(void);
-static void cleanup(void);
-static void inthandlr();
-static void wait_for_parent(void);
-static void do_exit(void);
-static void setup_sigint(void);
-#ifdef UCLINUX
-static void do_exit_uclinux(void);
-#endif
+ * DESCRIPTION
+ * Tests to see if pids returned from fork and waitpid are same
+ *
+ * ALGORITHM
+ * Check proper functioning of waitpid with pid = -1 and arg = WNOHANG
+ */
-static int fail;
+#include "waitpid_common.h"
-int main(int argc, char **argv)
+static void do_child_1(void)
{
int kid_count, ret_val, status;
int i, j, k, found;
- int group1, group2;
- int fork_kid_pid[MAXKIDS], wait_kid_pid[MAXKIDS];
- int pid;
-
- tst_parse_opts(argc, argv, NULL, NULL);
-
-#ifdef UCLINUX
- maybe_run_child(&do_exit_uclinux, "");
-#endif
-
- setup();
+ pid_t group;
+ pid_t wait_kid_pid[MAXKIDS];
+ int fail = 0;
- tst_count = 0;
- fail = 0;
-
- /*
- * Need to have test run from child as test driver causes
- * test to be a session leader and setpgrp fails.
- */
-
- pid = FORK_OR_VFORK();
- if (pid > 0) {
- waitpid(pid, &status, 0);
- if (WEXITSTATUS(status) != 0) {
- tst_resm(TFAIL, "child returned bad status");
- fail = 1;
- }
- if (fail)
- tst_resm(TFAIL, "%s FAILED", TCID);
- else
- tst_resm(TPASS, "%s PASSED", TCID);
- cleanup();
- tst_exit();
- } else if (pid < 0) {
- tst_brkm(TBROK, cleanup, "fork failed");
- }
-
- /*
- * Set up to catch SIGINT. The kids will wait till a SIGINT
- * has been received before they proceed.
- */
- setup_sigint();
-
- group1 = getpgrp();
+ group = SAFE_GETPGID(0);
for (kid_count = 0; kid_count < MAXKIDS; kid_count++) {
if (kid_count == (MAXKIDS / 2))
- group2 = setpgrp();
+ SAFE_SETPGID(0, 0);
- intintr = 0;
- ret_val = FORK_OR_VFORK();
- if (ret_val == 0) {
-#ifdef UCLINUX
- if (self_exec(argv[0], "") < 0)
- tst_resm(TFAIL, "self_exec kid %d "
- "failed", kid_count);
-#else
- do_exit();
-#endif
- }
-
- if (ret_val < 0)
- tst_resm(TFAIL | TERRNO, "forking kid %d failed",
- kid_count);
+ ret_val = SAFE_FORK();
+ if (ret_val == 0)
+ do_exit(0);
- /* parent */
fork_kid_pid[kid_count] = ret_val;
}
/* Check that waitpid with WNOHANG returns zero */
ret_val = waitpid(0, &status, WNOHANG);
if (ret_val != 0) {
- tst_resm(TFAIL, "Waitpid returned wrong value");
- tst_resm(TFAIL, "Expected 0 got %d", ret_val);
+ tst_res(TFAIL, "Waitpid returned wrong value");
+ tst_res(TFAIL, "Expected 0 got %d", ret_val);
fail = 1;
}
-#ifdef UCLINUX
- /* Give the kids a chance to setup SIGINT again, since this is
- * cleared by exec().
- */
- sleep(3);
-#endif
- /* Now send all the kids a SIGINT to tell them to proceed */
- for (i = 0; i < MAXKIDS; i++)
- if (kill(fork_kid_pid[i], SIGINT) < 0)
- tst_resm(TFAIL | TERRNO, "killing child %d failed", i);
+ TST_CHECKPOINT_WAKE2(0, MAXKIDS);
/*
* Wait till all kids have terminated. Stash away their
- * pid's in an array.
+ * pids in an array.
*/
kid_count = 0;
errno = 0;
- sleep(2);
while (((ret_val = waitpid(0, &status, WNOHANG)) != -1) ||
(errno == EINTR)) {
if ((ret_val == -1) || (ret_val == 0))
continue;
if (!WIFEXITED(status)) {
- tst_resm(TFAIL, "Child %d did not exit "
+ tst_res(TFAIL, "Child %d did not exit "
"normally", ret_val);
fail = 1;
} else {
if (WEXITSTATUS(status) != 3) {
- tst_resm(TFAIL, "Child %d exited with "
+ tst_res(TFAIL, "Child %d exited with "
"wrong status", ret_val);
- tst_resm(TFAIL, "Expected 3 got %d",
+ tst_res(TFAIL, "Expected 3 got %d",
WEXITSTATUS(status));
fail = 1;
}
@@ -200,22 +104,22 @@ int main(int argc, char **argv)
}
}
if (!found) {
- tst_resm(TFAIL, "Did not find a wait_kid_pid "
+ tst_res(TFAIL, "Did not find a wait_kid_pid "
"for the fork_kid_pid of %d", wait_kid_pid[i]);
for (k = 0; k < MAXKIDS; k++)
- tst_resm(TFAIL, "fork_kid_pid[%d] = "
+ tst_res(TFAIL, "fork_kid_pid[%d] = "
"%d", k, fork_kid_pid[k]);
for (k = 0; k < kid_count; k++)
- tst_resm(TFAIL, "wait_kid_pid[%d] = "
+ tst_res(TFAIL, "wait_kid_pid[%d] = "
"%d", k, wait_kid_pid[k]);
fail = 1;
}
}
if (kid_count != (MAXKIDS / 2)) {
- tst_resm(TFAIL, "Wrong number of children waited on "
+ tst_res(TFAIL, "Wrong number of children waited on "
"for pid = 0");
- tst_resm(TFAIL, "Expected 4 got %d", kid_count);
+ tst_res(TFAIL, "Expected 4 got %d", kid_count);
fail = 1;
}
@@ -223,20 +127,20 @@ int main(int argc, char **argv)
kid_count = 0;
errno = 0;
- while (((ret_val = waitpid(-(group1), &status, WNOHANG)) !=
+ while (((ret_val = waitpid(-(group), &status, WNOHANG)) !=
-1) || (errno == EINTR)) {
if (ret_val == -1 || ret_val == 0)
continue;
if (!WIFEXITED(status)) {
- tst_resm(TFAIL, "Child %d did not exit "
+ tst_res(TFAIL, "Child %d did not exit "
"normally", ret_val);
fail = 1;
} else {
if (WEXITSTATUS(status) != 3) {
- tst_resm(TFAIL, "Child %d exited with "
+ tst_res(TFAIL, "Child %d exited with "
"wrong status", ret_val);
- tst_resm(TFAIL, "Expected 3 got %d",
+ tst_res(TFAIL, "Expected 3 got %d",
WEXITSTATUS(status));
fail = 1;
}
@@ -258,72 +162,38 @@ int main(int argc, char **argv)
}
}
if (!found) {
- tst_resm(TFAIL, "Did not find a wait_kid_pid "
+ tst_res(TFAIL, "Did not find a wait_kid_pid "
"for the fork_kid_pid of %d", fork_kid_pid[j]);
for (k = 0; k < MAXKIDS; k++)
- tst_resm(TFAIL, "fork_kid_pid[%d] = "
+ tst_res(TFAIL, "fork_kid_pid[%d] = "
"%d", k, fork_kid_pid[k]);
for (k = 0; k < kid_count; k++)
- tst_resm(TFAIL, "wait_kid_pid[%d] = "
+ tst_res(TFAIL, "wait_kid_pid[%d] = "
"%d", k, wait_kid_pid[k]);
fail = 1;
}
}
if (kid_count != (MAXKIDS / 2)) {
- tst_resm(TFAIL, "Wrong number of children waited on "
+ tst_res(TFAIL, "Wrong number of children waited on "
"for pid = 0");
- tst_resm(TFAIL, "Expected 4 got %d", kid_count);
+ tst_res(TFAIL, "Expected 4 got %d", kid_count);
fail = 1;
}
if (fail)
- tst_resm(TFAIL, "Test FAILED");
+ tst_res(TFAIL, "Test FAILED");
else
- tst_resm(TPASS, "Test PASSED");
-
- tst_exit();
-}
-
-static void setup_sigint(void)
-{
- if (signal(SIGINT, inthandlr) == SIG_ERR)
- tst_brkm(TFAIL | TERRNO, NULL, "signal SIGINT failed");
-}
-
-static void setup(void)
-{
- tst_sig(FORK, DEF_HANDLER, cleanup);
+ tst_res(TPASS, "Test PASSED");
- TEST_PAUSE;
-}
-
-static void cleanup(void)
-{
-}
-
-static void inthandlr(void)
-{
- intintr++;
-}
+ memset(fork_kid_pid, 0, sizeof(*fork_kid_pid) * MAXKIDS);
-static void wait_for_parent(void)
-{
- int testvar;
-
- while (!intintr)
- testvar = 0;
+ exit(fail);
}
-static void do_exit(void)
-{
- wait_for_parent();
- exit(3);
-}
-
-#ifdef UCLINUX
-static void do_exit_uclinux(void)
-{
- setup_sigint();
- do_exit();
-}
-#endif
+static struct tst_test test = {
+ .tid = "waitpid12",
+ .forks_child = 1,
+ .needs_checkpoints = 1,
+ .cleanup = cleanup,
+ .test_all = waitpid_test,
+};
--
1.7.1
More information about the ltp
mailing list