summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_datetimemodule.c2
-rw-r--r--Modules/_lsprof.c26
-rw-r--r--Modules/_queuemodule.c6
-rw-r--r--Modules/_ssl.c14
-rw-r--r--Modules/_testinternalcapi/pytime.c24
-rw-r--r--Modules/_testinternalcapi/test_lock.c4
-rw-r--r--Modules/_testsinglephase.c10
-rw-r--r--Modules/_threadmodule.c12
-rw-r--r--Modules/faulthandler.c4
-rw-r--r--Modules/posixmodule.c2
-rw-r--r--Modules/selectmodule.c12
-rw-r--r--Modules/signalmodule.c6
-rw-r--r--Modules/socketmodule.c24
-rw-r--r--Modules/socketmodule.h4
-rw-r--r--Modules/timemodule.c74
15 files changed, 112 insertions, 112 deletions
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 014ccdd..b8bd702 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -5131,7 +5131,7 @@ datetime_from_timestamp(PyObject *cls, TM_FUNC f, PyObject *timestamp,
static PyObject *
datetime_best_possible(PyObject *cls, TM_FUNC f, PyObject *tzinfo)
{
- _PyTime_t ts = _PyTime_GetSystemClock();
+ PyTime_t ts = _PyTime_GetSystemClock();
time_t secs;
int us;
diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
index 8f09204..eae4261 100644
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -17,8 +17,8 @@ struct _ProfilerEntry;
/* represents a function called from another function */
typedef struct _ProfilerSubEntry {
rotating_node_t header;
- _PyTime_t tt;
- _PyTime_t it;
+ PyTime_t tt;
+ PyTime_t it;
long callcount;
long recursivecallcount;
long recursionLevel;
@@ -28,8 +28,8 @@ typedef struct _ProfilerSubEntry {
typedef struct _ProfilerEntry {
rotating_node_t header;
PyObject *userObj; /* PyCodeObject, or a descriptive str for builtins */
- _PyTime_t tt; /* total time in this entry */
- _PyTime_t it; /* inline time in this entry (not in subcalls) */
+ PyTime_t tt; /* total time in this entry */
+ PyTime_t it; /* inline time in this entry (not in subcalls) */
long callcount; /* how many times this was called */
long recursivecallcount; /* how many times called recursively */
long recursionLevel;
@@ -37,8 +37,8 @@ typedef struct _ProfilerEntry {
} ProfilerEntry;
typedef struct _ProfilerContext {
- _PyTime_t t0;
- _PyTime_t subt;
+ PyTime_t t0;
+ PyTime_t subt;
struct _ProfilerContext *previous;
ProfilerEntry *ctxEntry;
} ProfilerContext;
@@ -84,7 +84,7 @@ _lsprof_get_state(PyObject *module)
/*** External Timers ***/
-static _PyTime_t CallExternalTimer(ProfilerObject *pObj)
+static PyTime_t CallExternalTimer(ProfilerObject *pObj)
{
PyObject *o = _PyObject_CallNoArgs(pObj->externalTimer);
if (o == NULL) {
@@ -92,7 +92,7 @@ static _PyTime_t CallExternalTimer(ProfilerObject *pObj)
return 0;
}
- _PyTime_t result;
+ PyTime_t result;
int err;
if (pObj->externalTimerUnit > 0.0) {
/* interpret the result as an integer that will be scaled
@@ -101,7 +101,7 @@ static _PyTime_t CallExternalTimer(ProfilerObject *pObj)
}
else {
/* interpret the result as a double measured in seconds.
- As the profiler works with _PyTime_t internally
+ As the profiler works with PyTime_t internally
we convert it to a large integer */
err = _PyTime_FromSecondsObject(&result, o, _PyTime_ROUND_FLOOR);
}
@@ -113,7 +113,7 @@ static _PyTime_t CallExternalTimer(ProfilerObject *pObj)
return result;
}
-static inline _PyTime_t
+static inline PyTime_t
call_timer(ProfilerObject *pObj)
{
if (pObj->externalTimer != NULL) {
@@ -311,8 +311,8 @@ initContext(ProfilerObject *pObj, ProfilerContext *self, ProfilerEntry *entry)
static void
Stop(ProfilerObject *pObj, ProfilerContext *self, ProfilerEntry *entry)
{
- _PyTime_t tt = call_timer(pObj) - self->t0;
- _PyTime_t it = tt - self->subt;
+ PyTime_t tt = call_timer(pObj) - self->t0;
+ PyTime_t it = tt - self->subt;
if (self->previous)
self->previous->subt += tt;
pObj->currentProfilerContext = self->previous;
@@ -557,7 +557,7 @@ _lsprof_Profiler_getstats_impl(ProfilerObject *self, PyTypeObject *cls)
return NULL;
}
if (!self->externalTimer || self->externalTimerUnit == 0.0) {
- _PyTime_t onesec = _PyTime_FromSeconds(1);
+ PyTime_t onesec = _PyTime_FromSeconds(1);
collect.factor = (double)1 / onesec;
}
else {
diff --git a/Modules/_queuemodule.c b/Modules/_queuemodule.c
index 18b2485..5ef1cea 100644
--- a/Modules/_queuemodule.c
+++ b/Modules/_queuemodule.c
@@ -6,7 +6,7 @@
#include "pycore_ceval.h" // Py_MakePendingCalls()
#include "pycore_moduleobject.h" // _PyModule_GetState()
#include "pycore_parking_lot.h"
-#include "pycore_time.h" // _PyTime_t
+#include "pycore_time.h" // PyTime_t
#include <stdbool.h>
#include <stddef.h> // offsetof()
@@ -372,13 +372,13 @@ _queue_SimpleQueue_get_impl(simplequeueobject *self, PyTypeObject *cls,
int block, PyObject *timeout_obj)
/*[clinic end generated code: output=5c2cca914cd1e55b input=f7836c65e5839c51]*/
{
- _PyTime_t endtime = 0;
+ PyTime_t endtime = 0;
// XXX Use PyThread_ParseTimeoutArg().
if (block != 0 && !Py_IsNone(timeout_obj)) {
/* With timeout */
- _PyTime_t timeout;
+ PyTime_t timeout;
if (_PyTime_FromSecondsObject(&timeout,
timeout_obj, _PyTime_ROUND_CEILING) < 0) {
return NULL;
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 950ee36..1bf7241 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -369,7 +369,7 @@ class _ssl.SSLSession "PySSLSession *" "get_state_type(type)->PySSLSession_Type"
#include "clinic/_ssl.c.h"
-static int PySSL_select(PySocketSockObject *s, int writing, _PyTime_t timeout);
+static int PySSL_select(PySocketSockObject *s, int writing, PyTime_t timeout);
static int PySSL_set_owner(PySSLSocket *, PyObject *, void *);
static int PySSL_set_session(PySSLSocket *, PyObject *, void *);
@@ -963,7 +963,7 @@ _ssl__SSLSocket_do_handshake_impl(PySSLSocket *self)
_PySSLError err;
int sockstate, nonblocking;
PySocketSockObject *sock = GET_SOCKET(self);
- _PyTime_t timeout, deadline = 0;
+ PyTime_t timeout, deadline = 0;
int has_timeout;
if (sock) {
@@ -2273,12 +2273,12 @@ PySSL_dealloc(PySSLSocket *self)
*/
static int
-PySSL_select(PySocketSockObject *s, int writing, _PyTime_t timeout)
+PySSL_select(PySocketSockObject *s, int writing, PyTime_t timeout)
{
int rc;
#ifdef HAVE_POLL
struct pollfd pollfd;
- _PyTime_t ms;
+ PyTime_t ms;
#else
int nfds;
fd_set fds;
@@ -2357,7 +2357,7 @@ _ssl__SSLSocket_write_impl(PySSLSocket *self, Py_buffer *b)
_PySSLError err;
int nonblocking;
PySocketSockObject *sock = GET_SOCKET(self);
- _PyTime_t timeout, deadline = 0;
+ PyTime_t timeout, deadline = 0;
int has_timeout;
if (sock != NULL) {
@@ -2495,7 +2495,7 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, Py_ssize_t len,
_PySSLError err;
int nonblocking;
PySocketSockObject *sock = GET_SOCKET(self);
- _PyTime_t timeout, deadline = 0;
+ PyTime_t timeout, deadline = 0;
int has_timeout;
if (!group_right_1 && len < 0) {
@@ -2627,7 +2627,7 @@ _ssl__SSLSocket_shutdown_impl(PySSLSocket *self)
int sockstate, nonblocking, ret;
int zeros = 0;
PySocketSockObject *sock = GET_SOCKET(self);
- _PyTime_t timeout, deadline = 0;
+ PyTime_t timeout, deadline = 0;
int has_timeout;
if (sock != NULL) {
diff --git a/Modules/_testinternalcapi/pytime.c b/Modules/_testinternalcapi/pytime.c
index f0f758e..11a0241 100644
--- a/Modules/_testinternalcapi/pytime.c
+++ b/Modules/_testinternalcapi/pytime.c
@@ -16,7 +16,7 @@ test_pytime_fromseconds(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "i", &seconds)) {
return NULL;
}
- _PyTime_t ts = _PyTime_FromSeconds(seconds);
+ PyTime_t ts = _PyTime_FromSeconds(seconds);
return _PyTime_AsNanosecondsObject(ts);
}
@@ -45,7 +45,7 @@ test_pytime_fromsecondsobject(PyObject *self, PyObject *args)
if (check_time_rounding(round) < 0) {
return NULL;
}
- _PyTime_t ts;
+ PyTime_t ts;
if (_PyTime_FromSecondsObject(&ts, obj, round) == -1) {
return NULL;
}
@@ -63,7 +63,7 @@ test_PyTime_AsTimeval(PyObject *self, PyObject *args)
if (check_time_rounding(round) < 0) {
return NULL;
}
- _PyTime_t t;
+ PyTime_t t;
if (_PyTime_FromNanosecondsObject(&t, obj) < 0) {
return NULL;
}
@@ -90,7 +90,7 @@ test_PyTime_AsTimeval_clamp(PyObject *self, PyObject *args)
if (check_time_rounding(round) < 0) {
return NULL;
}
- _PyTime_t t;
+ PyTime_t t;
if (_PyTime_FromNanosecondsObject(&t, obj) < 0) {
return NULL;
}
@@ -112,7 +112,7 @@ test_PyTime_AsTimespec(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "O", &obj)) {
return NULL;
}
- _PyTime_t t;
+ PyTime_t t;
if (_PyTime_FromNanosecondsObject(&t, obj) < 0) {
return NULL;
}
@@ -130,7 +130,7 @@ test_PyTime_AsTimespec_clamp(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "O", &obj)) {
return NULL;
}
- _PyTime_t t;
+ PyTime_t t;
if (_PyTime_FromNanosecondsObject(&t, obj) < 0) {
return NULL;
}
@@ -148,15 +148,15 @@ test_PyTime_AsMilliseconds(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "Oi", &obj, &round)) {
return NULL;
}
- _PyTime_t t;
+ PyTime_t t;
if (_PyTime_FromNanosecondsObject(&t, obj) < 0) {
return NULL;
}
if (check_time_rounding(round) < 0) {
return NULL;
}
- _PyTime_t ms = _PyTime_AsMilliseconds(t, round);
- _PyTime_t ns = _PyTime_FromNanoseconds(ms);
+ PyTime_t ms = _PyTime_AsMilliseconds(t, round);
+ PyTime_t ns = _PyTime_FromNanoseconds(ms);
return _PyTime_AsNanosecondsObject(ns);
}
@@ -168,15 +168,15 @@ test_PyTime_AsMicroseconds(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "Oi", &obj, &round)) {
return NULL;
}
- _PyTime_t t;
+ PyTime_t t;
if (_PyTime_FromNanosecondsObject(&t, obj) < 0) {
return NULL;
}
if (check_time_rounding(round) < 0) {
return NULL;
}
- _PyTime_t us = _PyTime_AsMicroseconds(t, round);
- _PyTime_t ns = _PyTime_FromNanoseconds(us);
+ PyTime_t us = _PyTime_AsMicroseconds(t, round);
+ PyTime_t ns = _PyTime_FromNanoseconds(us);
return _PyTime_AsNanosecondsObject(ns);
}
diff --git a/Modules/_testinternalcapi/test_lock.c b/Modules/_testinternalcapi/test_lock.c
index 83081f7..9facbc5 100644
--- a/Modules/_testinternalcapi/test_lock.c
+++ b/Modules/_testinternalcapi/test_lock.c
@@ -289,7 +289,7 @@ _testinternalcapi_benchmark_locks_impl(PyObject *module,
goto exit;
}
- _PyTime_t start = _PyTime_GetMonotonicClock();
+ PyTime_t start = _PyTime_GetMonotonicClock();
for (Py_ssize_t i = 0; i < num_threads; i++) {
thread_data[i].bench_data = &bench_data;
@@ -306,7 +306,7 @@ _testinternalcapi_benchmark_locks_impl(PyObject *module,
}
Py_ssize_t total_iters = bench_data.total_iters;
- _PyTime_t end = _PyTime_GetMonotonicClock();
+ PyTime_t end = _PyTime_GetMonotonicClock();
// Return the total number of acquisitions and the number of acquisitions
// for each thread.
diff --git a/Modules/_testsinglephase.c b/Modules/_testsinglephase.c
index c42a15a..dccac28 100644
--- a/Modules/_testsinglephase.c
+++ b/Modules/_testsinglephase.c
@@ -8,11 +8,11 @@
//#include <time.h>
#include "Python.h"
#include "pycore_namespace.h" // _PyNamespace_New()
-#include "pycore_time.h" // _PyTime_t
+#include "pycore_time.h" // PyTime_t
typedef struct {
- _PyTime_t initialized;
+ PyTime_t initialized;
PyObject *error;
PyObject *int_const;
PyObject *str_const;
@@ -67,15 +67,15 @@ clear_state(module_state *state)
}
static int
-_set_initialized(_PyTime_t *initialized)
+_set_initialized(PyTime_t *initialized)
{
/* We go strictly monotonic to ensure each time is unique. */
- _PyTime_t prev;
+ PyTime_t prev;
if (_PyTime_GetMonotonicClockWithInfo(&prev, NULL) != 0) {
return -1;
}
/* We do a busy sleep since the interval should be super short. */
- _PyTime_t t;
+ PyTime_t t;
do {
if (_PyTime_GetMonotonicClockWithInfo(&t, NULL) != 0) {
return -1;
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index ec23fe8..2260534 100644
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -235,14 +235,14 @@ lock_dealloc(lockobject *self)
}
static inline PyLockStatus
-acquire_timed(PyThread_type_lock lock, _PyTime_t timeout)
+acquire_timed(PyThread_type_lock lock, PyTime_t timeout)
{
return PyThread_acquire_lock_timed_with_retries(lock, timeout);
}
static int
lock_acquire_parse_args(PyObject *args, PyObject *kwds,
- _PyTime_t *timeout)
+ PyTime_t *timeout)
{
char *kwlist[] = {"blocking", "timeout", NULL};
int blocking = 1;
@@ -253,7 +253,7 @@ lock_acquire_parse_args(PyObject *args, PyObject *kwds,
// XXX Use PyThread_ParseTimeoutArg().
- const _PyTime_t unset_timeout = _PyTime_FromSeconds(-1);
+ const PyTime_t unset_timeout = _PyTime_FromSeconds(-1);
*timeout = unset_timeout;
if (timeout_obj
@@ -274,7 +274,7 @@ lock_acquire_parse_args(PyObject *args, PyObject *kwds,
if (!blocking)
*timeout = 0;
else if (*timeout != unset_timeout) {
- _PyTime_t microseconds;
+ PyTime_t microseconds;
microseconds = _PyTime_AsMicroseconds(*timeout, _PyTime_ROUND_TIMEOUT);
if (microseconds > PY_TIMEOUT_MAX) {
@@ -289,7 +289,7 @@ lock_acquire_parse_args(PyObject *args, PyObject *kwds,
static PyObject *
lock_PyThread_acquire_lock(lockobject *self, PyObject *args, PyObject *kwds)
{
- _PyTime_t timeout;
+ PyTime_t timeout;
if (lock_acquire_parse_args(args, kwds, &timeout) < 0)
return NULL;
@@ -501,7 +501,7 @@ rlock_is_owned_by(rlockobject *self, PyThread_ident_t tid)
static PyObject *
rlock_acquire(rlockobject *self, PyObject *args, PyObject *kwds)
{
- _PyTime_t timeout;
+ PyTime_t timeout;
PyThread_ident_t tid;
PyLockStatus r = PY_LOCK_ACQUIRED;
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
index 95d646c..91255fc 100644
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -623,7 +623,7 @@ cancel_dump_traceback_later(void)
#define SEC_TO_US (1000 * 1000)
static char*
-format_timeout(_PyTime_t us)
+format_timeout(PyTime_t us)
{
unsigned long sec, min, hour;
char buffer[100];
@@ -656,7 +656,7 @@ faulthandler_dump_traceback_later(PyObject *self,
{
static char *kwlist[] = {"timeout", "repeat", "file", "exit", NULL};
PyObject *timeout_obj;
- _PyTime_t timeout, timeout_us;
+ PyTime_t timeout, timeout_us;
int repeat = 0;
PyObject *file = NULL;
int fd;
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 9d9c9bd..4165fb6 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -10410,7 +10410,7 @@ build_itimerspec(const struct itimerspec* curr_value)
static PyObject *
build_itimerspec_ns(const struct itimerspec* curr_value)
{
- _PyTime_t value, interval;
+ PyTime_t value, interval;
if (_PyTime_FromTimespec(&value, &curr_value->it_value) < 0) {
return NULL;
}
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 1dbde3e..57d55a5 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -15,7 +15,7 @@
#include "Python.h"
#include "pycore_fileutils.h" // _Py_set_inheritable()
#include "pycore_import.h" // _PyImport_GetModuleAttrString()
-#include "pycore_time.h" // _PyTime_t
+#include "pycore_time.h" // PyTime_t
#include <stdbool.h>
#include <stddef.h> // offsetof()
@@ -297,7 +297,7 @@ select_select_impl(PyObject *module, PyObject *rlist, PyObject *wlist,
struct timeval tv, *tvp;
int imax, omax, emax, max;
int n;
- _PyTime_t timeout, deadline = 0;
+ PyTime_t timeout, deadline = 0;
if (timeout_obj == Py_None)
tvp = (struct timeval *)NULL;
@@ -619,7 +619,7 @@ select_poll_poll_impl(pollObject *self, PyObject *timeout_obj)
PyObject *result_list = NULL;
int poll_result, i, j;
PyObject *value = NULL, *num = NULL;
- _PyTime_t timeout = -1, ms = -1, deadline = 0;
+ PyTime_t timeout = -1, ms = -1, deadline = 0;
int async_err = 0;
if (timeout_obj != Py_None) {
@@ -946,7 +946,7 @@ select_devpoll_poll_impl(devpollObject *self, PyObject *timeout_obj)
PyObject *result_list = NULL;
int poll_result, i;
PyObject *value, *num1, *num2;
- _PyTime_t timeout, ms, deadline = 0;
+ PyTime_t timeout, ms, deadline = 0;
if (self->fd_devpoll < 0)
return devpoll_err_closed();
@@ -1559,7 +1559,7 @@ select_epoll_poll_impl(pyEpoll_Object *self, PyObject *timeout_obj,
int nfds, i;
PyObject *elist = NULL, *etuple = NULL;
struct epoll_event *evs = NULL;
- _PyTime_t timeout = -1, ms = -1, deadline = 0;
+ PyTime_t timeout = -1, ms = -1, deadline = 0;
if (self->epfd < 0)
return pyepoll_err_closed();
@@ -2242,7 +2242,7 @@ select_kqueue_control_impl(kqueue_queue_Object *self, PyObject *changelist,
struct kevent *chl = NULL;
struct timespec timeoutspec;
struct timespec *ptimeoutspec;
- _PyTime_t timeout, deadline = 0;
+ PyTime_t timeout, deadline = 0;
_selectstate *state = _selectstate_by_type(Py_TYPE(self));
if (self->kqfd < 0)
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index 652e69b..a968cb1 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -173,7 +173,7 @@ timeval_from_double(PyObject *obj, struct timeval *tv)
return 0;
}
- _PyTime_t t;
+ PyTime_t t;
if (_PyTime_FromSecondsObject(&t, obj, _PyTime_ROUND_CEILING) < 0) {
return -1;
}
@@ -1207,7 +1207,7 @@ signal_sigtimedwait_impl(PyObject *module, sigset_t sigset,
PyObject *timeout_obj)
/*[clinic end generated code: output=59c8971e8ae18a64 input=87fd39237cf0b7ba]*/
{
- _PyTime_t timeout;
+ PyTime_t timeout;
if (_PyTime_FromSecondsObject(&timeout,
timeout_obj, _PyTime_ROUND_CEILING) < 0)
return NULL;
@@ -1217,7 +1217,7 @@ signal_sigtimedwait_impl(PyObject *module, sigset_t sigset,
return NULL;
}
- _PyTime_t deadline = _PyDeadline_Init(timeout);
+ PyTime_t deadline = _PyDeadline_Init(timeout);
siginfo_t si;
do {
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 0a0e0e7..9f70dbe 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -547,7 +547,7 @@ typedef struct _socket_state {
PyObject *socket_gaierror;
/* Default timeout for new sockets */
- _PyTime_t defaulttimeout;
+ PyTime_t defaulttimeout;
#if defined(HAVE_ACCEPT) || defined(HAVE_ACCEPT4)
#if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC)
@@ -772,13 +772,13 @@ internal_setblocking(PySocketSockObject *s, int block)
}
static int
-internal_select(PySocketSockObject *s, int writing, _PyTime_t interval,
+internal_select(PySocketSockObject *s, int writing, PyTime_t interval,
int connect)
{
int n;
#ifdef HAVE_POLL
struct pollfd pollfd;
- _PyTime_t ms;
+ PyTime_t ms;
#else
fd_set fds, efds;
struct timeval tv, *tvp;
@@ -888,10 +888,10 @@ sock_call_ex(PySocketSockObject *s,
void *data,
int connect,
int *err,
- _PyTime_t timeout)
+ PyTime_t timeout)
{
int has_timeout = (timeout > 0);
- _PyTime_t deadline = 0;
+ PyTime_t deadline = 0;
int deadline_initialized = 0;
int res;
@@ -905,7 +905,7 @@ sock_call_ex(PySocketSockObject *s,
runs asynchronously. */
if (has_timeout || connect) {
if (has_timeout) {
- _PyTime_t interval;
+ PyTime_t interval;
if (deadline_initialized) {
/* recompute the timeout */
@@ -3011,13 +3011,13 @@ Returns True if socket is in blocking mode, or False if it\n\
is in non-blocking mode.");
static int
-socket_parse_timeout(_PyTime_t *timeout, PyObject *timeout_obj)
+socket_parse_timeout(PyTime_t *timeout, PyObject *timeout_obj)
{
#ifdef MS_WINDOWS
struct timeval tv;
#endif
#ifndef HAVE_POLL
- _PyTime_t ms;
+ PyTime_t ms;
#endif
int overflow = 0;
@@ -3060,7 +3060,7 @@ socket_parse_timeout(_PyTime_t *timeout, PyObject *timeout_obj)
static PyObject *
sock_settimeout(PySocketSockObject *s, PyObject *arg)
{
- _PyTime_t timeout;
+ PyTime_t timeout;
if (socket_parse_timeout(&timeout, arg) < 0)
return NULL;
@@ -4382,8 +4382,8 @@ sock_sendall(PySocketSockObject *s, PyObject *args)
Py_buffer pbuf;
struct sock_send ctx;
int has_timeout = (s->sock_timeout > 0);
- _PyTime_t timeout = s->sock_timeout;
- _PyTime_t deadline = 0;
+ PyTime_t timeout = s->sock_timeout;
+ PyTime_t deadline = 0;
int deadline_initialized = 0;
PyObject *res = NULL;
@@ -6931,7 +6931,7 @@ When the socket module is first imported, the default is None.");
static PyObject *
socket_setdefaulttimeout(PyObject *self, PyObject *arg)
{
- _PyTime_t timeout;
+ PyTime_t timeout;
if (socket_parse_timeout(&timeout, arg) < 0)
return NULL;
diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
index 47146a2..a7c592c 100644
--- a/Modules/socketmodule.h
+++ b/Modules/socketmodule.h
@@ -1,6 +1,6 @@
/* Socket module header file */
-#include "pycore_time.h" // _PyTime_t
+#include "pycore_time.h" // PyTime_t
/* Includes needed for the sockaddr_* symbols below */
#ifndef MS_WINDOWS
@@ -324,7 +324,7 @@ typedef struct {
PyObject *(*errorhandler)(void); /* Error handler; checks
errno, returns NULL and
sets a Python exception */
- _PyTime_t sock_timeout; /* Operation timeout in seconds;
+ PyTime_t sock_timeout; /* Operation timeout in seconds;
0.0 means non-blocking */
struct _socket_state *state;
} PySocketSockObject;
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 2b0d390..16769b2 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -70,7 +70,7 @@ module time
/* Forward declarations */
-static int pysleep(_PyTime_t timeout);
+static int pysleep(PyTime_t timeout);
typedef struct {
@@ -95,7 +95,7 @@ get_time_state(PyObject *module)
static PyObject*
-_PyFloat_FromPyTime(_PyTime_t t)
+_PyFloat_FromPyTime(PyTime_t t)
{
double d = _PyTime_AsSecondsDouble(t);
return PyFloat_FromDouble(d);
@@ -103,7 +103,7 @@ _PyFloat_FromPyTime(_PyTime_t t)
static int
-get_system_time(_PyTime_t *t)
+get_system_time(PyTime_t *t)
{
// Avoid _PyTime_GetSystemClock() which silently ignores errors.
return _PyTime_GetSystemClockWithInfo(t, NULL);
@@ -113,7 +113,7 @@ get_system_time(_PyTime_t *t)
static PyObject *
time_time(PyObject *self, PyObject *unused)
{
- _PyTime_t t;
+ PyTime_t t;
if (get_system_time(&t) < 0) {
return NULL;
}
@@ -130,7 +130,7 @@ Fractions of a second may be present if the system clock provides them.");
static PyObject *
time_time_ns(PyObject *self, PyObject *unused)
{
- _PyTime_t t;
+ PyTime_t t;
if (get_system_time(&t) < 0) {
return NULL;
}
@@ -153,7 +153,7 @@ Return the current time in nanoseconds since the Epoch.");
#endif
static int
-py_clock(time_module_state *state, _PyTime_t *tp, _Py_clock_info_t *info)
+py_clock(time_module_state *state, PyTime_t *tp, _Py_clock_info_t *info)
{
_PyTimeFraction *base = &state->clock_base;
@@ -171,7 +171,7 @@ py_clock(time_module_state *state, _PyTime_t *tp, _Py_clock_info_t *info)
"or its value cannot be represented");
return -1;
}
- _PyTime_t ns = _PyTimeFraction_Mul(ticks, base);
+ PyTime_t ns = _PyTimeFraction_Mul(ticks, base);
*tp = _PyTime_FromNanoseconds(ns);
return 0;
}
@@ -262,7 +262,7 @@ time_clock_gettime_ns_impl(PyObject *module, clockid_t clk_id)
return NULL;
}
- _PyTime_t t;
+ PyTime_t t;
if (_PyTime_FromTimespec(&t, &ts) < 0) {
return NULL;
}
@@ -276,7 +276,7 @@ time_clock_settime(PyObject *self, PyObject *args)
{
int clk_id;
PyObject *obj;
- _PyTime_t t;
+ PyTime_t t;
struct timespec tp;
int ret;
@@ -307,7 +307,7 @@ time_clock_settime_ns(PyObject *self, PyObject *args)
{
int clk_id;
PyObject *obj;
- _PyTime_t t;
+ PyTime_t t;
struct timespec ts;
int ret;
@@ -402,7 +402,7 @@ time_sleep(PyObject *self, PyObject *timeout_obj)
return NULL;
}
- _PyTime_t timeout;
+ PyTime_t timeout;
if (_PyTime_FromSecondsObject(&timeout, timeout_obj, _PyTime_ROUND_TIMEOUT))
return NULL;
if (timeout < 0) {
@@ -1156,7 +1156,7 @@ should not be relied on.");
static int
-get_monotonic(_PyTime_t *t)
+get_monotonic(PyTime_t *t)
{
// Avoid _PyTime_GetMonotonicClock() which silently ignores errors.
return _PyTime_GetMonotonicClockWithInfo(t, NULL);
@@ -1166,7 +1166,7 @@ get_monotonic(_PyTime_t *t)
static PyObject *
time_monotonic(PyObject *self, PyObject *unused)
{
- _PyTime_t t;
+ PyTime_t t;
if (get_monotonic(&t) < 0) {
return NULL;
}
@@ -1181,7 +1181,7 @@ Monotonic clock, cannot go backward.");
static PyObject *
time_monotonic_ns(PyObject *self, PyObject *unused)
{
- _PyTime_t t;
+ PyTime_t t;
if (get_monotonic(&t) < 0) {
return NULL;
}
@@ -1195,7 +1195,7 @@ Monotonic clock, cannot go backward, as nanoseconds.");
static int
-get_perf_counter(_PyTime_t *t)
+get_perf_counter(PyTime_t *t)
{
// Avoid _PyTime_GetPerfCounter() which silently ignores errors.
return _PyTime_GetPerfCounterWithInfo(t, NULL);
@@ -1205,7 +1205,7 @@ get_perf_counter(_PyTime_t *t)
static PyObject *
time_perf_counter(PyObject *self, PyObject *unused)
{
- _PyTime_t t;
+ PyTime_t t;
if (get_perf_counter(&t) < 0) {
return NULL;
}
@@ -1221,7 +1221,7 @@ Performance counter for benchmarking.");
static PyObject *
time_perf_counter_ns(PyObject *self, PyObject *unused)
{
- _PyTime_t t;
+ PyTime_t t;
if (get_perf_counter(&t) < 0) {
return NULL;
}
@@ -1236,7 +1236,7 @@ Performance counter for benchmarking as nanoseconds.");
#ifdef HAVE_TIMES
static int
-process_time_times(time_module_state *state, _PyTime_t *tp,
+process_time_times(time_module_state *state, PyTime_t *tp,
_Py_clock_info_t *info)
{
_PyTimeFraction *base = &state->times_base;
@@ -1253,7 +1253,7 @@ process_time_times(time_module_state *state, _PyTime_t *tp,
info->adjustable = 0;
}
- _PyTime_t ns;
+ PyTime_t ns;
ns = _PyTimeFraction_Mul(process.tms_utime, base);
ns += _PyTimeFraction_Mul(process.tms_stime, base);
*tp = _PyTime_FromNanoseconds(ns);
@@ -1263,14 +1263,14 @@ process_time_times(time_module_state *state, _PyTime_t *tp,
static int
-py_process_time(time_module_state *state, _PyTime_t *tp,
+py_process_time(time_module_state *state, PyTime_t *tp,
_Py_clock_info_t *info)
{
#if defined(MS_WINDOWS)
HANDLE process;
FILETIME creation_time, exit_time, kernel_time, user_time;
ULARGE_INTEGER large;
- _PyTime_t ktime, utime, t;
+ PyTime_t ktime, utime, t;
BOOL ok;
process = GetCurrentProcess();
@@ -1343,7 +1343,7 @@ py_process_time(time_module_state *state, _PyTime_t *tp,
struct rusage ru;
if (getrusage(RUSAGE_SELF, &ru) == 0) {
- _PyTime_t utime, stime;
+ PyTime_t utime, stime;
if (info) {
info->implementation = "getrusage(RUSAGE_SELF)";
@@ -1359,7 +1359,7 @@ py_process_time(time_module_state *state, _PyTime_t *tp,
return -1;
}
- _PyTime_t total = utime + stime;
+ PyTime_t total = utime + stime;
*tp = total;
return 0;
}
@@ -1386,7 +1386,7 @@ static PyObject *
time_process_time(PyObject *module, PyObject *unused)
{
time_module_state *state = get_time_state(module);
- _PyTime_t t;
+ PyTime_t t;
if (py_process_time(state, &t, NULL) < 0) {
return NULL;
}
@@ -1402,7 +1402,7 @@ static PyObject *
time_process_time_ns(PyObject *module, PyObject *unused)
{
time_module_state *state = get_time_state(module);
- _PyTime_t t;
+ PyTime_t t;
if (py_process_time(state, &t, NULL) < 0) {
return NULL;
}
@@ -1419,12 +1419,12 @@ sum of the kernel and user-space CPU time.");
#if defined(MS_WINDOWS)
#define HAVE_THREAD_TIME
static int
-_PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
+_PyTime_GetThreadTimeWithInfo(PyTime_t *tp, _Py_clock_info_t *info)
{
HANDLE thread;
FILETIME creation_time, exit_time, kernel_time, user_time;
ULARGE_INTEGER large;
- _PyTime_t ktime, utime, t;
+ PyTime_t ktime, utime, t;
BOOL ok;
thread = GetCurrentThread();
@@ -1459,7 +1459,7 @@ _PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
#elif defined(_AIX)
#define HAVE_THREAD_TIME
static int
-_PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
+_PyTime_GetThreadTimeWithInfo(PyTime_t *tp, _Py_clock_info_t *info)
{
/* bpo-40192: On AIX, thread_cputime() is preferred: it has nanosecond
resolution, whereas clock_gettime(CLOCK_THREAD_CPUTIME_ID)
@@ -1483,7 +1483,7 @@ _PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
#elif defined(__sun) && defined(__SVR4)
#define HAVE_THREAD_TIME
static int
-_PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
+_PyTime_GetThreadTimeWithInfo(PyTime_t *tp, _Py_clock_info_t *info)
{
/* bpo-35455: On Solaris, CLOCK_THREAD_CPUTIME_ID clock is not always
available; use gethrvtime() to substitute this functionality. */
@@ -1504,7 +1504,7 @@ _PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
#if defined(__APPLE__) && defined(__has_attribute) && __has_attribute(availability)
static int
-_PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
+_PyTime_GetThreadTimeWithInfo(PyTime_t *tp, _Py_clock_info_t *info)
__attribute__((availability(macos, introduced=10.12)))
__attribute__((availability(ios, introduced=10.0)))
__attribute__((availability(tvos, introduced=10.0)))
@@ -1512,7 +1512,7 @@ _PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
#endif
static int
-_PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
+_PyTime_GetThreadTimeWithInfo(PyTime_t *tp, _Py_clock_info_t *info)
{
struct timespec ts;
const clockid_t clk_id = CLOCK_THREAD_CPUTIME_ID;
@@ -1554,7 +1554,7 @@ _PyTime_GetThreadTimeWithInfo(_PyTime_t *tp, _Py_clock_info_t *info)
static PyObject *
time_thread_time(PyObject *self, PyObject *unused)
{
- _PyTime_t t;
+ PyTime_t t;
if (_PyTime_GetThreadTimeWithInfo(&t, NULL) < 0) {
return NULL;
}
@@ -1569,7 +1569,7 @@ Thread time for profiling: sum of the kernel and user-space CPU time.");
static PyObject *
time_thread_time_ns(PyObject *self, PyObject *unused)
{
- _PyTime_t t;
+ PyTime_t t;
if (_PyTime_GetThreadTimeWithInfo(&t, NULL) < 0) {
return NULL;
}
@@ -1595,7 +1595,7 @@ time_get_clock_info(PyObject *module, PyObject *args)
char *name;
_Py_clock_info_t info;
PyObject *obj = NULL, *dict, *ns;
- _PyTime_t t;
+ PyTime_t t;
if (!PyArg_ParseTuple(args, "s:get_clock_info", &name)) {
return NULL;
@@ -2174,7 +2174,7 @@ PyInit_time(void)
// On error, raise an exception and return -1.
// On success, return 0.
static int
-pysleep(_PyTime_t timeout)
+pysleep(PyTime_t timeout)
{
assert(timeout >= 0);
@@ -2186,7 +2186,7 @@ pysleep(_PyTime_t timeout)
#else
struct timeval timeout_tv;
#endif
- _PyTime_t deadline, monotonic;
+ PyTime_t deadline, monotonic;
int err = 0;
if (get_monotonic(&monotonic) < 0) {
@@ -2255,7 +2255,7 @@ pysleep(_PyTime_t timeout)
return 0;
#else // MS_WINDOWS
- _PyTime_t timeout_100ns = _PyTime_As100Nanoseconds(timeout,
+ PyTime_t timeout_100ns = _PyTime_As100Nanoseconds(timeout,
_PyTime_ROUND_CEILING);
// Maintain Windows Sleep() semantics for time.sleep(0)
generated by cgit v0.12 at 2025-02-10 02:48:01 (GMT)