diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-29 10:09:14 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-29 10:10:32 +0200 |
| commit | 81b1c8cbb5b486da60e81ba8435ddf08e554206a (patch) | |
| tree | 7a84d5eec3cf3816d07505b261cfb58b9dd33926 | |
| parent | 269e4c17cd1031d3feb5adc608edf7c2b19b3f41 (diff) | |
hurd: Simplify usleep timeout computation
as suggested by Andreas Schwab
* sysdeps/mach/usleep.c (usleep): Divide timeout in an overflow-safe way.
| -rw-r--r-- | sysdeps/mach/usleep.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sysdeps/mach/usleep.c b/sysdeps/mach/usleep.c index 75514b2e35..bb989e2733 100644 --- a/sysdeps/mach/usleep.c +++ b/sysdeps/mach/usleep.c @@ -27,16 +27,13 @@ usleep (useconds_t useconds) { mach_port_t recv; int cancel_oldtype; - useconds_t useconds_up = useconds + 999; - - if (useconds_up < useconds) - useconds_up = UINT32_MAX; + mach_msg_timeout_t timeout = useconds / 1000 + (useconds % 1000 != 0); recv = __mach_reply_port (); cancel_oldtype = LIBC_CANCEL_ASYNC(); (void) __mach_msg (NULL, MACH_RCV_MSG|MACH_RCV_TIMEOUT|MACH_RCV_INTERRUPT, - 0, 0, recv, useconds_up / 1000, MACH_PORT_NULL); + 0, 0, recv, timeout, MACH_PORT_NULL); LIBC_CANCEL_RESET (cancel_oldtype); __mach_port_destroy (mach_task_self (), recv); |