[Python-checkins] cpython: Issue #23485: Add _PyTime_FromMillisecondsObject() function

Mon Mar 30 22:16:00 CEST 2015

https://hg.python.org/cpython/rev/0591cf5c9ebd
changeset: 95306:0591cf5c9ebd
user: Victor Stinner <victor.stinner at gmail.com>
date: Mon Mar 30 21:36:10 2015 +0200
summary:
 Issue #23485: Add _PyTime_FromMillisecondsObject() function
files:
 Include/pytime.h | 8 +++++++-
 Python/pytime.c | 23 ++++++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Include/pytime.h b/Include/pytime.h
--- a/Include/pytime.h
+++ b/Include/pytime.h
@@ -69,12 +69,18 @@
 /* Create a timestamp from a number of nanoseconds (C long). */
 PyAPI_FUNC(_PyTime_t) _PyTime_FromNanoseconds(PY_LONG_LONG ns);
 
-/* Convert a Python float or int to a timetamp.
+/* Convert a number of seconds (Python float or int) to a timetamp.
 Raise an exception and return -1 on error, return 0 on success. */
 PyAPI_FUNC(int) _PyTime_FromSecondsObject(_PyTime_t *t,
 PyObject *obj,
 _PyTime_round_t round);
 
+/* Convert a number of milliseconds (Python float or int, 10^-3) to a timetamp.
+ Raise an exception and return -1 on error, return 0 on success. */
+PyAPI_FUNC(int) _PyTime_FromMillisecondsObject(_PyTime_t *t,
+ PyObject *obj,
+ _PyTime_round_t round);
+
 /* Convert a timestamp to a number of seconds as a C double. */
 PyAPI_FUNC(double) _PyTime_AsSecondsDouble(_PyTime_t t);
 
diff --git a/Python/pytime.c b/Python/pytime.c
--- a/Python/pytime.c
+++ b/Python/pytime.c
@@ -203,8 +203,9 @@
 }
 #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 @@
 
 /* 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_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 @@
 }
 }
 
+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)
 {
-- 
Repository URL: https://hg.python.org/cpython
