greg/cpython
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Issue #23485: Add _PyTime_FromMillisecondsObject() function

Browse Source
This commit is contained in:
Victor Stinner
2015-03-30 21:36:10 +02:00
parent 749a6a85c6
commit fa09beb150
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Python/pytime.c
View File

@@ -203,8 +203,9 @@ _PyTime_FromTimeval(_PyTime_t *tp, struct timeval *tv, int raise)
}
#endif
int
_PyTime_FromSecondsObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round)
static int
_PyTime_FromObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round,
long to_nanoseconds)
{
if (PyFloat_Check(obj)) {
/* volatile avoids unsafe optimization on float enabled by gcc -O3 */
@@ -212,7 +213,7 @@ _PyTime_FromSecondsObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round)
/* convert to a number of nanoseconds */
d = PyFloat_AsDouble(obj);
d *= 1e9;
d *= to_nanoseconds;
if (round == _PyTime_ROUND_CEILING)
d = ceil(d);
@@ -242,8 +243,8 @@ _PyTime_FromSecondsObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round)
_PyTime_overflow();
return -1;
}
*t = sec * SEC_TO_NS;
if (*t / SEC_TO_NS != sec) {
*t = sec * to_nanoseconds;
if (*t / to_nanoseconds != sec) {
_PyTime_overflow();
return -1;
}
@@ -251,6 +252,18 @@ _PyTime_FromSecondsObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round)
}
}
int
_PyTime_FromSecondsObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round)
{
return _PyTime_FromObject(t, obj, round, SEC_TO_NS);
}
int
_PyTime_FromMillisecondsObject(_PyTime_t *t, PyObject *obj, _PyTime_round_t round)
{
return _PyTime_FromObject(t, obj, round, MS_TO_NS);
}
double
_PyTime_AsSecondsDouble(_PyTime_t t)
{