system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

NaCl: Fix lll_futex_timed_wait timeout calculation.

Browse Source
This commit is contained in:
Roland McGrath 2015-05-28 15:35:45 -07:00
parent 58007e9e68
commit f21754707c
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2015-05-28 Roland McGrath <roland@hack.frob.com>
* sysdeps/nacl/lowlevellock-futex.h (lll_futex_timed_wait):
Add TIMEOUT to current time, don't subtract it.
2015-05-28 H.J. Lu <hongjiu.lu@intel.com>
[BZ #18422]

10
sysdeps/nacl/lowlevellock-futex.h
View File

@ -48,12 +48,12 @@
&& __glibc_likely ((_err = __nacl_irt_clock.clock_gettime \
(CLOCK_REALTIME, &_ts)) == 0)) \
{ \
_ts.tv_sec -= _to->tv_sec; \
_ts.tv_nsec -= _to->tv_nsec; \
while (_ts.tv_nsec < 0) \
_ts.tv_sec += _to->tv_sec; \
_ts.tv_nsec += _to->tv_nsec; \
while (_ts.tv_nsec >= 1000000000) \
{ \
_ts.tv_nsec += 1000000000; \
--_ts.tv_sec; \
_ts.tv_nsec -= 1000000000; \
++_ts.tv_sec; \
} \
_to = &_ts; \
} \