Skip to content

Commit

Permalink
* sysdeps/unix/sysv/linux/sigwait.c (do_sigwait): Restart system
Browse files Browse the repository at this point in the history
	call if it returned EINTR.
  • Loading branch information
Ulrich Drepper committed Aug 1, 2005
1 parent 943525d commit 4978fb0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2005-08-01 Ulrich Drepper <drepper@redhat.com>

* sysdeps/unix/sysv/linux/sigwait.c (do_sigwait): Restart system
call if it returned EINTR.

2005-07-31 Ulrich Drepper <drepper@redhat.com>

* sysdeps/x86_64/dl-machine.h (elf_machine_load_address): Move
Expand Down
15 changes: 10 additions & 5 deletions sysdeps/unix/sysv/linux/sigwait.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 1997,1998,2000,2002,2003,2004 Free Software Foundation, Inc.
/* Copyright (C) 1997,1998,2000,2002-2004,2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -58,8 +58,11 @@ do_sigwait (const sigset_t *set, int *sig)
real size of the user-level sigset_t. */
#ifdef INTERNAL_SYSCALL
INTERNAL_SYSCALL_DECL (err);
ret = INTERNAL_SYSCALL (rt_sigtimedwait, err, 4, CHECK_SIGSET (set),
NULL, NULL, _NSIG / 8);
do
ret = INTERNAL_SYSCALL (rt_sigtimedwait, err, 4, CHECK_SIGSET (set),
NULL, NULL, _NSIG / 8);
while (INTERNAL_SYSCALL_ERROR_P (ret, err)
&& INTERNAL_SYSCALL_ERRNO (ret, err) == EINTR);
if (! INTERNAL_SYSCALL_ERROR_P (ret, err))
{
*sig = ret;
Expand All @@ -68,8 +71,10 @@ do_sigwait (const sigset_t *set, int *sig)
else
ret = INTERNAL_SYSCALL_ERRNO (ret, err);
#else
ret = INLINE_SYSCALL (rt_sigtimedwait, 4, CHECK_SIGSET (set),
NULL, NULL, _NSIG / 8);
do
ret = INLINE_SYSCALL (rt_sigtimedwait, 4, CHECK_SIGSET (set),
NULL, NULL, _NSIG / 8);
while (ret == -1 && errno == EINTR);
if (ret != -1)
{
*sig = ret;
Expand Down

0 comments on commit 4978fb0

Please sign in to comment.