qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hurd: mach: compliance fixes for nanosleep

This commit is contained in:
Pino Toscano 2012-05-10 14:53:21 -07:00 committed by Roland McGrath
parent 510bbf14b4
commit a4186cffbf
2 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ChangeLog
View File

@ -1,3 +1,9 @@
2012-05-10 Pino Toscano <toscano.pino@tiscali.it>
* sysdeps/mach/nanosleep.c: Return EINVAL for invalid values of
REQUESTED_TIME. Properly set the remaining time and return EINTR
if interrupted.
2012-05-10 Thomas Schwinge <thomas@schwinge.name> 2012-05-10 Thomas Schwinge <thomas@schwinge.name>
* sysdeps/mach/hurd/Makefile ($(common-objpfx)linkobj/libc.so): * sysdeps/mach/hurd/Makefile ($(common-objpfx)linkobj/libc.so):
@ -5,13 +11,13 @@
2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org> 2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/generic/ldsodefs.h [LIBC_STACK_END_NOT_RELRO] * sysdeps/generic/ldsodefs.h [LIBC_STACK_END_NOT_RELRO]
(__libc_stack_end): Do not use attribute_relro. (__libc_stack_end): Do not use attribute_relro.
* sysdeps/mach/hurd/dl-sysdep.h (LIBC_STACK_END_NOT_RELRO): Define. * sysdeps/mach/hurd/dl-sysdep.h (LIBC_STACK_END_NOT_RELRO): Define.
* sysdeps/mach/hurd/i386/init-first.c (init): Update __libc_stack_end * sysdeps/mach/hurd/i386/init-first.c (init): Update __libc_stack_end
to libthread-provided value. to libthread-provided value.
* sysdeps/mach/hurd/dl-sysdep.c (__libc_stack_end): Do not use * sysdeps/mach/hurd/dl-sysdep.c (__libc_stack_end): Do not use
attribute_relro. attribute_relro.
2012-05-10 Thomas Schwinge <thomas@schwinge.name> 2012-05-10 Thomas Schwinge <thomas@schwinge.name>
@ -36,7 +42,7 @@
2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org> 2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/mach/hurd/setitimer.c (setitimer_locked): Use common exit * sysdeps/mach/hurd/setitimer.c (setitimer_locked): Use common exit
path instead of returning without unlocking. path instead of returning without unlocking.
* sysdeps/mach/hurd/bits/ioctls.h (_IOIW): New macro for * sysdeps/mach/hurd/bits/ioctls.h (_IOIW): New macro for
@ -63,16 +69,16 @@
* sysdeps/mach/hurd/dl-sysdep.c: Conditionalize contents on [SHARED]. * sysdeps/mach/hurd/dl-sysdep.c: Conditionalize contents on [SHARED].
* hurd/hurd/fd.h (_hurd_fd_get): Call HURD_CRITICAL_BEGIN/ * hurd/hurd/fd.h (_hurd_fd_get): Call HURD_CRITICAL_BEGIN/
HURD_CRITICAL_END around holding _hurd_dtable_lock. HURD_CRITICAL_END around holding _hurd_dtable_lock.
* sysdeps/mach/hurd/dirfd (dirfd): Likewise. * sysdeps/mach/hurd/dirfd (dirfd): Likewise.
* sysdeps/mach/hurd/opendir.c (_hurd_fd_opendir): Call * sysdeps/mach/hurd/opendir.c (_hurd_fd_opendir): Call
HURD_CRITICAL_BEGIN/HURD_CRITICAL_END around holding HURD_CRITICAL_BEGIN/HURD_CRITICAL_END around holding
d->port.lock. d->port.lock.
* hurd/catch-signal.c (hurd_catch_signal): Use sigsetjmp/siglongjmp * hurd/catch-signal.c (hurd_catch_signal): Use sigsetjmp/siglongjmp
instead of setjmp/longjmp to restore the signal mask. Call sigsetjmp instead of setjmp/longjmp to restore the signal mask. Call sigsetjmp
when handler == SIG_ERR, not when handler != SIG_ERR. when handler == SIG_ERR, not when handler != SIG_ERR.
2012-05-10 Thomas Schwinge <thomas@schwinge.name> 2012-05-10 Thomas Schwinge <thomas@schwinge.name>
@ -95,7 +101,7 @@
2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org> 2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org>
* bits/in.h (SOL_IP, SOL_IPV6, SOL_ICMPV6): New macros. * bits/in.h (SOL_IP, SOL_IPV6, SOL_ICMPV6): New macros.
2012-05-10 Thomas Schwinge <thomas@schwinge.name> 2012-05-10 Thomas Schwinge <thomas@schwinge.name>

33
sysdeps/mach/nanosleep.c
View File

@ -1,5 +1,5 @@
/* nanosleep -- sleep for a period specified with a struct timespec /* nanosleep -- sleep for a period specified with a struct timespec
Copyright (C) 2002 Free Software Foundation, Inc. Copyright (C) 2002-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -27,6 +27,15 @@ __nanosleep (const struct timespec *requested_time,
{ {
mach_port_t recv; mach_port_t recv;
struct timeval before, after; struct timeval before, after;
if (requested_time->tv_sec < 0
|| requested_time->tv_nsec < 0
|| requested_time->tv_nsec >= 1000000000)
{
errno = EINVAL;
return -1;
}
const mach_msg_timeout_t ms const mach_msg_timeout_t ms
= requested_time->tv_sec * 1000 = requested_time->tv_sec * 1000
+ (requested_time->tv_nsec + 999999) / 1000000; + (requested_time->tv_nsec + 999999) / 1000000;
@ -35,16 +44,22 @@ __nanosleep (const struct timespec *requested_time,
if (remaining && __gettimeofday (&before, NULL) < 0) if (remaining && __gettimeofday (&before, NULL) < 0)
return -1; return -1;
(void) __mach_msg (NULL, MACH_RCV_MSG|MACH_RCV_TIMEOUT|MACH_RCV_INTERRUPT, error_t err = __mach_msg (NULL, MACH_RCV_MSG|MACH_RCV_TIMEOUT|MACH_RCV_INTERRUPT,
0, 0, recv, ms, MACH_PORT_NULL); 0, 0, recv, ms, MACH_PORT_NULL);
__mach_port_destroy (mach_task_self (), recv); __mach_port_destroy (mach_task_self (), recv);
if (remaining && __gettimeofday (&after, NULL) < 0) if (err == EMACH_RCV_INTERRUPTED)
return -1;
if (remaining)
{ {
timersub (&after, &before, &after); if (remaining && __gettimeofday (&after, NULL) >= 0)
TIMEVAL_TO_TIMESPEC (&after, remaining); {
struct timeval req_time, elapsed, rem;
TIMESPEC_TO_TIMEVAL (&req_time, requested_time);
timersub (&after, &before, &elapsed);
timersub (&req_time, &elapsed, &rem);
TIMEVAL_TO_TIMESPEC (&rem, remaining);
}
errno = EINTR;
return -1;
} }
return 0; return 0;