OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2004-08-04 Roland McGrath <roland@redhat.com>

Browse Source 
* posix/tst-waitid.c (test_child): Sleep a second before stopping.
	(do_test): Bump sleep to three seconds.
	(sigchld, check_sigchld): New functions.
	(do_test): Handle SIGCHLD and check for getting the right details.
This commit is contained in:
Roland McGrath 2004-08-05 01:10:42 +00:00
parent 7c11c4a146
commit f9e1a25135
1 changed files with 169 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
posix/tst-waitid.c
View File

@ -29,6 +29,10 @@
static void
test_child (void)
{
/* Wait a second to be sure the parent set his variables before we
produce a SIGCHLD. */
sleep (1);
/* First thing, we stop ourselves. */
raise (SIGSTOP);
@ -43,9 +47,87 @@ test_child (void)
# define WSTOPPED WUNTRACED
#endif
static sig_atomic_t expecting_sigchld, spurious_sigchld;
#ifdef SA_SIGINFO
static siginfo_t sigchld_info;
static void
sigchld (int signo, siginfo_t *info, void *ctx)
{
if (signo != SIGCHLD)
{
error (0, 0, "SIGCHLD handler got signal %d instead!", signo);
_exit (EXIT_FAILURE);
}
if (! expecting_sigchld)
{
spurious_sigchld = 1;
error (0, 0,
"spurious SIGCHLD: signo %d code %d status %d pid %d\n",
info->si_signo, info->si_code, info->si_status, info->si_pid);
}
else
{
sigchld_info = *info;
expecting_sigchld = 0;
}
}
static void
check_sigchld (const char *phase, int *ok, int code, int status, pid_t pid)
{
if (expecting_sigchld)
{
error (0, 0, "missing SIGCHLD on %s", phase);
*ok = EXIT_FAILURE;
expecting_sigchld = 0;
return;
}
if (sigchld_info.si_signo != SIGCHLD)
{
error (0, 0, "SIGCHLD for %s signal %d", phase, sigchld_info.si_signo);
*ok = EXIT_FAILURE;
}
if (sigchld_info.si_code != code)
{
error (0, 0, "SIGCHLD for %s code %d", phase, sigchld_info.si_code);
*ok = EXIT_FAILURE;
}
if (sigchld_info.si_status != status)
{
error (0, 0, "SIGCHLD for %s status %d", phase, sigchld_info.si_status);
*ok = EXIT_FAILURE;
}
if (sigchld_info.si_pid != pid)
{
error (0, 0, "SIGCHLD for %s pid %d", phase, sigchld_info.si_pid);
*ok = EXIT_FAILURE;
}
}
# define CHECK_SIGCHLD(phase, code_check, status_check) \
check_sigchld ((phase), &status, (code_check), (status_check), pid)
#else
# define CHECK_SIGCHLD(phase, code, status) ((void) 0)
#endif
static int
do_test (int argc, char *argv[])
{
#ifdef SA_SIGINFO
struct sigaction sa;
sa.sa_flags = SA_SIGINFO|SA_RESTART;
sa.sa_sigaction = &sigchld;
if (sigemptyset (&sa.sa_mask) < 0 || sigaction (SIGCHLD, &sa, NULL) < 0)
{
error (0, errno, "setting SIGCHLD handler");
return EXIT_FAILURE;
}
#endif
expecting_sigchld = 1;
pid_t pid = fork ();
if (pid < 0)
{
@ -59,10 +141,13 @@ do_test (int argc, char *argv[])
}
int status = EXIT_SUCCESS;
#define RETURN(ok) status = (ok); goto out;
#define RETURN(ok) \
do { if (status == EXIT_SUCCESS) status = (ok); goto out; } while (0)
/* Give the child a chance to stop. */
sleep (2);
sleep (3);
CHECK_SIGCHLD ("stopped", CLD_STOPPED, SIGSTOP);
/* Now try a wait that should not succeed. */
siginfo_t info;
@ -126,6 +211,8 @@ do_test (int argc, char *argv[])
}
}
expecting_sigchld = WCONTINUED != 0;
if (kill (pid, SIGCONT) != 0)
{
error (0, errno, "kill (%d, SIGCONT)", pid);
@ -136,6 +223,55 @@ do_test (int argc, char *argv[])
sleep (2);
#if WCONTINUED != 0
if (expecting_sigchld)
{
error (0, 0, "no SIGCHLD seen for SIGCONT (optional)");
expecting_sigchld = 0;
}
else
CHECK_SIGCHLD ("continued", CLD_CONTINUED, SIGCONT);
info.si_signo = 0; /* A successful call sets it to SIGCHLD. */
info.si_pid = -1;
info.si_status = -1;
fail = waitid (P_PID, pid, &info, WCONTINUED|WNOWAIT);
switch (fail)
{
default:
error (0, 0,
"waitid WCONTINUED|WNOWAIT returned bogus value %d\n", fail);
RETURN (EXIT_FAILURE);
case -1:
error (0, errno, "waitid WCONTINUED|WNOWAIT on continued");
RETURN (errno == ENOTSUP ? EXIT_SUCCESS : EXIT_FAILURE);
case 0:
if (info.si_signo != SIGCHLD)
{
error (0, 0, "waitid WCONTINUED|WNOWAIT on continued signal %d\n",
info.si_signo);
RETURN (EXIT_FAILURE);
}
if (info.si_code != CLD_CONTINUED)
{
error (0, 0, "waitid WCONTINUED|WNOWAIT on continued code %d\n",
info.si_code);
RETURN (EXIT_FAILURE);
}
if (info.si_status != SIGCONT)
{
error (0, 0, "waitid WCONTINUED|WNOWAIT on continued status %d\n",
info.si_status);
RETURN (EXIT_FAILURE);
}
if (info.si_pid != pid)
{
error (0, 0, "waitid WCONTINUED|WNOWAIT on continued pid %d != %d\n",
info.si_pid, pid);
RETURN (EXIT_FAILURE);
}
}
/* That should leave the CLD_CONTINUED state waiting to be seen again. */
info.si_signo = 0; /* A successful call sets it to SIGCHLD. */
info.si_pid = -1;
info.si_status = -1;
@ -174,8 +310,35 @@ do_test (int argc, char *argv[])
RETURN (EXIT_FAILURE);
}
}
/* Now try a wait that should not succeed. */
info.si_signo = 0; /* A successful call sets it to SIGCHLD. */
fail = waitid (P_PID, pid, &info, WCONTINUED|WNOHANG);
switch (fail)
{
default:
error (0, 0, "waitid returned bogus value %d\n", fail);
RETURN (EXIT_FAILURE);
case -1:
error (0, errno, "waitid WCONTINUED|WNOHANG on waited continued");
RETURN (errno == ENOTSUP ? EXIT_SUCCESS : EXIT_FAILURE);
case 0:
if (info.si_signo == 0)
break;
if (info.si_signo == SIGCHLD)
error (0, 0,
"waitid WCONTINUED|WNOHANG on waited continued status %d\n",
info.si_status);
else
error (0, 0,
"waitid WCONTINUED|WNOHANG on waited continued signal %d\n",
info.si_signo);
RETURN (EXIT_FAILURE);
}
#endif
expecting_sigchld = 1;
/* Die, child, die! */
if (kill (pid, SIGKILL) != 0)
{
@ -227,6 +390,8 @@ do_test (int argc, char *argv[])
sleep (2);
#endif
CHECK_SIGCHLD ("killed", CLD_KILLED, SIGKILL);
info.si_signo = 0; /* A successful call sets it to SIGCHLD. */
info.si_pid = -1;
info.si_status = -1;
@ -283,6 +448,8 @@ do_test (int argc, char *argv[])
#undef RETURN
out:
if (spurious_sigchld)
status = EXIT_FAILURE;
kill (pid, SIGKILL); /* Make sure it's dead if we bailed early. */
return status;
}