Remove internal _PyTime_AsLong() function (#141053)

vstinner · web-flow · commit 8d55faf2d68b · 2025-11-05T18:37:06.000+01:00
* Replace _PyTime_AsLong() with PyLong_FromInt64()
* Replace _PyTime_FromLong() with PyLong_AsInt64().
diff --git a/Include/internal/pycore_time.h b/Include/internal/pycore_time.h
@@ -147,11 +147,6 @@ extern int _PyTime_FromSecondsDouble(
 // Clamp to [PyTime_MIN; PyTime_MAX] on overflow.
 extern PyTime_t _PyTime_FromMicrosecondsClamp(PyTime_t us);
 
-// Create a timestamp from a Python int object (number of nanoseconds).
-// Export for '_lsprof' shared extension.
-PyAPI_FUNC(int) _PyTime_FromLong(PyTime_t *t,
-    PyObject *obj);
-
 // Convert a number of seconds (Python float or int) to a timestamp.
 // Raise an exception and return -1 on error, return 0 on success.
 // Export for '_socket' shared extension.
@@ -182,10 +177,6 @@ extern PyTime_t _PyTime_As100Nanoseconds(PyTime_t t,
     _PyTime_round_t round);
 #endif
 
-// Convert a timestamp (number of nanoseconds) as a Python int object.
-// Export for '_testinternalcapi' shared extension.
-PyAPI_FUNC(PyObject*) _PyTime_AsLong(PyTime_t t);
-
 #ifndef MS_WINDOWS
 // Create a timestamp from a timeval structure.
 // Raise an exception and return -1 on overflow, return 0 on success.
diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
@@ -6,7 +6,7 @@
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
 #include "pycore_ceval.h"         // _PyEval_SetProfile()
 #include "pycore_pystate.h"       // _PyThreadState_GET()
-#include "pycore_time.h"          // _PyTime_FromLong()
+#include "pycore_time.h"          // _PyTime_FromSecondsObject()
 #include "pycore_typeobject.h"    // _PyType_GetModuleState()
 #include "pycore_unicodeobject.h" // _PyUnicode_EqualToASCIIString()
 
@@ -111,7 +111,7 @@ static PyTime_t CallExternalTimer(ProfilerObject *pObj)
     if (pObj->externalTimerUnit > 0.0) {
         /* interpret the result as an integer that will be scaled
            in profiler_getstats() */
-        err = _PyTime_FromLong(&result, o);
+        err = PyLong_AsInt64(o, &result);
     }
     else {
         /* interpret the result as a double measured in seconds.
diff --git a/Modules/_testinternalcapi/pytime.c b/Modules/_testinternalcapi/pytime.c
@@ -17,7 +17,7 @@ test_pytime_fromseconds(PyObject *self, PyObject *args)
         return NULL;
     }
     PyTime_t ts = _PyTime_FromSeconds(seconds);
-    return _PyTime_AsLong(ts);
+    return PyLong_FromInt64(ts);
 }
 
 static int
@@ -49,7 +49,7 @@ test_pytime_fromsecondsobject(PyObject *self, PyObject *args)
     if (_PyTime_FromSecondsObject(&ts, obj, round) == -1) {
         return NULL;
     }
-    return _PyTime_AsLong(ts);
+    return PyLong_FromInt64(ts);
 }
 
 static PyObject *
@@ -64,7 +64,7 @@ test_PyTime_AsTimeval(PyObject *self, PyObject *args)
         return NULL;
     }
     PyTime_t t;
-    if (_PyTime_FromLong(&t, obj) < 0) {
+    if (PyLong_AsInt64(obj, &t) < 0) {
         return NULL;
     }
     struct timeval tv;
@@ -91,7 +91,7 @@ test_PyTime_AsTimeval_clamp(PyObject *self, PyObject *args)
         return NULL;
     }
     PyTime_t t;
-    if (_PyTime_FromLong(&t, obj) < 0) {
+    if (PyLong_AsInt64(obj, &t) < 0) {
         return NULL;
     }
     struct timeval tv;
@@ -113,7 +113,7 @@ test_PyTime_AsTimespec(PyObject *self, PyObject *args)
         return NULL;
     }
     PyTime_t t;
-    if (_PyTime_FromLong(&t, obj) < 0) {
+    if (PyLong_AsInt64(obj, &t) < 0) {
         return NULL;
     }
     struct timespec ts;
@@ -131,7 +131,7 @@ test_PyTime_AsTimespec_clamp(PyObject *self, PyObject *args)
         return NULL;
     }
     PyTime_t t;
-    if (_PyTime_FromLong(&t, obj) < 0) {
+    if (PyLong_AsInt64(obj, &t) < 0) {
         return NULL;
     }
     struct timespec ts;
@@ -149,14 +149,14 @@ test_PyTime_AsMilliseconds(PyObject *self, PyObject *args)
         return NULL;
     }
     PyTime_t t;
-    if (_PyTime_FromLong(&t, obj) < 0) {
+    if (PyLong_AsInt64(obj, &t) < 0) {
         return NULL;
     }
     if (check_time_rounding(round) < 0) {
         return NULL;
     }
     PyTime_t ms = _PyTime_AsMilliseconds(t, round);
-    return _PyTime_AsLong(ms);
+    return PyLong_FromInt64(ms);
 }
 
 static PyObject *
@@ -168,14 +168,14 @@ test_PyTime_AsMicroseconds(PyObject *self, PyObject *args)
         return NULL;
     }
     PyTime_t t;
-    if (_PyTime_FromLong(&t, obj) < 0) {
+    if (PyLong_AsInt64(obj, &t) < 0) {
         return NULL;
     }
     if (check_time_rounding(round) < 0) {
         return NULL;
     }
     PyTime_t us = _PyTime_AsMicroseconds(t, round);
-    return _PyTime_AsLong(us);
+    return PyLong_FromInt64(us);
 }
 
 static PyObject *
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
@@ -128,7 +128,7 @@ time_time_ns(PyObject *self, PyObject *unused)
     if (PyTime_Time(&t) < 0) {
         return NULL;
     }
-    return _PyTime_AsLong(t);
+    return PyLong_FromInt64(t);
 }
 
 PyDoc_STRVAR(time_ns_doc,
@@ -261,7 +261,7 @@ time_clock_gettime_ns_impl(PyObject *module, clockid_t clk_id)
     if (_PyTime_FromTimespec(&t, &ts) < 0) {
         return NULL;
     }
-    return _PyTime_AsLong(t);
+    return PyLong_FromInt64(t);
 }
 #endif   /* HAVE_CLOCK_GETTIME */
 
@@ -310,7 +310,7 @@ time_clock_settime_ns(PyObject *self, PyObject *args)
         return NULL;
     }
 
-    if (_PyTime_FromLong(&t, obj) < 0) {
+    if (PyLong_AsInt64(obj, &t) < 0) {
         return NULL;
     }
     if (_PyTime_AsTimespec(t, &ts) == -1) {
@@ -1216,7 +1216,7 @@ time_monotonic_ns(PyObject *self, PyObject *unused)
     if (PyTime_Monotonic(&t) < 0) {
         return NULL;
     }
-    return _PyTime_AsLong(t);
+    return PyLong_FromInt64(t);
 }
 
 PyDoc_STRVAR(monotonic_ns_doc,
@@ -1248,7 +1248,7 @@ time_perf_counter_ns(PyObject *self, PyObject *unused)
     if (PyTime_PerfCounter(&t) < 0) {
         return NULL;
     }
-    return _PyTime_AsLong(t);
+    return PyLong_FromInt64(t);
 }
 
 PyDoc_STRVAR(perf_counter_ns_doc,
@@ -1437,7 +1437,7 @@ time_process_time_ns(PyObject *module, PyObject *unused)
     if (py_process_time(state, &t, NULL) < 0) {
         return NULL;
     }
-    return _PyTime_AsLong(t);
+    return PyLong_FromInt64(t);
 }
 
 PyDoc_STRVAR(process_time_ns_doc,
@@ -1610,7 +1610,7 @@ time_thread_time_ns(PyObject *self, PyObject *unused)
     if (_PyTime_GetThreadTimeWithInfo(&t, NULL) < 0) {
         return NULL;
     }
-    return _PyTime_AsLong(t);
+    return PyLong_FromInt64(t);
 }
 
 PyDoc_STRVAR(thread_time_ns_doc,
diff --git a/Python/pytime.c b/Python/pytime.c
@@ -2,7 +2,7 @@
 #include "pycore_initconfig.h"    // _PyStatus_ERR
 #include "pycore_pystate.h"       // _Py_AssertHoldsTstate()
 #include "pycore_runtime.h"       // _PyRuntime
-#include "pycore_time.h"          // PyTime_t
+#include "pycore_time.h"          // export _PyLong_FromTime_t()
 
 #include <time.h>                 // gmtime_r()
 #ifdef HAVE_SYS_TIME_H
@@ -472,31 +472,6 @@ _PyTime_FromMicrosecondsClamp(PyTime_t us)
 }
 
 
-int
-_PyTime_FromLong(PyTime_t *tp, PyObject *obj)
-{
-    if (!PyLong_Check(obj)) {
-        PyErr_Format(PyExc_TypeError, "expect int, got %s",
-                     Py_TYPE(obj)->tp_name);
-        return -1;
-    }
-
-    static_assert(sizeof(long long) == sizeof(PyTime_t),
-                  "PyTime_t is not long long");
-    long long nsec = PyLong_AsLongLong(obj);
-    if (nsec == -1 && PyErr_Occurred()) {
-        if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
-            pytime_overflow();
-        }
-        return -1;
-    }
-
-    PyTime_t t = (PyTime_t)nsec;
-    *tp = t;
-    return 0;
-}
-
-
 #ifdef HAVE_CLOCK_GETTIME
 static int
 pytime_fromtimespec(PyTime_t *tp, const struct timespec *ts, int raise_exc)
@@ -658,14 +633,6 @@ PyTime_AsSecondsDouble(PyTime_t ns)
 }
 
 
-PyObject *
-_PyTime_AsLong(PyTime_t ns)
-{
-    static_assert(sizeof(long long) >= sizeof(PyTime_t),
-                  "PyTime_t is larger than long long");
-    return PyLong_FromLongLong((long long)ns);
-}
-
 int
 _PyTime_FromSecondsDouble(double seconds, _PyTime_round_t round, PyTime_t *result)
 {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ test_pytime_fromseconds(PyObject self, PyObject args)`
`17`	`17`	`return NULL;`
`18`	`18`	`}`
`19`	`19`	`PyTime_t ts = _PyTime_FromSeconds(seconds);`
`20`		`- return _PyTime_AsLong(ts);`
	`20`	`+ return PyLong_FromInt64(ts);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`static int`
`@@ -49,7 +49,7 @@ test_pytime_fromsecondsobject(PyObject self, PyObject args)`
`49`	`49`	`if (_PyTime_FromSecondsObject(&ts, obj, round) == -1) {`
`50`	`50`	`return NULL;`
`51`	`51`	`}`
`52`		`- return _PyTime_AsLong(ts);`
	`52`	`+ return PyLong_FromInt64(ts);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`static PyObject *`
`@@ -64,7 +64,7 @@ test_PyTime_AsTimeval(PyObject self, PyObject args)`
`64`	`64`	`return NULL;`
`65`	`65`	`}`
`66`	`66`	`PyTime_t t;`
`67`		`- if (_PyTime_FromLong(&t, obj) < 0) {`
	`67`	`+ if (PyLong_AsInt64(obj, &t) < 0) {`
`68`	`68`	`return NULL;`
`69`	`69`	`}`
`70`	`70`	`struct timeval tv;`
`@@ -91,7 +91,7 @@ test_PyTime_AsTimeval_clamp(PyObject self, PyObject args)`
`91`	`91`	`return NULL;`
`92`	`92`	`}`
`93`	`93`	`PyTime_t t;`
`94`		`- if (_PyTime_FromLong(&t, obj) < 0) {`
	`94`	`+ if (PyLong_AsInt64(obj, &t) < 0) {`
`95`	`95`	`return NULL;`
`96`	`96`	`}`
`97`	`97`	`struct timeval tv;`
`@@ -113,7 +113,7 @@ test_PyTime_AsTimespec(PyObject self, PyObject args)`
`113`	`113`	`return NULL;`
`114`	`114`	`}`
`115`	`115`	`PyTime_t t;`
`116`		`- if (_PyTime_FromLong(&t, obj) < 0) {`
	`116`	`+ if (PyLong_AsInt64(obj, &t) < 0) {`
`117`	`117`	`return NULL;`
`118`	`118`	`}`
`119`	`119`	`struct timespec ts;`
`@@ -131,7 +131,7 @@ test_PyTime_AsTimespec_clamp(PyObject self, PyObject args)`
`131`	`131`	`return NULL;`
`132`	`132`	`}`
`133`	`133`	`PyTime_t t;`
`134`		`- if (_PyTime_FromLong(&t, obj) < 0) {`
	`134`	`+ if (PyLong_AsInt64(obj, &t) < 0) {`
`135`	`135`	`return NULL;`
`136`	`136`	`}`
`137`	`137`	`struct timespec ts;`
`@@ -149,14 +149,14 @@ test_PyTime_AsMilliseconds(PyObject self, PyObject args)`
`149`	`149`	`return NULL;`
`150`	`150`	`}`
`151`	`151`	`PyTime_t t;`
`152`		`- if (_PyTime_FromLong(&t, obj) < 0) {`
	`152`	`+ if (PyLong_AsInt64(obj, &t) < 0) {`
`153`	`153`	`return NULL;`
`154`	`154`	`}`
`155`	`155`	`if (check_time_rounding(round) < 0) {`
`156`	`156`	`return NULL;`
`157`	`157`	`}`
`158`	`158`	`PyTime_t ms = _PyTime_AsMilliseconds(t, round);`
`159`		`- return _PyTime_AsLong(ms);`
	`159`	`+ return PyLong_FromInt64(ms);`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`static PyObject *`
`@@ -168,14 +168,14 @@ test_PyTime_AsMicroseconds(PyObject self, PyObject args)`
`168`	`168`	`return NULL;`
`169`	`169`	`}`
`170`	`170`	`PyTime_t t;`
`171`		`- if (_PyTime_FromLong(&t, obj) < 0) {`
	`171`	`+ if (PyLong_AsInt64(obj, &t) < 0) {`
`172`	`172`	`return NULL;`
`173`	`173`	`}`
`174`	`174`	`if (check_time_rounding(round) < 0) {`
`175`	`175`	`return NULL;`
`176`	`176`	`}`
`177`	`177`	`PyTime_t us = _PyTime_AsMicroseconds(t, round);`
`178`		`- return _PyTime_AsLong(us);`
	`178`	`+ return PyLong_FromInt64(us);`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`static PyObject *`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ time_time_ns(PyObject self, PyObject unused)`
`128`	`128`	`if (PyTime_Time(&t) < 0) {`
`129`	`129`	`return NULL;`
`130`	`130`	`}`
`131`		`- return _PyTime_AsLong(t);`
	`131`	`+ return PyLong_FromInt64(t);`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`PyDoc_STRVAR(time_ns_doc,`
`@@ -261,7 +261,7 @@ time_clock_gettime_ns_impl(PyObject *module, clockid_t clk_id)`
`261`	`261`	`if (_PyTime_FromTimespec(&t, &ts) < 0) {`
`262`	`262`	`return NULL;`
`263`	`263`	`}`
`264`		`- return _PyTime_AsLong(t);`
	`264`	`+ return PyLong_FromInt64(t);`
`265`	`265`	`}`
`266`	`266`	`#endif /* HAVE_CLOCK_GETTIME */`
`267`	`267`
`@@ -310,7 +310,7 @@ time_clock_settime_ns(PyObject self, PyObject args)`
`310`	`310`	`return NULL;`
`311`	`311`	`}`
`312`	`312`
`313`		`- if (_PyTime_FromLong(&t, obj) < 0) {`
	`313`	`+ if (PyLong_AsInt64(obj, &t) < 0) {`
`314`	`314`	`return NULL;`
`315`	`315`	`}`
`316`	`316`	`if (_PyTime_AsTimespec(t, &ts) == -1) {`
`@@ -1216,7 +1216,7 @@ time_monotonic_ns(PyObject self, PyObject unused)`
`1216`	`1216`	`if (PyTime_Monotonic(&t) < 0) {`
`1217`	`1217`	`return NULL;`
`1218`	`1218`	`}`
`1219`		`- return _PyTime_AsLong(t);`
	`1219`	`+ return PyLong_FromInt64(t);`
`1220`	`1220`	`}`
`1221`	`1221`
`1222`	`1222`	`PyDoc_STRVAR(monotonic_ns_doc,`
`@@ -1248,7 +1248,7 @@ time_perf_counter_ns(PyObject self, PyObject unused)`
`1248`	`1248`	`if (PyTime_PerfCounter(&t) < 0) {`
`1249`	`1249`	`return NULL;`
`1250`	`1250`	`}`
`1251`		`- return _PyTime_AsLong(t);`
	`1251`	`+ return PyLong_FromInt64(t);`
`1252`	`1252`	`}`
`1253`	`1253`
`1254`	`1254`	`PyDoc_STRVAR(perf_counter_ns_doc,`
`@@ -1437,7 +1437,7 @@ time_process_time_ns(PyObject module, PyObject unused)`
`1437`	`1437`	`if (py_process_time(state, &t, NULL) < 0) {`
`1438`	`1438`	`return NULL;`
`1439`	`1439`	`}`
`1440`		`- return _PyTime_AsLong(t);`
	`1440`	`+ return PyLong_FromInt64(t);`
`1441`	`1441`	`}`
`1442`	`1442`
`1443`	`1443`	`PyDoc_STRVAR(process_time_ns_doc,`
`@@ -1610,7 +1610,7 @@ time_thread_time_ns(PyObject self, PyObject unused)`
`1610`	`1610`	`if (_PyTime_GetThreadTimeWithInfo(&t, NULL) < 0) {`
`1611`	`1611`	`return NULL;`
`1612`	`1612`	`}`
`1613`		`- return _PyTime_AsLong(t);`
	`1613`	`+ return PyLong_FromInt64(t);`
`1614`	`1614`	`}`
`1615`	`1615`
`1616`	`1616`	`PyDoc_STRVAR(thread_time_ns_doc,`