diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2008-12-21 17:05:41 +0000 |
---|---|---|
committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-04-08 00:04:04 +0200 |
commit | 0cdc7a47609ad58922221e490b09cdba599e2b25 (patch) | |
tree | 9ad79fca06b365bceb1407ad41803ffb8cc8218c /sysdeps | |
parent | 4ce7b9d66e58f2330f5428e63f70a79a0eb225ec (diff) |
2008-12-21 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/mach/pt-timedblock.c (__pthread_timedblock):
Fix timeout computation from abstime and now.
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/mach/pt-timedblock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/mach/pt-timedblock.c b/sysdeps/mach/pt-timedblock.c index ddb8baec..6f547265 100644 --- a/sysdeps/mach/pt-timedblock.c +++ b/sysdeps/mach/pt-timedblock.c @@ -51,11 +51,11 @@ __pthread_timedblock (struct __pthread *thread, timeout = (abstime->tv_sec - now.tv_sec) * 1000; if (((abstime->tv_nsec + 999) / 1000) >= now.tv_usec) - timeout -= (((abstime->tv_nsec + 999) / 1000) - now.tv_usec + 999) / 1000; + timeout += (((abstime->tv_nsec + 999) / 1000) - now.tv_usec + 999) / 1000; else /* Need to do a carry. */ - timeout -= 1000 + ((abstime->tv_nsec + 999999) / 1000000) - - (now.tv_usec + 999) / 1000; + timeout -= (now.tv_usec + 999) / 1000 - + ((abstime->tv_nsec + 999999) / 1000000); err = __mach_msg (&msg, MACH_RCV_MSG | MACH_RCV_TIMEOUT, 0, sizeof msg, thread->wakeupmsg.msgh_remote_port, |