Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

New try to fix test_time.test_AsSecondsDouble() on x86 buildbots. 

Use volatile keyword in _PyTime_AsSecondsDouble()
This commit is contained in:
Victor Stinner 2015-09-10 13:25:17 +02:00
parent 1efbebaac2
commit ff0ed3e71c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Python/pytime.c
View File

@ -332,16 +332,21 @@ _PyTime_FromMillisecondsObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t roun
double double
_PyTime_AsSecondsDouble(_PyTime_t t) _PyTime_AsSecondsDouble(_PyTime_t t)
{ {
/* volatile avoids optimization changing how numbers are rounded */
volatile double d;
if (t % SEC_TO_NS == 0) { if (t % SEC_TO_NS == 0) {
_PyTime_t secs; _PyTime_t secs;
/* Divide using integers to avoid rounding issues on the integer part. /* Divide using integers to avoid rounding issues on the integer part.
1e-9 cannot be stored exactly in IEEE 64-bit. */ 1e-9 cannot be stored exactly in IEEE 64-bit. */
secs = t / SEC_TO_NS; secs = t / SEC_TO_NS;
return (double)secs; d = (double)secs;
} }
else { else {
return (double)t / 1e9; d = (double)t;
d /= 1e9;
} }
return d;
} }
PyObject * PyObject *