From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>, Roland McGrath <roland@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Fix test-skeleton.c timeout handling
Date: Thu, 19 Jun 2003 11:37:00 -0000 [thread overview]
Message-ID: <20030619094554.GS20507@sunsite.ms.mff.cuni.cz> (raw)
Hi!
If waitpid returns 0, timeout_handler would still happily access the random
value in status.
2003-06-19 Jakub Jelinek <jakub@redhat.com>
* test-skeleton.c (timeout_handler): If waitpid returned 0,
retry once after a second. If killed == 0, assume
WTERMSIG (status) == SIGKILL.
--- libc/test-skeleton.c.jj 2003-06-07 19:23:01.000000000 -0400
+++ libc/test-skeleton.c 2003-06-19 05:40:53.000000000 -0400
@@ -140,9 +140,14 @@ timeout_handler (int sig __attribute__ (
/* Wait for it to terminate. */
killed = waitpid (pid, &status, WNOHANG|WUNTRACED);
+ if (killed == 0)
+ {
+ sleep (1);
+ killed = waitpid (pid, &status, WNOHANG|WUNTRACED);
+ }
if (killed != 0 && killed != pid)
{
- perror ("Failed to killed test process");
+ perror ("Failed to kill test process");
exit (1);
}
@@ -156,7 +161,7 @@ timeout_handler (int sig __attribute__ (
exit (0);
#endif
- if (WIFSIGNALED (status) && WTERMSIG (status) == SIGKILL)
+ if (killed == 0 || (WIFSIGNALED (status) && WTERMSIG (status) == SIGKILL))
fputs ("Timed out: killed the child process\n", stderr);
else if (WIFSTOPPED (status))
fprintf (stderr, "Timed out: the child process was %s\n",
Jakub
next reply other threads:[~2003-06-19 11:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-06-19 11:37 Jakub Jelinek [this message]
2003-06-25 7:56 ` Ulrich Drepper
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=20030619094554.GS20507@sunsite.ms.mff.cuni.cz \
--to=jakub@redhat.com \
--cc=drepper@redhat.com \
--cc=libc-hacker@sources.redhat.com \
--cc=roland@redhat.com \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).