From f9d8aeb40a046bb955be36de0d70182b8f843871 Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Wed, 3 Apr 2024 17:19:34 +0900 Subject: [PATCH 01/18] Update _datetimemodule.c Co-authored-by: Erlend E. Aasland --- Modules/_datetimemodule.c | 1382 ++++++++++++++++++++----------------- 1 file changed, 731 insertions(+), 651 deletions(-) diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index a626bda2ea9be9..59e5572590148b 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -25,22 +25,22 @@ # include /* struct timeval */ #endif -#define PyDate_Check(op) PyObject_TypeCheck(op, &PyDateTime_DateType) -#define PyDate_CheckExact(op) Py_IS_TYPE(op, &PyDateTime_DateType) +#define PyDate_Check(st, op) PyObject_TypeCheck(op, (st)->PyDateTime_DateType) +#define PyDate_CheckExact(st, op) Py_IS_TYPE((op, (st)->PyDateTime_DateType) -#define PyDateTime_Check(op) PyObject_TypeCheck(op, &PyDateTime_DateTimeType) -#define PyDateTime_CheckExact(op) Py_IS_TYPE(op, &PyDateTime_DateTimeType) +#define PyDateTime_Check(st, op) PyObject_TypeCheck(op, (st)->PyDateTime_DateTimeType) +#define PyDateTime_CheckExact(st, op) Py_IS_TYPE((op, (st)->PyDateTime_DateTimeType) -#define PyTime_Check(op) PyObject_TypeCheck(op, &PyDateTime_TimeType) -#define PyTime_CheckExact(op) Py_IS_TYPE(op, &PyDateTime_TimeType) +#define PyTime_Check(st, op) PyObject_TypeCheck(op, (st)->PyDateTime_TimeType) +#define PyTime_CheckExact(st, op) Py_IS_TYPE((op, (st)->PyDateTime_TimeType) -#define PyDelta_Check(op) PyObject_TypeCheck(op, &PyDateTime_DeltaType) -#define PyDelta_CheckExact(op) Py_IS_TYPE(op, &PyDateTime_DeltaType) +#define PyDelta_Check(st, op) PyObject_TypeCheck(op, (st)->PyDateTime_DeltaType) +#define PyDelta_CheckExact(st, op) Py_IS_TYPE((op, (st)->PyDateTime_DeltaType) -#define PyTZInfo_Check(op) PyObject_TypeCheck(op, &PyDateTime_TZInfoType) -#define PyTZInfo_CheckExact(op) Py_IS_TYPE(op, &PyDateTime_TZInfoType) +#define PyTZInfo_Check(st, op) PyObject_TypeCheck(op, (st)->PyDateTime_TZInfoType) +#define PyTZInfo_CheckExact(st, op) Py_IS_TYPE((op, (st)->PyDateTime_TZInfoType) -#define PyTimezone_Check(op) PyObject_TypeCheck(op, &PyDateTime_TimeZoneType) +#define PyTimezone_Check(st, op) PyObject_TypeCheck(op, (st)->PyDateTime_TimeZoneType) typedef struct { /* Conversion factors. */ @@ -57,11 +57,52 @@ typedef struct { /* The interned Unix epoch datetime instance */ PyObject *epoch; + + /* _strptime module */ + PyObject *strptime; + + /* Types */ + PyTypeObject *PyDateTime_DateType; + PyTypeObject *PyDateTime_DateTimeType; + PyTypeObject *PyDateTime_DeltaType; + PyTypeObject *PyDateTime_IsoCalendarDateType; + PyTypeObject *PyDateTime_TimeType; + PyTypeObject *PyDateTime_TZInfoType; + PyTypeObject *PyDateTime_TimeZoneType; } datetime_state; -static datetime_state _datetime_global_state; +static inline datetime_state * +get_module_state(PyObject *mod) +{ + void *state = _PyModule_GetState(mod); + assert(state != NULL); + return (datetime_state *)state; +} + +static struct PyModuleDef datetimemodule; + +static inline datetime_state * +find_module_state_by_def(PyTypeObject *type) +{ + PyObject *mod = PyType_GetModuleByDef(type, &datetimemodule); + assert(mod != NULL); + return get_module_state(mod); +} + +static inline datetime_state * +find_state_left_or_right(PyObject *left, PyObject *right) +{ + PyObject *mod = PyType_GetModuleByDef(Py_TYPE(left), &datetimemodule); + if (mod == NULL) { + PyErr_Clear(); + mod = PyType_GetModuleByDef(Py_TYPE(right), &datetimemodule); + } + assert(mod != NULL); + return get_module_state(mod); +} + +#define find_module_state_by_def(obj) find_module_state_by_def((PyTypeObject *)(obj)) -#define STATIC_STATE() (&_datetime_global_state) /* We require that C int be at least 32 bits, and use int virtually * everywhere. In just a few cases we use a temp long, where a Python @@ -142,16 +183,7 @@ static datetime_state _datetime_global_state; */ #define MONTH_IS_SANE(M) ((unsigned int)(M) - 1 < 12) -/* Forward declarations. */ -static PyTypeObject PyDateTime_DateType; -static PyTypeObject PyDateTime_DateTimeType; -static PyTypeObject PyDateTime_DeltaType; -static PyTypeObject PyDateTime_IsoCalendarDateType; -static PyTypeObject PyDateTime_TimeType; -static PyTypeObject PyDateTime_TZInfoType; -static PyTypeObject PyDateTime_TimeZoneType; - -static int check_tzinfo_subclass(PyObject *p); +static int check_tzinfo_subclass(datetime_state *st, PyObject *p); /*[clinic input] module datetime @@ -667,51 +699,6 @@ normalize_datetime(int *year, int *month, int *day, return normalize_date(year, month, day); } -/* --------------------------------------------------------------------------- - * Basic object allocation: tp_alloc implementations. These allocate - * Python objects of the right size and type, and do the Python object- - * initialization bit. If there's not enough memory, they return NULL after - * setting MemoryError. All data members remain uninitialized trash. - * - * We abuse the tp_alloc "nitems" argument to communicate whether a tzinfo - * member is needed. This is ugly, imprecise, and possibly insecure. - * tp_basicsize for the time and datetime types is set to the size of the - * struct that has room for the tzinfo member, so subclasses in Python will - * allocate enough space for a tzinfo member whether or not one is actually - * needed. That's the "ugly and imprecise" parts. The "possibly insecure" - * part is that PyType_GenericAlloc() (which subclasses in Python end up - * using) just happens today to effectively ignore the nitems argument - * when tp_itemsize is 0, which it is for these type objects. If that - * changes, perhaps the callers of tp_alloc slots in this file should - * be changed to force a 0 nitems argument unless the type being allocated - * is a base type implemented in this file (so that tp_alloc is time_alloc - * or datetime_alloc below, which know about the nitems abuse). - */ - -static PyObject * -time_alloc(PyTypeObject *type, Py_ssize_t aware) -{ - size_t size = aware ? sizeof(PyDateTime_Time) : sizeof(_PyDateTime_BaseTime); - PyObject *self = (PyObject *)PyObject_Malloc(size); - if (self == NULL) { - return PyErr_NoMemory(); - } - _PyObject_Init(self, type); - return self; -} - -static PyObject * -datetime_alloc(PyTypeObject *type, Py_ssize_t aware) -{ - size_t size = aware ? sizeof(PyDateTime_DateTime) : sizeof(_PyDateTime_BaseDateTime); - PyObject *self = (PyObject *)PyObject_Malloc(size); - if (self == NULL) { - return PyErr_NoMemory(); - } - _PyObject_Init(self, type); - return self; -} - /* --------------------------------------------------------------------------- * Helpers for setting object fields. These work on pointers to the * appropriate base class. @@ -974,8 +961,8 @@ new_date_ex(int year, int month, int day, PyTypeObject *type) return (PyObject *)self; } -#define new_date(year, month, day) \ - new_date_ex(year, month, day, &PyDateTime_DateType) +#define new_date(st, year, month, day) \ + new_date_ex(year, month, day, st->PyDateTime_DateType) // Forward declaration static PyObject * @@ -985,12 +972,13 @@ new_datetime_ex(int, int, int, int, int, int, int, PyObject *, PyTypeObject *); static PyObject * new_date_subclass_ex(int year, int month, int day, PyObject *cls) { + datetime_state *st = find_module_state_by_def(cls); PyObject *result; // We have "fast path" constructors for two subclasses: date and datetime - if ((PyTypeObject *)cls == &PyDateTime_DateType) { + if ((PyTypeObject *)cls == st->PyDateTime_DateType) { result = new_date_ex(year, month, day, (PyTypeObject *)cls); } - else if ((PyTypeObject *)cls == &PyDateTime_DateTimeType) { + else if ((PyTypeObject *)cls == st->PyDateTime_DateTimeType) { result = new_datetime_ex(year, month, day, 0, 0, 0, 0, Py_None, (PyTypeObject *)cls); } @@ -1015,7 +1003,8 @@ new_datetime_ex2(int year, int month, int day, int hour, int minute, if (check_time_args(hour, minute, second, usecond, fold) < 0) { return NULL; } - if (check_tzinfo_subclass(tzinfo) < 0) { + datetime_state *st = find_module_state_by_def(type); + if (check_tzinfo_subclass(st, tzinfo) < 0) { return NULL; } @@ -1043,9 +1032,9 @@ new_datetime_ex(int year, int month, int day, int hour, int minute, tzinfo, 0, type); } -#define new_datetime(y, m, d, hh, mm, ss, us, tzinfo, fold) \ +#define new_datetime(st, y, m, d, hh, mm, ss, us, tzinfo, fold) \ new_datetime_ex2(y, m, d, hh, mm, ss, us, tzinfo, fold, \ - &PyDateTime_DateTimeType) + st->PyDateTime_DateTimeType) static PyObject * call_subclass_fold(PyObject *cls, int fold, const char *format, ...) @@ -1086,9 +1075,10 @@ new_datetime_subclass_fold_ex(int year, int month, int day, int hour, int minute int second, int usecond, PyObject *tzinfo, int fold, PyObject *cls) { PyObject* dt; - if ((PyTypeObject*)cls == &PyDateTime_DateTimeType) { + datetime_state *st = find_module_state_by_def(cls); + if ((PyTypeObject*)cls == st->PyDateTime_DateTimeType) { // Use the fast path constructor - dt = new_datetime(year, month, day, hour, minute, second, usecond, + dt = new_datetime(st, year, month, day, hour, minute, second, usecond, tzinfo, fold); } else { @@ -1120,7 +1110,8 @@ new_time_ex2(int hour, int minute, int second, int usecond, if (check_time_args(hour, minute, second, usecond, fold) < 0) { return NULL; } - if (check_tzinfo_subclass(tzinfo) < 0) { + datetime_state *st = find_module_state_by_def(type); + if (check_tzinfo_subclass(st, tzinfo) < 0) { return NULL; } @@ -1147,17 +1138,18 @@ new_time_ex(int hour, int minute, int second, int usecond, return new_time_ex2(hour, minute, second, usecond, tzinfo, 0, type); } -#define new_time(hh, mm, ss, us, tzinfo, fold) \ - new_time_ex2(hh, mm, ss, us, tzinfo, fold, &PyDateTime_TimeType) +#define new_time(st, hh, mm, ss, us, tzinfo, fold) \ + new_time_ex2(hh, mm, ss, us, tzinfo, fold, st->PyDateTime_TimeType) static PyObject * new_time_subclass_fold_ex(int hour, int minute, int second, int usecond, PyObject *tzinfo, int fold, PyObject *cls) { + datetime_state *st = find_module_state_by_def(cls); PyObject *t; - if ((PyTypeObject*)cls == &PyDateTime_TimeType) { + if ((PyTypeObject*)cls == st->PyDateTime_TimeType) { // Use the fast path constructor - t = new_time(hour, minute, second, usecond, tzinfo, fold); + t = new_time(st, hour, minute, second, usecond, tzinfo, fold); } else { // Subclass @@ -1198,8 +1190,8 @@ new_delta_ex(int days, int seconds, int microseconds, int normalize, return (PyObject *) self; } -#define new_delta(d, s, us, normalize) \ - new_delta_ex(d, s, us, normalize, &PyDateTime_DeltaType) +#define new_delta(st, d, s, us, normalize) \ + new_delta_ex(d, s, us, normalize, st->PyDateTime_DeltaType) typedef struct @@ -1214,13 +1206,12 @@ typedef struct that offset is a timedelta instance and name is either NULL or a unicode object. */ static PyObject * -create_timezone(PyObject *offset, PyObject *name) +create_timezone(datetime_state *st, PyObject *offset, PyObject *name) { PyDateTime_TimeZone *self; - PyTypeObject *type = &PyDateTime_TimeZoneType; - + PyTypeObject *type = st->PyDateTime_TimeZoneType; assert(offset != NULL); - assert(PyDelta_Check(offset)); + assert(PyDelta_Check(st, offset)); assert(name == NULL || PyUnicode_Check(name)); self = (PyDateTime_TimeZone *)(type->tp_alloc(type, 0)); @@ -1237,12 +1228,12 @@ static int delta_bool(PyDateTime_Delta *self); static PyObject * new_timezone(PyObject *offset, PyObject *name) { + datetime_state *st = find_module_state_by_def(Py_TYPE(offset)); assert(offset != NULL); - assert(PyDelta_Check(offset)); + assert(PyDelta_Check(st, offset)); assert(name == NULL || PyUnicode_Check(name)); if (name == NULL && delta_bool((PyDateTime_Delta *)offset) == 0) { - datetime_state *st = STATIC_STATE(); return Py_NewRef(st->utc); } if ((GET_TD_DAYS(offset) == -1 && @@ -1256,7 +1247,7 @@ new_timezone(PyObject *offset, PyObject *name) return NULL; } - return create_timezone(offset, name); + return create_timezone(st, offset, name); } /* --------------------------------------------------------------------------- @@ -1267,9 +1258,9 @@ new_timezone(PyObject *offset, PyObject *name) * raise TypeError and return -1. */ static int -check_tzinfo_subclass(PyObject *p) +check_tzinfo_subclass(datetime_state *st, PyObject *p) { - if (p == Py_None || PyTZInfo_Check(p)) + if (p == Py_None || PyTZInfo_Check(st, p)) return 0; PyErr_Format(PyExc_TypeError, "tzinfo argument must be None or of a tzinfo subclass, " @@ -1287,9 +1278,10 @@ get_tzinfo_member(PyObject *self) { PyObject *tzinfo = NULL; - if (PyDateTime_Check(self) && HASTZINFO(self)) + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + if (PyDateTime_Check(st, self) && HASTZINFO(self)) tzinfo = ((PyDateTime_DateTime *)self)->tzinfo; - else if (PyTime_Check(self) && HASTZINFO(self)) + else if (PyTime_Check(st, self) && HASTZINFO(self)) tzinfo = ((PyDateTime_Time *)self)->tzinfo; return tzinfo; @@ -1303,12 +1295,13 @@ get_tzinfo_member(PyObject *self) * this returns NULL. Else result is returned. */ static PyObject * -call_tzinfo_method(PyObject *tzinfo, const char *name, PyObject *tzinfoarg) +call_tzinfo_method(datetime_state *st, PyObject *tzinfo, const char *name, + PyObject *tzinfoarg) { PyObject *offset; assert(tzinfo != NULL); - assert(PyTZInfo_Check(tzinfo) || tzinfo == Py_None); + assert(PyTZInfo_Check(st, tzinfo) || tzinfo == Py_None); assert(tzinfoarg != NULL); if (tzinfo == Py_None) @@ -1316,7 +1309,7 @@ call_tzinfo_method(PyObject *tzinfo, const char *name, PyObject *tzinfoarg) offset = PyObject_CallMethod(tzinfo, name, "O", tzinfoarg); if (offset == Py_None || offset == NULL) return offset; - if (PyDelta_Check(offset)) { + if (PyDelta_Check(st, offset)) { if ((GET_TD_DAYS(offset) == -1 && GET_TD_SECONDS(offset) == 0 && GET_TD_MICROSECONDS(offset) < 1) || @@ -1349,9 +1342,9 @@ call_tzinfo_method(PyObject *tzinfo, const char *name, PyObject *tzinfoarg) * set to 0 and the offset is returned (as timedelta, positive east of UTC). */ static PyObject * -call_utcoffset(PyObject *tzinfo, PyObject *tzinfoarg) +call_utcoffset(datetime_state *st, PyObject *tzinfo, PyObject *tzinfoarg) { - return call_tzinfo_method(tzinfo, "utcoffset", tzinfoarg); + return call_tzinfo_method(st, tzinfo, "utcoffset", tzinfoarg); } /* Call tzinfo.dst(tzinfoarg), and extract an integer from the @@ -1363,9 +1356,9 @@ call_utcoffset(PyObject *tzinfo, PyObject *tzinfoarg) * the offset is returned (as timedelta, positive east of UTC). */ static PyObject * -call_dst(PyObject *tzinfo, PyObject *tzinfoarg) +call_dst(datetime_state *st, PyObject *tzinfo, PyObject *tzinfoarg) { - return call_tzinfo_method(tzinfo, "dst", tzinfoarg); + return call_tzinfo_method(st, tzinfo, "dst", tzinfoarg); } /* Call tzinfo.tzname(tzinfoarg), and return the result. tzinfo must be @@ -1375,11 +1368,11 @@ call_dst(PyObject *tzinfo, PyObject *tzinfoarg) * string. */ static PyObject * -call_tzname(PyObject *tzinfo, PyObject *tzinfoarg) +call_tzname(datetime_state *st, PyObject *tzinfo, PyObject *tzinfoarg) { PyObject *result; assert(tzinfo != NULL); - assert(check_tzinfo_subclass(tzinfo) >= 0); + assert(check_tzinfo_subclass(st, tzinfo) >= 0); assert(tzinfoarg != NULL); if (tzinfo == Py_None) @@ -1450,17 +1443,17 @@ append_keyword_fold(PyObject *repr, int fold) } static inline PyObject * -tzinfo_from_isoformat_results(int rv, int tzoffset, int tz_useconds) +tzinfo_from_isoformat_results(datetime_state *st, int rv, int tzoffset, + int tz_useconds) { PyObject *tzinfo; if (rv == 1) { // Create a timezone from offset in seconds (0 returns UTC) if (tzoffset == 0) { - datetime_state *st = STATIC_STATE(); return Py_NewRef(st->utc); } - PyObject *delta = new_delta(0, tzoffset, tz_useconds, 1); + PyObject *delta = new_delta(st, 0, tzoffset, tz_useconds, 1); if (delta == NULL) { return NULL; } @@ -1510,7 +1503,7 @@ static PyObject *delta_negative(PyDateTime_Delta *self); * bogus, an appropriate exception is set and -1 is returned. */ static int -format_utcoffset(char *buf, size_t buflen, const char *sep, +format_utcoffset(datetime_state *st, char *buf, size_t buflen, const char *sep, PyObject *tzinfo, PyObject *tzinfoarg) { PyObject *offset; @@ -1519,7 +1512,7 @@ format_utcoffset(char *buf, size_t buflen, const char *sep, assert(buflen >= 1); - offset = call_utcoffset(tzinfo, tzinfoarg); + offset = call_utcoffset(st, tzinfo, tzinfoarg); if (offset == NULL) return -1; if (offset == Py_None) { @@ -1558,7 +1551,8 @@ format_utcoffset(char *buf, size_t buflen, const char *sep, } static PyObject * -make_somezreplacement(PyObject *object, char *sep, PyObject *tzinfoarg) +make_somezreplacement(datetime_state *st, PyObject *object, char *sep, + PyObject *tzinfoarg) { char buf[100]; PyObject *tzinfo = get_tzinfo_member(object); @@ -1568,7 +1562,7 @@ make_somezreplacement(PyObject *object, char *sep, PyObject *tzinfoarg) } assert(tzinfoarg != NULL); - if (format_utcoffset(buf, + if (format_utcoffset(st, buf, sizeof(buf), sep, tzinfo, @@ -1579,7 +1573,8 @@ make_somezreplacement(PyObject *object, char *sep, PyObject *tzinfoarg) } static PyObject * -make_Zreplacement(PyObject *object, PyObject *tzinfoarg) +make_Zreplacement(datetime_state *st, PyObject *object, + PyObject *tzinfoarg) { PyObject *temp; PyObject *tzinfo = get_tzinfo_member(object); @@ -1591,7 +1586,7 @@ make_Zreplacement(PyObject *object, PyObject *tzinfoarg) return Zreplacement; assert(tzinfoarg != NULL); - temp = call_tzname(tzinfo, tzinfoarg); + temp = call_tzname(st, tzinfo, tzinfoarg); if (temp == NULL) goto Error; if (temp == Py_None) { @@ -1624,10 +1619,11 @@ make_Zreplacement(PyObject *object, PyObject *tzinfoarg) static PyObject * make_freplacement(PyObject *object) { + datetime_state *st = find_module_state_by_def(Py_TYPE(object)); char freplacement[64]; - if (PyTime_Check(object)) + if (PyTime_Check(st, object)) sprintf(freplacement, "%06d", TIME_GET_MICROSECOND(object)); - else if (PyDateTime_Check(object)) + else if (PyDateTime_Check(st, object)) sprintf(freplacement, "%06d", DATE_GET_MICROSECOND(object)); else sprintf(freplacement, "%06d", 0); @@ -1688,6 +1684,7 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple, pnew = PyBytes_AsString(newfmt); usednew = 0; + datetime_state *st = find_module_state_by_def(Py_TYPE(object)); while ((ch = *pin++) != '\0') { if (ch != '%') { ptoappend = pin - 1; @@ -1706,7 +1703,7 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple, else if (ch == 'z') { /* %z -> +HHMM */ if (zreplacement == NULL) { - zreplacement = make_somezreplacement(object, "", tzinfoarg); + zreplacement = make_somezreplacement(st, object, "", tzinfoarg); if (zreplacement == NULL) goto Done; } @@ -1718,7 +1715,7 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple, else if (ch == ':' && *pin == 'z' && pin++) { /* %:z -> +HH:MM */ if (colonzreplacement == NULL) { - colonzreplacement = make_somezreplacement(object, ":", tzinfoarg); + colonzreplacement = make_somezreplacement(st, object, ":", tzinfoarg); if (colonzreplacement == NULL) goto Done; } @@ -1730,7 +1727,7 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple, else if (ch == 'Z') { /* format tzname */ if (Zreplacement == NULL) { - Zreplacement = make_Zreplacement(object, + Zreplacement = make_Zreplacement(st, object, tzinfoarg); if (Zreplacement == NULL) goto Done; @@ -1879,7 +1876,7 @@ diff_to_bool(int diff, int op) * due to ubiquitous overflow possibilities. */ static PyObject * -delta_to_microseconds(PyDateTime_Delta *self) +delta_to_microseconds(datetime_state *st, PyDateTime_Delta *self) { PyObject *x1 = NULL; PyObject *x2 = NULL; @@ -1889,7 +1886,6 @@ delta_to_microseconds(PyDateTime_Delta *self) x1 = PyLong_FromLong(GET_TD_DAYS(self)); if (x1 == NULL) goto Done; - datetime_state *st = STATIC_STATE(); x2 = PyNumber_Multiply(x1, st->seconds_per_day); /* days in seconds */ if (x2 == NULL) goto Done; @@ -1952,7 +1948,8 @@ checked_divmod(PyObject *a, PyObject *b) /* Convert a number of us (as a Python int) to a timedelta. */ static PyObject * -microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type) +microseconds_to_delta_ex(datetime_state *st, PyObject *pyus, + PyTypeObject *type) { int us; int s; @@ -1962,7 +1959,6 @@ microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type) PyObject *num = NULL; PyObject *result = NULL; - datetime_state *st = STATIC_STATE(); tuple = checked_divmod(pyus, st->us_per_second); if (tuple == NULL) { goto Done; @@ -2014,17 +2010,18 @@ microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type) goto Done; } -#define microseconds_to_delta(pymicros) \ - microseconds_to_delta_ex(pymicros, &PyDateTime_DeltaType) +#define microseconds_to_delta(st, pymicros) \ + microseconds_to_delta_ex(st, pymicros, (st)->PyDateTime_DeltaType) static PyObject * -multiply_int_timedelta(PyObject *intobj, PyDateTime_Delta *delta) +multiply_int_timedelta(datetime_state *st, PyObject *intobj, + PyDateTime_Delta *delta) { PyObject *pyus_in; PyObject *pyus_out; PyObject *result; - pyus_in = delta_to_microseconds(delta); + pyus_in = delta_to_microseconds(st, delta); if (pyus_in == NULL) return NULL; @@ -2033,7 +2030,7 @@ multiply_int_timedelta(PyObject *intobj, PyDateTime_Delta *delta) if (pyus_out == NULL) return NULL; - result = microseconds_to_delta(pyus_out); + result = microseconds_to_delta(st, pyus_out); Py_DECREF(pyus_out); return result; } @@ -2067,13 +2064,15 @@ get_float_as_integer_ratio(PyObject *floatobj) /* op is 0 for multiplication, 1 for division */ static PyObject * -multiply_truedivide_timedelta_float(PyDateTime_Delta *delta, PyObject *floatobj, int op) +multiply_truedivide_timedelta_float(datetime_state *st, + PyDateTime_Delta *delta, + PyObject *floatobj, int op) { PyObject *result = NULL; PyObject *pyus_in = NULL, *temp, *pyus_out; PyObject *ratio = NULL; - pyus_in = delta_to_microseconds(delta); + pyus_in = delta_to_microseconds(st, delta); if (pyus_in == NULL) return NULL; ratio = get_float_as_integer_ratio(floatobj); @@ -2088,7 +2087,7 @@ multiply_truedivide_timedelta_float(PyDateTime_Delta *delta, PyObject *floatobj, Py_DECREF(temp); if (pyus_out == NULL) goto error; - result = microseconds_to_delta(pyus_out); + result = microseconds_to_delta(st, pyus_out); Py_DECREF(pyus_out); error: Py_XDECREF(pyus_in); @@ -2098,13 +2097,14 @@ multiply_truedivide_timedelta_float(PyDateTime_Delta *delta, PyObject *floatobj, } static PyObject * -divide_timedelta_int(PyDateTime_Delta *delta, PyObject *intobj) +divide_timedelta_int(datetime_state *st, PyDateTime_Delta *delta, + PyObject *intobj) { PyObject *pyus_in; PyObject *pyus_out; PyObject *result; - pyus_in = delta_to_microseconds(delta); + pyus_in = delta_to_microseconds(st, delta); if (pyus_in == NULL) return NULL; @@ -2113,23 +2113,24 @@ divide_timedelta_int(PyDateTime_Delta *delta, PyObject *intobj) if (pyus_out == NULL) return NULL; - result = microseconds_to_delta(pyus_out); + result = microseconds_to_delta(st, pyus_out); Py_DECREF(pyus_out); return result; } static PyObject * -divide_timedelta_timedelta(PyDateTime_Delta *left, PyDateTime_Delta *right) +divide_timedelta_timedelta(datetime_state *st, PyDateTime_Delta *left, + PyDateTime_Delta *right) { PyObject *pyus_left; PyObject *pyus_right; PyObject *result; - pyus_left = delta_to_microseconds(left); + pyus_left = delta_to_microseconds(st, left); if (pyus_left == NULL) return NULL; - pyus_right = delta_to_microseconds(right); + pyus_right = delta_to_microseconds(st, right); if (pyus_right == NULL) { Py_DECREF(pyus_left); return NULL; @@ -2142,17 +2143,18 @@ divide_timedelta_timedelta(PyDateTime_Delta *left, PyDateTime_Delta *right) } static PyObject * -truedivide_timedelta_timedelta(PyDateTime_Delta *left, PyDateTime_Delta *right) +truedivide_timedelta_timedelta(datetime_state *st, PyDateTime_Delta *left, + PyDateTime_Delta *right) { PyObject *pyus_left; PyObject *pyus_right; PyObject *result; - pyus_left = delta_to_microseconds(left); + pyus_left = delta_to_microseconds(st, left); if (pyus_left == NULL) return NULL; - pyus_right = delta_to_microseconds(right); + pyus_right = delta_to_microseconds(st, right); if (pyus_right == NULL) { Py_DECREF(pyus_left); return NULL; @@ -2165,18 +2167,20 @@ truedivide_timedelta_timedelta(PyDateTime_Delta *left, PyDateTime_Delta *right) } static PyObject * -truedivide_timedelta_int(PyDateTime_Delta *delta, PyObject *i) +truedivide_timedelta_int(datetime_state *st, PyDateTime_Delta *delta, + PyObject *i) { PyObject *result; PyObject *pyus_in, *pyus_out; - pyus_in = delta_to_microseconds(delta); + pyus_in = delta_to_microseconds(st, delta); if (pyus_in == NULL) return NULL; pyus_out = divide_nearest(pyus_in, i); Py_DECREF(pyus_in); if (pyus_out == NULL) return NULL; - result = microseconds_to_delta(pyus_out); + + result = microseconds_to_delta(st, pyus_out); Py_DECREF(pyus_out); return result; @@ -2186,8 +2190,9 @@ static PyObject * delta_add(PyObject *left, PyObject *right) { PyObject *result = Py_NotImplemented; + datetime_state *st = find_state_left_or_right(left, right); - if (PyDelta_Check(left) && PyDelta_Check(right)) { + if (PyDelta_Check(st, left) && PyDelta_Check(st, right)) { /* delta + delta */ /* The C-level additions can't overflow because of the * invariant bounds. @@ -2196,7 +2201,7 @@ delta_add(PyObject *left, PyObject *right) int seconds = GET_TD_SECONDS(left) + GET_TD_SECONDS(right); int microseconds = GET_TD_MICROSECONDS(left) + GET_TD_MICROSECONDS(right); - result = new_delta(days, seconds, microseconds, 1); + result = new_delta(st, days, seconds, microseconds, 1); } if (result == Py_NotImplemented) @@ -2207,7 +2212,9 @@ delta_add(PyObject *left, PyObject *right) static PyObject * delta_negative(PyDateTime_Delta *self) { - return new_delta(-GET_TD_DAYS(self), + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return new_delta(st, + -GET_TD_DAYS(self), -GET_TD_SECONDS(self), -GET_TD_MICROSECONDS(self), 1); @@ -2219,7 +2226,9 @@ delta_positive(PyDateTime_Delta *self) /* Could optimize this (by returning self) if this isn't a * subclass -- but who uses unary + ? Approximately nobody. */ - return new_delta(GET_TD_DAYS(self), + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return new_delta(st, + GET_TD_DAYS(self), GET_TD_SECONDS(self), GET_TD_MICROSECONDS(self), 0); @@ -2245,8 +2254,9 @@ static PyObject * delta_subtract(PyObject *left, PyObject *right) { PyObject *result = Py_NotImplemented; + datetime_state *st = find_state_left_or_right(left, right); - if (PyDelta_Check(left) && PyDelta_Check(right)) { + if (PyDelta_Check(st, left) && PyDelta_Check(st, right)) { /* delta - delta */ /* The C-level additions can't overflow because of the * invariant bounds. @@ -2255,7 +2265,7 @@ delta_subtract(PyObject *left, PyObject *right) int seconds = GET_TD_SECONDS(left) - GET_TD_SECONDS(right); int microseconds = GET_TD_MICROSECONDS(left) - GET_TD_MICROSECONDS(right); - result = new_delta(days, seconds, microseconds, 1); + result = new_delta(st, days, seconds, microseconds, 1); } if (result == Py_NotImplemented) @@ -2279,7 +2289,8 @@ delta_cmp(PyObject *self, PyObject *other) static PyObject * delta_richcompare(PyObject *self, PyObject *other, int op) { - if (PyDelta_Check(other)) { + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + if (PyDelta_Check(st, other)) { int diff = delta_cmp(self, other); return diff_to_bool(diff, op); } @@ -2307,22 +2318,23 @@ static PyObject * delta_multiply(PyObject *left, PyObject *right) { PyObject *result = Py_NotImplemented; + datetime_state *st = find_state_left_or_right(left, right); - if (PyDelta_Check(left)) { + if (PyDelta_Check(st, left)) { /* delta * ??? */ if (PyLong_Check(right)) - result = multiply_int_timedelta(right, + result = multiply_int_timedelta(st, right, (PyDateTime_Delta *) left); else if (PyFloat_Check(right)) result = multiply_truedivide_timedelta_float( - (PyDateTime_Delta *) left, right, 0); + st, (PyDateTime_Delta *) left, right, 0); } else if (PyLong_Check(left)) - result = multiply_int_timedelta(left, + result = multiply_int_timedelta(st, left, (PyDateTime_Delta *) right); else if (PyFloat_Check(left)) result = multiply_truedivide_timedelta_float( - (PyDateTime_Delta *) right, left, 0); + st, (PyDateTime_Delta *) right, left, 0); if (result == Py_NotImplemented) Py_INCREF(result); @@ -2333,15 +2345,16 @@ static PyObject * delta_divide(PyObject *left, PyObject *right) { PyObject *result = Py_NotImplemented; + datetime_state *st = find_state_left_or_right(left, right); - if (PyDelta_Check(left)) { + if (PyDelta_Check(st, left)) { /* delta * ??? */ if (PyLong_Check(right)) - result = divide_timedelta_int( + result = divide_timedelta_int(st, (PyDateTime_Delta *)left, right); - else if (PyDelta_Check(right)) - result = divide_timedelta_timedelta( + else if (PyDelta_Check(st, right)) + result = divide_timedelta_timedelta(st, (PyDateTime_Delta *)left, (PyDateTime_Delta *)right); } @@ -2355,17 +2368,18 @@ static PyObject * delta_truedivide(PyObject *left, PyObject *right) { PyObject *result = Py_NotImplemented; + datetime_state *st = find_state_left_or_right(left, right); - if (PyDelta_Check(left)) { - if (PyDelta_Check(right)) - result = truedivide_timedelta_timedelta( + if (PyDelta_Check(st, left)) { + if (PyDelta_Check(st, right)) + result = truedivide_timedelta_timedelta(st, (PyDateTime_Delta *)left, (PyDateTime_Delta *)right); else if (PyFloat_Check(right)) result = multiply_truedivide_timedelta_float( - (PyDateTime_Delta *)left, right, 1); + st, (PyDateTime_Delta *)left, right, 1); else if (PyLong_Check(right)) - result = truedivide_timedelta_int( + result = truedivide_timedelta_int(st, (PyDateTime_Delta *)left, right); } @@ -2381,15 +2395,16 @@ delta_remainder(PyObject *left, PyObject *right) PyObject *pyus_right; PyObject *pyus_remainder; PyObject *remainder; + datetime_state *st = find_module_state_by_def(Py_TYPE(left)); - if (!PyDelta_Check(left) || !PyDelta_Check(right)) + if (!PyDelta_Check(st, left) || !PyDelta_Check(st, right)) Py_RETURN_NOTIMPLEMENTED; - pyus_left = delta_to_microseconds((PyDateTime_Delta *)left); + pyus_left = delta_to_microseconds(st, (PyDateTime_Delta *)left); if (pyus_left == NULL) return NULL; - pyus_right = delta_to_microseconds((PyDateTime_Delta *)right); + pyus_right = delta_to_microseconds(st, (PyDateTime_Delta *)right); if (pyus_right == NULL) { Py_DECREF(pyus_left); return NULL; @@ -2401,7 +2416,7 @@ delta_remainder(PyObject *left, PyObject *right) if (pyus_remainder == NULL) return NULL; - remainder = microseconds_to_delta(pyus_remainder); + remainder = microseconds_to_delta(st, pyus_remainder); Py_DECREF(pyus_remainder); if (remainder == NULL) return NULL; @@ -2417,15 +2432,16 @@ delta_divmod(PyObject *left, PyObject *right) PyObject *divmod; PyObject *delta; PyObject *result; + datetime_state *st = find_module_state_by_def(Py_TYPE(left)); - if (!PyDelta_Check(left) || !PyDelta_Check(right)) + if (!PyDelta_Check(st, left) || !PyDelta_Check(st, right)) Py_RETURN_NOTIMPLEMENTED; - pyus_left = delta_to_microseconds((PyDateTime_Delta *)left); + pyus_left = delta_to_microseconds(st, (PyDateTime_Delta *)left); if (pyus_left == NULL) return NULL; - pyus_right = delta_to_microseconds((PyDateTime_Delta *)right); + pyus_right = delta_to_microseconds(st, (PyDateTime_Delta *)right); if (pyus_right == NULL) { Py_DECREF(pyus_left); return NULL; @@ -2437,7 +2453,7 @@ delta_divmod(PyObject *left, PyObject *right) if (divmod == NULL) return NULL; - delta = microseconds_to_delta(PyTuple_GET_ITEM(divmod, 1)); + delta = microseconds_to_delta(st, PyTuple_GET_ITEM(divmod, 1)); if (delta == NULL) { Py_DECREF(divmod); return NULL; @@ -2581,7 +2597,7 @@ delta_new(PyTypeObject *type, PyObject *args, PyObject *kw) y = accum("microseconds", x, us, _PyLong_GetOne(), &leftover_us); CLEANUP; } - datetime_state *st = STATIC_STATE(); + datetime_state *st = find_module_state_by_def(type); if (ms) { y = accum("milliseconds", x, ms, st->us_per_ms, &leftover_us); CLEANUP; @@ -2643,7 +2659,7 @@ delta_new(PyTypeObject *type, PyObject *args, PyObject *kw) CLEANUP; } - self = microseconds_to_delta_ex(x, type); + self = microseconds_to_delta_ex(st, x, type); Py_DECREF(x); Done: return self; @@ -2754,11 +2770,11 @@ delta_total_seconds(PyObject *self, PyObject *Py_UNUSED(ignored)) PyObject *total_seconds; PyObject *total_microseconds; - total_microseconds = delta_to_microseconds((PyDateTime_Delta *)self); + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + total_microseconds = delta_to_microseconds(st, (PyDateTime_Delta *)self); if (total_microseconds == NULL) return NULL; - datetime_state *st = STATIC_STATE(); total_seconds = PyNumber_TrueDivide(total_microseconds, st->us_per_second); Py_DECREF(total_microseconds); @@ -2771,6 +2787,22 @@ delta_reduce(PyDateTime_Delta* self, PyObject *Py_UNUSED(ignored)) return Py_BuildValue("ON", Py_TYPE(self), delta_getstate(self)); } +static int +delta_traverse(PyDateTime_Delta *self, visitproc visit, void *arg) +{ + Py_VISIT(Py_TYPE(self)); + return 0; +} + +static void +delta_dealloc(PyDateTime_Delta *self) +{ + PyTypeObject *tp = Py_TYPE(self); + PyObject_GC_UnTrack(self); + tp->tp_free((PyObject *)self); + Py_DECREF(tp); +} + #define OFFSET(field) offsetof(PyDateTime_Delta, field) static PyMemberDef delta_members[] = { @@ -2803,82 +2835,41 @@ PyDoc_STR("Difference between two datetime values.\n\n" "All arguments are optional and default to 0.\n" "Arguments may be integers or floats, and may be positive or negative."); -static PyNumberMethods delta_as_number = { - delta_add, /* nb_add */ - delta_subtract, /* nb_subtract */ - delta_multiply, /* nb_multiply */ - delta_remainder, /* nb_remainder */ - delta_divmod, /* nb_divmod */ - 0, /* nb_power */ - (unaryfunc)delta_negative, /* nb_negative */ - (unaryfunc)delta_positive, /* nb_positive */ - (unaryfunc)delta_abs, /* nb_absolute */ - (inquiry)delta_bool, /* nb_bool */ - 0, /*nb_invert*/ - 0, /*nb_lshift*/ - 0, /*nb_rshift*/ - 0, /*nb_and*/ - 0, /*nb_xor*/ - 0, /*nb_or*/ - 0, /*nb_int*/ - 0, /*nb_reserved*/ - 0, /*nb_float*/ - 0, /*nb_inplace_add*/ - 0, /*nb_inplace_subtract*/ - 0, /*nb_inplace_multiply*/ - 0, /*nb_inplace_remainder*/ - 0, /*nb_inplace_power*/ - 0, /*nb_inplace_lshift*/ - 0, /*nb_inplace_rshift*/ - 0, /*nb_inplace_and*/ - 0, /*nb_inplace_xor*/ - 0, /*nb_inplace_or*/ - delta_divide, /* nb_floor_divide */ - delta_truedivide, /* nb_true_divide */ - 0, /* nb_inplace_floor_divide */ - 0, /* nb_inplace_true_divide */ +static PyType_Slot delta_slots[] = { + {Py_tp_repr, delta_repr}, + {Py_tp_hash, delta_hash}, + {Py_tp_str, delta_str}, + {Py_tp_doc, (void *)delta_doc}, + {Py_tp_richcompare, delta_richcompare}, + {Py_tp_methods, delta_methods}, + {Py_tp_members, delta_members}, + {Py_tp_new, delta_new}, + {Py_tp_traverse, delta_traverse}, + {Py_tp_dealloc, delta_dealloc}, + + // Number protocol + {Py_nb_add, delta_add}, + {Py_nb_subtract, delta_subtract}, + {Py_nb_multiply, delta_multiply}, + {Py_nb_remainder, delta_remainder}, + {Py_nb_divmod, delta_divmod}, + {Py_nb_negative, delta_negative}, + {Py_nb_positive, delta_positive}, + {Py_nb_absolute, delta_abs}, + {Py_nb_bool, delta_bool}, + {Py_nb_floor_divide, delta_divide}, + {Py_nb_true_divide, delta_truedivide}, + {0, NULL}, }; -static PyTypeObject PyDateTime_DeltaType = { - PyVarObject_HEAD_INIT(NULL, 0) - "datetime.timedelta", /* tp_name */ - sizeof(PyDateTime_Delta), /* tp_basicsize */ - 0, /* tp_itemsize */ - 0, /* tp_dealloc */ - 0, /* tp_vectorcall_offset */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_as_async */ - (reprfunc)delta_repr, /* tp_repr */ - &delta_as_number, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - (hashfunc)delta_hash, /* tp_hash */ - 0, /* tp_call */ - (reprfunc)delta_str, /* tp_str */ - PyObject_GenericGetAttr, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - delta_doc, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - delta_richcompare, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - delta_methods, /* tp_methods */ - delta_members, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - 0, /* tp_init */ - 0, /* tp_alloc */ - delta_new, /* tp_new */ - 0, /* tp_free */ +static PyType_Spec delta_spec = { + .name = "datetime.timedelta", + .basicsize = sizeof(PyDateTime_Delta), + .flags = (Py_TPFLAGS_DEFAULT | + Py_TPFLAGS_BASETYPE | + Py_TPFLAGS_HAVE_GC | + Py_TPFLAGS_IMMUTABLETYPE), + .slots = delta_slots, }; /* @@ -3193,12 +3184,13 @@ add_date_timedelta(PyDateTime_Date *date, PyDateTime_Delta *delta, int negate) static PyObject * date_add(PyObject *left, PyObject *right) { - if (PyDateTime_Check(left) || PyDateTime_Check(right)) + datetime_state *st = find_state_left_or_right(left, right); + if (PyDateTime_Check(st, left) || PyDateTime_Check(st, right)) Py_RETURN_NOTIMPLEMENTED; - if (PyDate_Check(left)) { + if (PyDate_Check(st, left)) { /* date + ??? */ - if (PyDelta_Check(right)) + if (PyDelta_Check(st, right)) /* date + delta */ return add_date_timedelta((PyDateTime_Date *) left, (PyDateTime_Delta *) right, @@ -3208,7 +3200,7 @@ date_add(PyObject *left, PyObject *right) /* ??? + date * 'right' must be one of us, or we wouldn't have been called */ - if (PyDelta_Check(left)) + if (PyDelta_Check(st, left)) /* delta + date */ return add_date_timedelta((PyDateTime_Date *) right, (PyDateTime_Delta *) left, @@ -3220,11 +3212,12 @@ date_add(PyObject *left, PyObject *right) static PyObject * date_subtract(PyObject *left, PyObject *right) { - if (PyDateTime_Check(left) || PyDateTime_Check(right)) + datetime_state *st = find_state_left_or_right(left, right); + if (PyDateTime_Check(st, left) || PyDateTime_Check(st, right)) Py_RETURN_NOTIMPLEMENTED; - if (PyDate_Check(left)) { - if (PyDate_Check(right)) { + if (PyDate_Check(st, left)) { + if (PyDate_Check(st, right)) { /* date - date */ int left_ord = ymd_to_ord(GET_YEAR(left), GET_MONTH(left), @@ -3232,9 +3225,9 @@ date_subtract(PyObject *left, PyObject *right) int right_ord = ymd_to_ord(GET_YEAR(right), GET_MONTH(right), GET_DAY(right)); - return new_delta(left_ord - right_ord, 0, 0, 0); + return new_delta(st, left_ord - right_ord, 0, 0, 0); } - if (PyDelta_Check(right)) { + if (PyDelta_Check(st, right)) { /* date - delta */ return add_date_timedelta((PyDateTime_Date *) left, (PyDateTime_Delta *) right, @@ -3400,6 +3393,23 @@ iso_calendar_date_weekday(PyDateTime_IsoCalendarDate *self, void *unused) return Py_NewRef(weekday); } +static int +iso_calendar_date_traverse(PyDateTime_IsoCalendarDate *self, visitproc visit, + void *arg) +{ + Py_VISIT(Py_TYPE(self)); + return PyTuple_Type.tp_traverse((PyObject *)self, visit, arg); +} + +static void +iso_calendar_date_dealloc(PyDateTime_IsoCalendarDate *self) +{ + PyTypeObject *tp = Py_TYPE(self); + // tupledealloc does PyObject_GC_UnTrack + PyTuple_Type.tp_dealloc((PyObject *)self); + Py_DECREF(tp); +} + static PyGetSetDef iso_calendar_date_getset[] = { {"year", (getter)iso_calendar_date_year}, {"week", (getter)iso_calendar_date_week}, @@ -3413,17 +3423,24 @@ static PyMethodDef iso_calendar_date_methods[] = { {NULL, NULL}, }; -static PyTypeObject PyDateTime_IsoCalendarDateType = { - PyVarObject_HEAD_INIT(NULL, 0) - .tp_name = "datetime.IsoCalendarDate", - .tp_basicsize = sizeof(PyDateTime_IsoCalendarDate), - .tp_repr = (reprfunc) iso_calendar_date_repr, - .tp_flags = Py_TPFLAGS_DEFAULT, - .tp_doc = iso_calendar_date__doc__, - .tp_methods = iso_calendar_date_methods, - .tp_getset = iso_calendar_date_getset, - // .tp_base = &PyTuple_Type, // filled in PyInit__datetime - .tp_new = iso_calendar_date_new, +static PyType_Slot isocal_slots[] = { + {Py_tp_repr, iso_calendar_date_repr}, + {Py_tp_doc, (void *)iso_calendar_date__doc__}, + {Py_tp_methods, iso_calendar_date_methods}, + {Py_tp_getset, iso_calendar_date_getset}, + {Py_tp_new, iso_calendar_date_new}, + {Py_tp_dealloc, iso_calendar_date_dealloc}, + {Py_tp_traverse, iso_calendar_date_traverse}, + {0, NULL}, +}; + +static PyType_Spec isocal_spec = { + .name = "datetime.IsoCalendarDate", + .basicsize = sizeof(PyDateTime_IsoCalendarDate), + .flags = (Py_TPFLAGS_DEFAULT | + Py_TPFLAGS_HAVE_GC | + Py_TPFLAGS_IMMUTABLETYPE), + .slots = isocal_slots, }; /*[clinic input] @@ -3473,7 +3490,8 @@ date_isocalendar(PyDateTime_Date *self, PyObject *Py_UNUSED(ignored)) week = 0; } - PyObject* v = iso_calendar_date_new_impl(&PyDateTime_IsoCalendarDateType, + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + PyObject* v = iso_calendar_date_new_impl(st->PyDateTime_IsoCalendarDateType, year, week + 1, day + 1); if (v == NULL) { return NULL; @@ -3494,7 +3512,8 @@ date_richcompare(PyObject *self, PyObject *other, int op) * The behavior is the same as if Date and DateTime were independent * classes. */ - if (PyDate_Check(other) && !PyDateTime_Check(other)) { + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + if (PyDate_Check(st, other) && !PyDateTime_Check(st, other)) { int diff = memcmp(((PyDateTime_Date *)self)->data, ((PyDateTime_Date *)other)->data, _PyDateTime_DATE_DATASIZE); @@ -3584,6 +3603,22 @@ date_reduce(PyDateTime_Date *self, PyObject *arg) return Py_BuildValue("(ON)", Py_TYPE(self), date_getstate(self)); } +static int +date_traverse(PyDateTime_Date *self, visitproc visit, void *arg) +{ + Py_VISIT(Py_TYPE(self)); + return 0; +} + +static void +date_dealloc(PyDateTime_Date *self) +{ + PyTypeObject *tp = Py_TYPE(self); + PyObject_GC_UnTrack(self); + tp->tp_free((PyObject *)self); + Py_DECREF(tp); +} + static PyMethodDef date_methods[] = { /* Class methods: */ @@ -3654,59 +3689,32 @@ static PyMethodDef date_methods[] = { static const char date_doc[] = PyDoc_STR("date(year, month, day) --> date object"); -static PyNumberMethods date_as_number = { - date_add, /* nb_add */ - date_subtract, /* nb_subtract */ - 0, /* nb_multiply */ - 0, /* nb_remainder */ - 0, /* nb_divmod */ - 0, /* nb_power */ - 0, /* nb_negative */ - 0, /* nb_positive */ - 0, /* nb_absolute */ - 0, /* nb_bool */ +static PyType_Slot date_slots[] = { + {Py_tp_repr, date_repr}, + {Py_tp_hash, date_hash}, + {Py_tp_str, date_str}, + {Py_tp_doc, (void *)date_doc}, + {Py_tp_richcompare, date_richcompare}, + {Py_tp_methods, date_methods}, + {Py_tp_getset, date_getset}, + {Py_tp_new, date_new}, + {Py_tp_traverse, date_traverse}, + {Py_tp_dealloc, date_dealloc}, + + // Number protocol + {Py_nb_add, date_add}, + {Py_nb_subtract, date_subtract}, + {0, NULL}, }; -static PyTypeObject PyDateTime_DateType = { - PyVarObject_HEAD_INIT(NULL, 0) - "datetime.date", /* tp_name */ - sizeof(PyDateTime_Date), /* tp_basicsize */ - 0, /* tp_itemsize */ - 0, /* tp_dealloc */ - 0, /* tp_vectorcall_offset */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_as_async */ - (reprfunc)date_repr, /* tp_repr */ - &date_as_number, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - (hashfunc)date_hash, /* tp_hash */ - 0, /* tp_call */ - (reprfunc)date_str, /* tp_str */ - PyObject_GenericGetAttr, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - date_doc, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - date_richcompare, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - date_methods, /* tp_methods */ - 0, /* tp_members */ - date_getset, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - 0, /* tp_init */ - 0, /* tp_alloc */ - date_new, /* tp_new */ - 0, /* tp_free */ +static PyType_Spec date_spec = { + .name = "datetime.date", + .basicsize = sizeof(PyDateTime_Date), + .flags = (Py_TPFLAGS_DEFAULT | + Py_TPFLAGS_BASETYPE | + Py_TPFLAGS_HAVE_GC | + Py_TPFLAGS_IMMUTABLETYPE), + .slots = date_slots, }; /* @@ -3769,7 +3777,8 @@ tzinfo_fromutc(PyDateTime_TZInfo *self, PyObject *dt) PyObject *off = NULL, *dst = NULL; PyDateTime_Delta *delta = NULL; - if (!PyDateTime_Check(dt)) { + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + if (!PyDateTime_Check(st, dt)) { PyErr_SetString(PyExc_TypeError, "fromutc: argument must be a datetime"); return NULL; @@ -3806,7 +3815,7 @@ tzinfo_fromutc(PyDateTime_TZInfo *self, PyObject *dt) goto Fail; Py_DECREF(dst); - dst = call_dst(GET_DT_TZINFO(dt), result); + dst = call_dst(st, GET_DT_TZINFO(dt), result); if (dst == NULL) goto Fail; if (dst == Py_None) @@ -3869,6 +3878,22 @@ tzinfo_reduce(PyObject *self, PyObject *Py_UNUSED(ignored)) return Py_BuildValue("(ONN)", Py_TYPE(self), args, state); } +static int +tzinfo_traverse(PyObject *self, visitproc visit, void *arg) +{ + Py_VISIT(Py_TYPE(self)); + return 0; +} + +static void +tzinfo_dealloc(PyObject *self) +{ + PyTypeObject *tp = Py_TYPE(self); + PyObject_GC_UnTrack(self); + tp->tp_free(self); + Py_DECREF(tp); +} + static PyMethodDef tzinfo_methods[] = { {"tzname", (PyCFunction)tzinfo_tzname, METH_O, @@ -3893,46 +3918,22 @@ static PyMethodDef tzinfo_methods[] = { static const char tzinfo_doc[] = PyDoc_STR("Abstract base class for time zone info objects."); -static PyTypeObject PyDateTime_TZInfoType = { - PyVarObject_HEAD_INIT(NULL, 0) - "datetime.tzinfo", /* tp_name */ - sizeof(PyDateTime_TZInfo), /* tp_basicsize */ - 0, /* tp_itemsize */ - 0, /* tp_dealloc */ - 0, /* tp_vectorcall_offset */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_as_async */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - PyObject_GenericGetAttr, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - tzinfo_doc, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - tzinfo_methods, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - 0, /* tp_init */ - 0, /* tp_alloc */ - PyType_GenericNew, /* tp_new */ - 0, /* tp_free */ +static PyType_Slot tzinfo_slots[] = { + {Py_tp_doc, (void *)tzinfo_doc}, + {Py_tp_methods, tzinfo_methods}, + {Py_tp_dealloc, tzinfo_dealloc}, + {Py_tp_traverse, tzinfo_traverse}, + {0, NULL}, +}; + +static PyType_Spec tzinfo_spec = { + .name = "datetime.tzinfo", + .basicsize = sizeof(PyDateTime_TZInfo), + .flags = (Py_TPFLAGS_DEFAULT | + Py_TPFLAGS_BASETYPE | + Py_TPFLAGS_HAVE_GC | + Py_TPFLAGS_IMMUTABLETYPE), + .slots = tzinfo_slots, }; static char *timezone_kws[] = {"offset", "name", NULL}; @@ -3942,19 +3943,39 @@ timezone_new(PyTypeObject *type, PyObject *args, PyObject *kw) { PyObject *offset; PyObject *name = NULL; + datetime_state *st = find_module_state_by_def(type); if (PyArg_ParseTupleAndKeywords(args, kw, "O!|U:timezone", timezone_kws, - &PyDateTime_DeltaType, &offset, &name)) + st->PyDateTime_DeltaType, &offset, &name)) return new_timezone(offset, name); return NULL; } -static void -timezone_dealloc(PyDateTime_TimeZone *self) +static int +timezone_traverse(PyDateTime_TimeZone *self, visitproc visit, void *arg) +{ + Py_VISIT(Py_TYPE(self)); + Py_VISIT(self->offset); + Py_VISIT(self->name); + return 0; +} + +static int +timezone_clear(PyDateTime_TimeZone *self) { Py_CLEAR(self->offset); Py_CLEAR(self->name); + return 0; +} + +static void +timezone_dealloc(PyDateTime_TimeZone *self) +{ + PyTypeObject *tp = Py_TYPE(self); + PyObject_GC_UnTrack(self); + (void)timezone_clear(self); Py_TYPE(self)->tp_free((PyObject *)self); + Py_DECREF(tp); } static PyObject * @@ -3963,7 +3984,8 @@ timezone_richcompare(PyDateTime_TimeZone *self, { if (op != Py_EQ && op != Py_NE) Py_RETURN_NOTIMPLEMENTED; - if (!PyTimezone_Check(other)) { + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + if (!PyTimezone_Check(st, other)) { Py_RETURN_NOTIMPLEMENTED; } return delta_richcompare(self->offset, other->offset, op); @@ -3980,9 +4002,9 @@ timezone_hash(PyDateTime_TimeZone *self) otherwise. */ static int -_timezone_check_argument(PyObject *dt, const char *meth) +_timezone_check_argument(datetime_state *st, PyObject *dt, const char *meth) { - if (dt == Py_None || PyDateTime_Check(dt)) + if (dt == Py_None || PyDateTime_Check(st, dt)) return 0; PyErr_Format(PyExc_TypeError, "%s(dt) argument must be a datetime instance" " or None, not %.200s", meth, Py_TYPE(dt)->tp_name); @@ -3996,7 +4018,7 @@ timezone_repr(PyDateTime_TimeZone *self) to use Py_TYPE(self)->tp_name here. */ const char *type_name = Py_TYPE(self)->tp_name; - datetime_state *st = STATIC_STATE(); + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); if (((PyObject *)self) == st->utc) { return PyUnicode_FromFormat("%s.utc", type_name); } @@ -4019,7 +4041,7 @@ timezone_str(PyDateTime_TimeZone *self) if (self->name != NULL) { return Py_NewRef(self->name); } - datetime_state *st = STATIC_STATE(); + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); if ((PyObject *)self == st->utc || (GET_TD_DAYS(self->offset) == 0 && GET_TD_SECONDS(self->offset) == 0 && @@ -4059,7 +4081,8 @@ timezone_str(PyDateTime_TimeZone *self) static PyObject * timezone_tzname(PyDateTime_TimeZone *self, PyObject *dt) { - if (_timezone_check_argument(dt, "tzname") == -1) + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + if (_timezone_check_argument(st, dt, "tzname") == -1) return NULL; return timezone_str(self); @@ -4068,7 +4091,8 @@ timezone_tzname(PyDateTime_TimeZone *self, PyObject *dt) static PyObject * timezone_utcoffset(PyDateTime_TimeZone *self, PyObject *dt) { - if (_timezone_check_argument(dt, "utcoffset") == -1) + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + if (_timezone_check_argument(st, dt, "utcoffset") == -1) return NULL; return Py_NewRef(self->offset); @@ -4077,7 +4101,8 @@ timezone_utcoffset(PyDateTime_TimeZone *self, PyObject *dt) static PyObject * timezone_dst(PyObject *self, PyObject *dt) { - if (_timezone_check_argument(dt, "dst") == -1) + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + if (_timezone_check_argument(st, dt, "dst") == -1) return NULL; Py_RETURN_NONE; @@ -4086,7 +4111,8 @@ timezone_dst(PyObject *self, PyObject *dt) static PyObject * timezone_fromutc(PyDateTime_TimeZone *self, PyDateTime_DateTime *dt) { - if (!PyDateTime_Check(dt)) { + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + if (!PyDateTime_Check(st, dt)) { PyErr_SetString(PyExc_TypeError, "fromutc: argument must be a datetime"); return NULL; @@ -4131,45 +4157,27 @@ static PyMethodDef timezone_methods[] = { static const char timezone_doc[] = PyDoc_STR("Fixed offset from UTC implementation of tzinfo."); -static PyTypeObject PyDateTime_TimeZoneType = { - PyVarObject_HEAD_INIT(NULL, 0) - "datetime.timezone", /* tp_name */ - sizeof(PyDateTime_TimeZone), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)timezone_dealloc, /* tp_dealloc */ - 0, /* tp_vectorcall_offset */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_as_async */ - (reprfunc)timezone_repr, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - (hashfunc)timezone_hash, /* tp_hash */ - 0, /* tp_call */ - (reprfunc)timezone_str, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT, /* tp_flags */ - timezone_doc, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - (richcmpfunc)timezone_richcompare,/* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - timezone_methods, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base; filled in PyInit__datetime */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - 0, /* tp_init */ - 0, /* tp_alloc */ - timezone_new, /* tp_new */ +static PyType_Slot timezone_slots[] = { + {Py_tp_dealloc, timezone_dealloc}, + {Py_tp_traverse, timezone_traverse}, + {Py_tp_clear, timezone_clear}, + {Py_tp_repr, timezone_repr}, + {Py_tp_hash, timezone_hash}, + {Py_tp_str, timezone_str}, + {Py_tp_doc, (void *)timezone_doc}, + {Py_tp_richcompare, timezone_richcompare}, + {Py_tp_methods, timezone_methods}, + {Py_tp_new, timezone_new}, + {0, NULL}, +}; + +static PyType_Spec timezone_spec = { + .name = "datetime.timezone", + .basicsize = sizeof(PyDateTime_TimeZone), + .flags = (Py_TPFLAGS_DEFAULT | + Py_TPFLAGS_HAVE_GC | + Py_TPFLAGS_IMMUTABLETYPE), + .slots = timezone_slots, }; /* @@ -4237,10 +4245,11 @@ static char *time_kws[] = {"hour", "minute", "second", "microsecond", static PyObject * time_from_pickle(PyTypeObject *type, PyObject *state, PyObject *tzinfo) { + datetime_state *st = find_module_state_by_def(type); PyDateTime_Time *me; char aware = (char)(tzinfo != Py_None); - if (aware && check_tzinfo_subclass(tzinfo) < 0) { + if (aware && check_tzinfo_subclass(st, tzinfo) < 0) { PyErr_SetString(PyExc_TypeError, "bad tzinfo state arg"); return NULL; } @@ -4322,6 +4331,21 @@ time_new(PyTypeObject *type, PyObject *args, PyObject *kw) return self; } +static int +time_traverse(PyDateTime_Time *self, visitproc visit, void *arg) +{ + Py_VISIT(Py_TYPE(self)); + Py_VISIT(self->tzinfo); + return 0; +} + +static int +time_clear(PyDateTime_Time *self) +{ + Py_CLEAR(self->tzinfo); + return 0; +} + /* * Destructor. */ @@ -4329,10 +4353,11 @@ time_new(PyTypeObject *type, PyObject *args, PyObject *kw) static void time_dealloc(PyDateTime_Time *self) { - if (HASTZINFO(self)) { - Py_XDECREF(self->tzinfo); - } - Py_TYPE(self)->tp_free((PyObject *)self); + PyTypeObject *tp = Py_TYPE(self); + PyObject_GC_UnTrack(self); + (void)time_clear(self); + tp->tp_free((PyObject *)self); + Py_DECREF(tp); } /* @@ -4342,17 +4367,20 @@ time_dealloc(PyDateTime_Time *self) /* These are all METH_NOARGS, so don't need to check the arglist. */ static PyObject * time_utcoffset(PyObject *self, PyObject *unused) { - return call_utcoffset(GET_TIME_TZINFO(self), Py_None); + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return call_utcoffset(st, GET_TIME_TZINFO(self), Py_None); } static PyObject * time_dst(PyObject *self, PyObject *unused) { - return call_dst(GET_TIME_TZINFO(self), Py_None); + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return call_dst(st, GET_TIME_TZINFO(self), Py_None); } static PyObject * time_tzname(PyDateTime_Time *self, PyObject *unused) { - return call_tzname(GET_TIME_TZINFO(self), Py_None); + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return call_tzname(st, GET_TIME_TZINFO(self), Py_None); } /* @@ -4447,7 +4475,8 @@ time_isoformat(PyDateTime_Time *self, PyObject *args, PyObject *kw) return result; /* We need to append the UTC offset. */ - if (format_utcoffset(buf, sizeof(buf), ":", self->tzinfo, + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + if (format_utcoffset(st, buf, sizeof(buf), ":", self->tzinfo, Py_None) < 0) { Py_DECREF(result); return NULL; @@ -4498,7 +4527,8 @@ time_richcompare(PyObject *self, PyObject *other, int op) PyObject *offset1, *offset2; int diff; - if (! PyTime_Check(other)) + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + if (!PyTime_Check(st, other)) Py_RETURN_NOTIMPLEMENTED; if (GET_TIME_TZINFO(self) == GET_TIME_TZINFO(other)) { @@ -4518,7 +4548,7 @@ time_richcompare(PyObject *self, PyObject *other, int op) * offset2 == Py_None at this point. */ if ((offset1 == offset2) || - (PyDelta_Check(offset1) && PyDelta_Check(offset2) && + (PyDelta_Check(st, offset1) && PyDelta_Check(st, offset2) && delta_cmp(offset1, offset2) == 0)) { diff = memcmp(((PyDateTime_Time *)self)->data, ((PyDateTime_Time *)other)->data, @@ -4598,7 +4628,9 @@ time_hash(PyDateTime_Time *self) TIME_GET_MINUTE(self) * 60 + TIME_GET_SECOND(self); microseconds = TIME_GET_MICROSECOND(self); - temp1 = new_delta(0, seconds, microseconds, 1); + + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + temp1 = new_delta(st, 0, seconds, microseconds, 1); if (temp1 == NULL) { Py_DECREF(offset); return -1; @@ -4675,7 +4707,8 @@ time_fromisoformat(PyObject *cls, PyObject *tstr) { goto invalid_string_error; } - PyObject *tzinfo = tzinfo_from_isoformat_results(rv, tzoffset, + datetime_state *st = find_module_state_by_def(cls); + PyObject *tzinfo = tzinfo_from_isoformat_results(st, rv, tzoffset, tzimicrosecond); if (tzinfo == NULL) { @@ -4683,8 +4716,8 @@ time_fromisoformat(PyObject *cls, PyObject *tstr) { } PyObject *t; - if ( (PyTypeObject *)cls == &PyDateTime_TimeType ) { - t = new_time(hour, minute, second, microsecond, tzinfo, 0); + if ( (PyTypeObject *)cls == st->PyDateTime_TimeType ) { + t = new_time(st, hour, minute, second, microsecond, tzinfo, 0); } else { t = PyObject_CallFunction(cls, "iiiiO", hour, minute, second, microsecond, tzinfo); @@ -4790,46 +4823,29 @@ PyDoc_STR("time([hour[, minute[, second[, microsecond[, tzinfo]]]]]) --> a time All arguments are optional. tzinfo may be None, or an instance of\n\ a tzinfo subclass. The remaining arguments may be ints.\n"); -static PyTypeObject PyDateTime_TimeType = { - PyVarObject_HEAD_INIT(NULL, 0) - "datetime.time", /* tp_name */ - sizeof(PyDateTime_Time), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)time_dealloc, /* tp_dealloc */ - 0, /* tp_vectorcall_offset */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_as_async */ - (reprfunc)time_repr, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - (hashfunc)time_hash, /* tp_hash */ - 0, /* tp_call */ - (reprfunc)time_str, /* tp_str */ - PyObject_GenericGetAttr, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - time_doc, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - time_richcompare, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - time_methods, /* tp_methods */ - 0, /* tp_members */ - time_getset, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - 0, /* tp_init */ - time_alloc, /* tp_alloc */ - time_new, /* tp_new */ - 0, /* tp_free */ +static PyType_Slot time_slots[] = { + {Py_tp_dealloc, time_dealloc}, + {Py_tp_traverse, time_traverse}, + {Py_tp_clear, time_clear}, + {Py_tp_repr, time_repr}, + {Py_tp_hash, time_hash}, + {Py_tp_str, time_str}, + {Py_tp_doc, (void *)time_doc}, + {Py_tp_richcompare, time_richcompare}, + {Py_tp_methods, time_methods}, + {Py_tp_getset, time_getset}, + {Py_tp_new, time_new}, + {0, NULL}, +}; + +static PyType_Spec time_spec = { + .name = "datetime.time", + .basicsize = sizeof(PyDateTime_Time), + .flags = (Py_TPFLAGS_DEFAULT | + Py_TPFLAGS_BASETYPE | + Py_TPFLAGS_HAVE_GC | + Py_TPFLAGS_IMMUTABLETYPE), + .slots = time_slots, }; /* @@ -4899,10 +4915,11 @@ static char *datetime_kws[] = { static PyObject * datetime_from_pickle(PyTypeObject *type, PyObject *state, PyObject *tzinfo) { + datetime_state *st = find_module_state_by_def(type); PyDateTime_DateTime *me; char aware = (char)(tzinfo != Py_None); - if (aware && check_tzinfo_subclass(tzinfo) < 0) { + if (aware && check_tzinfo_subclass(st, tzinfo) < 0) { PyErr_SetString(PyExc_TypeError, "bad tzinfo state arg"); return NULL; } @@ -5170,7 +5187,8 @@ datetime_datetime_now_impl(PyTypeObject *type, PyObject *tz) /* Return best possible local time -- this isn't constrained by the * precision of a timestamp. */ - if (check_tzinfo_subclass(tz) < 0) + datetime_state *st = find_module_state_by_def(type); + if (check_tzinfo_subclass(st, tz) < 0) return NULL; self = datetime_best_possible((PyObject *)type, @@ -5214,7 +5232,8 @@ datetime_fromtimestamp(PyObject *cls, PyObject *args, PyObject *kw) if (! PyArg_ParseTupleAndKeywords(args, kw, "O|O:fromtimestamp", keywords, ×tamp, &tzinfo)) return NULL; - if (check_tzinfo_subclass(tzinfo) < 0) + datetime_state *st = find_module_state_by_def(cls); + if (check_tzinfo_subclass(st, tzinfo) < 0) return NULL; self = datetime_from_timestamp(cls, @@ -5255,19 +5274,21 @@ datetime_utcfromtimestamp(PyObject *cls, PyObject *args) static PyObject * datetime_strptime(PyObject *cls, PyObject *args) { - static PyObject *module = NULL; PyObject *string, *format; if (!PyArg_ParseTuple(args, "UU:strptime", &string, &format)) return NULL; - if (module == NULL) { - module = PyImport_ImportModule("_strptime"); - if (module == NULL) + datetime_state *st = find_module_state_by_def(cls); + if (st->strptime == NULL) { + st->strptime = PyImport_ImportModule("_strptime"); + if (st->strptime == NULL) { return NULL; + } } - return PyObject_CallMethodObjArgs(module, &_Py_ID(_strptime_datetime), - cls, string, format, NULL); + return PyObject_CallMethodObjArgs(st->strptime, + &_Py_ID(_strptime_datetime), + cls, string, format, NULL); } /* Return new datetime from date/datetime and time arguments. */ @@ -5280,9 +5301,10 @@ datetime_combine(PyObject *cls, PyObject *args, PyObject *kw) PyObject *tzinfo = NULL; PyObject *result = NULL; + datetime_state *st = find_module_state_by_def(cls); if (PyArg_ParseTupleAndKeywords(args, kw, "O!O!|O:combine", keywords, - &PyDateTime_DateType, &date, - &PyDateTime_TimeType, &time, &tzinfo)) { + st->PyDateTime_DateType, &date, + st->PyDateTime_TimeType, &time, &tzinfo)) { if (tzinfo == NULL) { if (HASTZINFO(time)) tzinfo = ((PyDateTime_Time *)time)->tzinfo; @@ -5533,7 +5555,8 @@ datetime_fromisoformat(PyObject *cls, PyObject *dtstr) goto invalid_string_error; } - PyObject *tzinfo = tzinfo_from_isoformat_results(rv, tzoffset, tzusec); + datetime_state *st = find_module_state_by_def(cls); + PyObject *tzinfo = tzinfo_from_isoformat_results(st, rv, tzoffset, tzusec); if (tzinfo == NULL) { goto error; } @@ -5557,14 +5580,29 @@ datetime_fromisoformat(PyObject *cls, PyObject *dtstr) /* * Destructor. */ +static int +datetime_traverse(PyDateTime_DateTime *self, visitproc visit, void *arg) +{ + Py_VISIT(Py_TYPE(self)); + Py_VISIT(self->tzinfo); + return 0; +} + +static int +datetime_clear(PyDateTime_DateTime *self) +{ + Py_CLEAR(self->tzinfo); + return 0; +} static void datetime_dealloc(PyDateTime_DateTime *self) { - if (HASTZINFO(self)) { - Py_XDECREF(self->tzinfo); - } - Py_TYPE(self)->tp_free((PyObject *)self); + PyTypeObject *tp = Py_TYPE(self); + PyObject_GC_UnTrack(self); + (void)datetime_clear(self); + tp->tp_free((PyObject *)self); + Py_DECREF(tp); } /* @@ -5574,17 +5612,20 @@ datetime_dealloc(PyDateTime_DateTime *self) /* These are all METH_NOARGS, so don't need to check the arglist. */ static PyObject * datetime_utcoffset(PyObject *self, PyObject *unused) { - return call_utcoffset(GET_DT_TZINFO(self), self); + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return call_utcoffset(st, GET_DT_TZINFO(self), self); } static PyObject * datetime_dst(PyObject *self, PyObject *unused) { - return call_dst(GET_DT_TZINFO(self), self); + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return call_dst(st, GET_DT_TZINFO(self), self); } static PyObject * datetime_tzname(PyObject *self, PyObject *unused) { - return call_tzname(GET_DT_TZINFO(self), self); + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return call_tzname(st, GET_DT_TZINFO(self), self); } /* @@ -5625,16 +5666,17 @@ add_datetime_timedelta(PyDateTime_DateTime *date, PyDateTime_Delta *delta, static PyObject * datetime_add(PyObject *left, PyObject *right) { - if (PyDateTime_Check(left)) { + datetime_state *st = find_state_left_or_right(left, right); + if (PyDateTime_Check(st, left)) { /* datetime + ??? */ - if (PyDelta_Check(right)) + if (PyDelta_Check(st, right)) /* datetime + delta */ return add_datetime_timedelta( (PyDateTime_DateTime *)left, (PyDateTime_Delta *)right, 1); } - else if (PyDelta_Check(left)) { + else if (PyDelta_Check(st, left)) { /* delta + datetime */ return add_datetime_timedelta((PyDateTime_DateTime *) right, (PyDateTime_Delta *) left, @@ -5647,10 +5689,10 @@ static PyObject * datetime_subtract(PyObject *left, PyObject *right) { PyObject *result = Py_NotImplemented; - - if (PyDateTime_Check(left)) { + datetime_state *st = find_state_left_or_right(left, right); + if (PyDateTime_Check(st, left)) { /* datetime - ??? */ - if (PyDateTime_Check(right)) { + if (PyDateTime_Check(st, right)) { /* datetime - datetime */ PyObject *offset1, *offset2, *offdiff = NULL; int delta_d, delta_s, delta_us; @@ -5706,7 +5748,7 @@ datetime_subtract(PyObject *left, PyObject *right) DATE_GET_SECOND(right)); delta_us = DATE_GET_MICROSECOND(left) - DATE_GET_MICROSECOND(right); - result = new_delta(delta_d, delta_s, delta_us, 1); + result = new_delta(st, delta_d, delta_s, delta_us, 1); if (result == NULL) return NULL; @@ -5715,7 +5757,7 @@ datetime_subtract(PyObject *left, PyObject *right) Py_DECREF(offdiff); } } - else if (PyDelta_Check(right)) { + else if (PyDelta_Check(st, right)) { /* datetime - delta */ result = add_datetime_timedelta( (PyDateTime_DateTime *)left, @@ -5839,7 +5881,8 @@ datetime_isoformat(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) return result; /* We need to append the UTC offset. */ - if (format_utcoffset(buffer, sizeof(buffer), ":", self->tzinfo, + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + if (format_utcoffset(st, buffer, sizeof(buffer), ":", self->tzinfo, (PyObject *)self) < 0) { Py_DECREF(result); return NULL; @@ -5929,8 +5972,8 @@ datetime_richcompare(PyObject *self, PyObject *other, int op) PyObject *result = NULL; PyObject *offset1, *offset2; int diff; - - if (!PyDateTime_Check(other)) { + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + if (!PyDateTime_Check(st, other)) { Py_RETURN_NOTIMPLEMENTED; } @@ -5951,7 +5994,7 @@ datetime_richcompare(PyObject *self, PyObject *other, int op) * offset2 == Py_None at this point. */ if ((offset1 == offset2) || - (PyDelta_Check(offset1) && PyDelta_Check(offset2) && + (PyDelta_Check(st, offset1) && PyDelta_Check(st, offset2) && delta_cmp(offset1, offset2) == 0)) { diff = memcmp(((PyDateTime_DateTime *)self)->data, ((PyDateTime_DateTime *)other)->data, @@ -6046,7 +6089,9 @@ datetime_hash(PyDateTime_DateTime *self) seconds = DATE_GET_HOUR(self) * 3600 + DATE_GET_MINUTE(self) * 60 + DATE_GET_SECOND(self); - temp1 = new_delta(days, seconds, + + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + temp1 = new_delta(st, days, seconds, DATE_GET_MICROSECOND(self), 1); if (temp1 == NULL) { @@ -6097,7 +6142,7 @@ datetime_datetime_replace_impl(PyDateTime_DateTime *self, int year, } static PyObject * -local_timezone_from_timestamp(time_t timestamp) +local_timezone_from_timestamp(datetime_state *st, time_t timestamp) { PyObject *result = NULL; PyObject *delta; @@ -6109,7 +6154,7 @@ local_timezone_from_timestamp(time_t timestamp) return NULL; #ifdef HAVE_STRUCT_TM_TM_ZONE zone = local_time_tm.tm_zone; - delta = new_delta(0, local_time_tm.tm_gmtoff, 0, 1); + delta = new_delta(st, 0, local_time_tm.tm_gmtoff, 0, 1); #else /* HAVE_STRUCT_TM_TM_ZONE */ { PyObject *local_time, *utc_time; @@ -6117,7 +6162,8 @@ local_timezone_from_timestamp(time_t timestamp) char buf[100]; strftime(buf, sizeof(buf), "%Z", &local_time_tm); zone = buf; - local_time = new_datetime(local_time_tm.tm_year + 1900, + local_time = new_datetime(st, + local_time_tm.tm_year + 1900, local_time_tm.tm_mon + 1, local_time_tm.tm_mday, local_time_tm.tm_hour, @@ -6128,7 +6174,8 @@ local_timezone_from_timestamp(time_t timestamp) } if (_PyTime_gmtime(timestamp, &utc_time_tm) != 0) return NULL; - utc_time = new_datetime(utc_time_tm.tm_year + 1900, + utc_time = new_datetime(st, + utc_time_tm.tm_year + 1900, utc_time_tm.tm_mon + 1, utc_time_tm.tm_mday, utc_time_tm.tm_hour, @@ -6166,16 +6213,16 @@ local_timezone(PyDateTime_DateTime *utc_time) PyObject *one_second; PyObject *seconds; - datetime_state *st = STATIC_STATE(); + datetime_state *st = find_module_state_by_def(Py_TYPE(utc_time)); delta = datetime_subtract((PyObject *)utc_time, st->epoch); if (delta == NULL) return NULL; - one_second = new_delta(0, 1, 0, 0); + one_second = new_delta(st, 0, 1, 0, 0); if (one_second == NULL) { Py_DECREF(delta); return NULL; } - seconds = divide_timedelta_timedelta((PyDateTime_Delta *)delta, + seconds = divide_timedelta_timedelta(st, (PyDateTime_Delta *)delta, (PyDateTime_Delta *)one_second); Py_DECREF(one_second); Py_DECREF(delta); @@ -6185,7 +6232,7 @@ local_timezone(PyDateTime_DateTime *utc_time) Py_DECREF(seconds); if (timestamp == -1 && PyErr_Occurred()) return NULL; - return local_timezone_from_timestamp(timestamp); + return local_timezone_from_timestamp(st, timestamp); } static long long @@ -6222,7 +6269,9 @@ local_timezone_from_local(PyDateTime_DateTime *local_dt) /* XXX: add bounds check */ timestamp = seconds - epoch; - return local_timezone_from_timestamp(timestamp); + + datetime_state *st = find_module_state_by_def(Py_TYPE(local_dt)); + return local_timezone_from_timestamp(st, timestamp); } static PyDateTime_DateTime * @@ -6239,7 +6288,8 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) &tzinfo)) return NULL; - if (check_tzinfo_subclass(tzinfo) == -1) + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + if (check_tzinfo_subclass(st, tzinfo) == -1) return NULL; if (!HASTZINFO(self) || self->tzinfo == Py_None) { @@ -6258,7 +6308,7 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) } /* Convert self to UTC. */ - offset = call_utcoffset(self_tzinfo, (PyObject *)self); + offset = call_utcoffset(st, self_tzinfo, (PyObject *)self); Py_DECREF(self_tzinfo); if (offset == NULL) return NULL; @@ -6266,7 +6316,7 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) Py_DECREF(offset); goto naive; } - else if (!PyDelta_Check(offset)) { + else if (!PyDelta_Check(st, offset)) { Py_DECREF(offset); PyErr_Format(PyExc_TypeError, "utcoffset() returned %.200s," " expected timedelta or None", Py_TYPE(offset)->tp_name); @@ -6279,7 +6329,6 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) if (result == NULL) return NULL; - datetime_state *st = STATIC_STATE(); /* Make sure result is aware and UTC. */ if (!HASTZINFO(result)) { temp = (PyObject *)result; @@ -6331,7 +6380,8 @@ datetime_timetuple(PyDateTime_DateTime *self, PyObject *Py_UNUSED(ignored)) if (HASTZINFO(self) && self->tzinfo != Py_None) { PyObject * dst; - dst = call_dst(self->tzinfo, (PyObject *)self); + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + dst = call_dst(st, self->tzinfo, (PyObject *)self); if (dst == NULL) return NULL; @@ -6404,7 +6454,7 @@ datetime_timestamp(PyDateTime_DateTime *self, PyObject *Py_UNUSED(ignored)) PyObject *result; if (HASTZINFO(self) && self->tzinfo != Py_None) { - datetime_state *st = STATIC_STATE(); + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); PyObject *delta; delta = datetime_subtract((PyObject *)self, st->epoch); if (delta == NULL) @@ -6432,7 +6482,9 @@ datetime_timestamp(PyDateTime_DateTime *self, PyObject *Py_UNUSED(ignored)) static PyObject * datetime_getdate(PyDateTime_DateTime *self, PyObject *Py_UNUSED(ignored)) { - return new_date(GET_YEAR(self), + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return new_date(st, + GET_YEAR(self), GET_MONTH(self), GET_DAY(self)); } @@ -6440,7 +6492,9 @@ datetime_getdate(PyDateTime_DateTime *self, PyObject *Py_UNUSED(ignored)) static PyObject * datetime_gettime(PyDateTime_DateTime *self, PyObject *Py_UNUSED(ignored)) { - return new_time(DATE_GET_HOUR(self), + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return new_time(st, + DATE_GET_HOUR(self), DATE_GET_MINUTE(self), DATE_GET_SECOND(self), DATE_GET_MICROSECOND(self), @@ -6451,7 +6505,9 @@ datetime_gettime(PyDateTime_DateTime *self, PyObject *Py_UNUSED(ignored)) static PyObject * datetime_gettimetz(PyDateTime_DateTime *self, PyObject *Py_UNUSED(ignored)) { - return new_time(DATE_GET_HOUR(self), + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return new_time(st, + DATE_GET_HOUR(self), DATE_GET_MINUTE(self), DATE_GET_SECOND(self), DATE_GET_MICROSECOND(self), @@ -6472,7 +6528,8 @@ datetime_utctimetuple(PyDateTime_DateTime *self, PyObject *Py_UNUSED(ignored)) } else { PyObject *offset; - offset = call_utcoffset(tzinfo, (PyObject *)self); + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + offset = call_utcoffset(st, tzinfo, (PyObject *)self); if (offset == NULL) return NULL; if (offset == Py_None) { @@ -6637,60 +6694,33 @@ PyDoc_STR("datetime(year, month, day[, hour[, minute[, second[, microsecond[,tzi The year, month and day arguments are required. tzinfo may be None, or an\n\ instance of a tzinfo subclass. The remaining arguments may be ints.\n"); -static PyNumberMethods datetime_as_number = { - datetime_add, /* nb_add */ - datetime_subtract, /* nb_subtract */ - 0, /* nb_multiply */ - 0, /* nb_remainder */ - 0, /* nb_divmod */ - 0, /* nb_power */ - 0, /* nb_negative */ - 0, /* nb_positive */ - 0, /* nb_absolute */ - 0, /* nb_bool */ +static PyType_Slot datetime_slots[] = { + {Py_tp_dealloc, datetime_dealloc}, + {Py_tp_traverse, datetime_traverse}, + {Py_tp_clear, datetime_clear}, + {Py_tp_repr, datetime_repr}, + {Py_tp_hash, datetime_hash}, + {Py_tp_str, datetime_str}, + {Py_tp_doc, (void *)datetime_doc}, + {Py_tp_richcompare, datetime_richcompare}, + {Py_tp_methods, datetime_methods}, + {Py_tp_getset, datetime_getset}, + {Py_tp_new, datetime_new}, + + // Number protocol + {Py_nb_add, datetime_add}, + {Py_nb_subtract, datetime_subtract}, + {0, NULL}, }; -static PyTypeObject PyDateTime_DateTimeType = { - PyVarObject_HEAD_INIT(NULL, 0) - "datetime.datetime", /* tp_name */ - sizeof(PyDateTime_DateTime), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)datetime_dealloc, /* tp_dealloc */ - 0, /* tp_vectorcall_offset */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_as_async */ - (reprfunc)datetime_repr, /* tp_repr */ - &datetime_as_number, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - (hashfunc)datetime_hash, /* tp_hash */ - 0, /* tp_call */ - (reprfunc)datetime_str, /* tp_str */ - PyObject_GenericGetAttr, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - datetime_doc, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - datetime_richcompare, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - datetime_methods, /* tp_methods */ - 0, /* tp_members */ - datetime_getset, /* tp_getset */ - 0, /* tp_base; filled in - PyInit__datetime */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - 0, /* tp_init */ - datetime_alloc, /* tp_alloc */ - datetime_new, /* tp_new */ - 0, /* tp_free */ +static PyType_Spec datetime_spec = { + .name = "datetime.datetime", + .basicsize = sizeof(PyDateTime_DateTime), + .flags = (Py_TPFLAGS_DEFAULT | + Py_TPFLAGS_BASETYPE | + Py_TPFLAGS_HAVE_GC | + Py_TPFLAGS_IMMUTABLETYPE), + .slots = datetime_slots, }; /* --------------------------------------------------------------------------- @@ -6705,18 +6735,18 @@ static PyMethodDef module_methods[] = { * Clients get at C API via PyDateTime_IMPORT, defined in datetime.h. */ static inline PyDateTime_CAPI * -get_datetime_capi(void) +get_datetime_capi(datetime_state *st) { PyDateTime_CAPI *capi = PyMem_Malloc(sizeof(PyDateTime_CAPI)); if (capi == NULL) { PyErr_NoMemory(); return NULL; } - capi->DateType = &PyDateTime_DateType; - capi->DateTimeType = &PyDateTime_DateTimeType; - capi->TimeType = &PyDateTime_TimeType; - capi->DeltaType = &PyDateTime_DeltaType; - capi->TZInfoType = &PyDateTime_TZInfoType; + capi->DateType = st->PyDateTime_DateType; + capi->DateTimeType = st->PyDateTime_DateTimeType; + capi->TimeType = st->PyDateTime_TimeType; + capi->DeltaType = st->PyDateTime_DeltaType; + capi->TZInfoType = st->PyDateTime_TZInfoType; capi->Date_FromDate = new_date_ex; capi->DateTime_FromDateAndTime = new_datetime_ex; capi->Time_FromTime = new_time_ex; @@ -6728,7 +6758,6 @@ get_datetime_capi(void) capi->Time_FromTimeAndFold = new_time_ex2; // Make sure this function is called after utc has // been initialized. - datetime_state *st = STATIC_STATE(); assert(st->utc != NULL); capi->TimeZone_UTC = st->utc; // borrowed ref return capi; @@ -6741,31 +6770,14 @@ datetime_destructor(PyObject *op) PyMem_Free(ptr); } -static int -datetime_clear(PyObject *module) -{ - datetime_state *st = STATIC_STATE(); - - Py_CLEAR(st->us_per_ms); - Py_CLEAR(st->us_per_second); - Py_CLEAR(st->us_per_minute); - Py_CLEAR(st->us_per_hour); - Py_CLEAR(st->us_per_day); - Py_CLEAR(st->us_per_week); - Py_CLEAR(st->seconds_per_day); - Py_CLEAR(st->utc); - Py_CLEAR(st->epoch); - return 0; -} - static PyObject * -create_timezone_from_delta(int days, int sec, int ms, int normalize) +create_timezone_from_delta(datetime_state *st, int days, int sec, int ms, int normalize) { - PyObject *delta = new_delta(days, sec, ms, normalize); + PyObject *delta = new_delta(st, days, sec, ms, normalize); if (delta == NULL) { return NULL; } - PyObject *tz = create_timezone(delta, NULL); + PyObject *tz = create_timezone(st, delta, NULL); Py_DECREF(delta); return tz; } @@ -6807,36 +6819,54 @@ init_state(datetime_state *st) } /* Init UTC timezone */ - st->utc = create_timezone_from_delta(0, 0, 0, 0); + st->utc = create_timezone_from_delta(st, 0, 0, 0, 0); if (st->utc == NULL) { return -1; } /* Init Unix epoch */ - st->epoch = new_datetime(1970, 1, 1, 0, 0, 0, 0, st->utc, 0); + st->epoch = new_datetime(st, 1970, 1, 1, 0, 0, 0, 0, st->utc, 0); if (st->epoch == NULL) { return -1; } return 0; } +static int module_clear(PyObject *module); + static int _datetime_exec(PyObject *module) { - // `&...` is not a constant expression according to a strict reading - // of C standards. Fill tp_base at run-time rather than statically. - // See https://bugs.python.org/issue40777 - PyDateTime_IsoCalendarDateType.tp_base = &PyTuple_Type; - PyDateTime_TimeZoneType.tp_base = &PyDateTime_TZInfoType; - PyDateTime_DateTimeType.tp_base = &PyDateTime_DateType; + datetime_state *st = get_module_state(module); + +#define CREATE_TYPE(MOD, VAR, SPEC, BASE) do { \ + PyObject *tp = PyType_FromModuleAndSpec(MOD, SPEC, (PyObject *)BASE); \ + if (tp == NULL) { \ + goto error; \ + } \ + VAR = (PyTypeObject *)tp; \ +} while (0) + + CREATE_TYPE(module, st->PyDateTime_TimeType, &time_spec, NULL); + CREATE_TYPE(module, st->PyDateTime_TZInfoType, &tzinfo_spec, NULL); + CREATE_TYPE(module, st->PyDateTime_TimeZoneType, &timezone_spec, + st->PyDateTime_TZInfoType); + CREATE_TYPE(module, st->PyDateTime_IsoCalendarDateType, &isocal_spec, + &PyTuple_Type); + CREATE_TYPE(module, st->PyDateTime_DeltaType, &delta_spec, NULL); + CREATE_TYPE(module, st->PyDateTime_DateType, &date_spec, NULL); + CREATE_TYPE(module, st->PyDateTime_DateTimeType, &datetime_spec, + st->PyDateTime_DateType); + +#undef CREATE_TYPE PyTypeObject *types[] = { - &PyDateTime_DateType, - &PyDateTime_DateTimeType, - &PyDateTime_TimeType, - &PyDateTime_DeltaType, - &PyDateTime_TZInfoType, - &PyDateTime_TimeZoneType, + st->PyDateTime_DateType, + st->PyDateTime_DateTimeType, + st->PyDateTime_TimeType, + st->PyDateTime_DeltaType, + st->PyDateTime_TZInfoType, + st->PyDateTime_TimeZoneType, }; for (size_t i = 0; i < Py_ARRAY_LENGTH(types); i++) { @@ -6845,10 +6875,6 @@ _datetime_exec(PyObject *module) } } - if (PyType_Ready(&PyDateTime_IsoCalendarDateType) < 0) { - goto error; - } - #define DATETIME_ADD_MACRO(dict, c, value_expr) \ do { \ PyObject *value = (value_expr); \ @@ -6863,39 +6889,38 @@ _datetime_exec(PyObject *module) } while(0) /* timedelta values */ - PyObject *d = PyDateTime_DeltaType.tp_dict; - DATETIME_ADD_MACRO(d, "resolution", new_delta(0, 0, 1, 0)); - DATETIME_ADD_MACRO(d, "min", new_delta(-MAX_DELTA_DAYS, 0, 0, 0)); + PyObject *d = st->PyDateTime_DeltaType->tp_dict; + DATETIME_ADD_MACRO(d, "resolution", new_delta(st, 0, 0, 1, 0)); + DATETIME_ADD_MACRO(d, "min", new_delta(st, -MAX_DELTA_DAYS, 0, 0, 0)); DATETIME_ADD_MACRO(d, "max", - new_delta(MAX_DELTA_DAYS, 24*3600-1, 1000000-1, 0)); + new_delta(st, MAX_DELTA_DAYS, 24*3600-1, 1000000-1, 0)); /* date values */ - d = PyDateTime_DateType.tp_dict; - DATETIME_ADD_MACRO(d, "min", new_date(1, 1, 1)); - DATETIME_ADD_MACRO(d, "max", new_date(MAXYEAR, 12, 31)); - DATETIME_ADD_MACRO(d, "resolution", new_delta(1, 0, 0, 0)); + d = st->PyDateTime_DateType->tp_dict; + DATETIME_ADD_MACRO(d, "min", new_date(st, 1, 1, 1)); + DATETIME_ADD_MACRO(d, "max", new_date(st, MAXYEAR, 12, 31)); + DATETIME_ADD_MACRO(d, "resolution", new_delta(st, 1, 0, 0, 0)); /* time values */ - d = PyDateTime_TimeType.tp_dict; - DATETIME_ADD_MACRO(d, "min", new_time(0, 0, 0, 0, Py_None, 0)); - DATETIME_ADD_MACRO(d, "max", new_time(23, 59, 59, 999999, Py_None, 0)); - DATETIME_ADD_MACRO(d, "resolution", new_delta(0, 0, 1, 0)); + d = st->PyDateTime_TimeType->tp_dict; + DATETIME_ADD_MACRO(d, "min", new_time(st, 0, 0, 0, 0, Py_None, 0)); + DATETIME_ADD_MACRO(d, "max", new_time(st, 23, 59, 59, 999999, Py_None, 0)); + DATETIME_ADD_MACRO(d, "resolution", new_delta(st, 0, 0, 1, 0)); /* datetime values */ - d = PyDateTime_DateTimeType.tp_dict; + d = st->PyDateTime_DateTimeType->tp_dict; DATETIME_ADD_MACRO(d, "min", - new_datetime(1, 1, 1, 0, 0, 0, 0, Py_None, 0)); - DATETIME_ADD_MACRO(d, "max", new_datetime(MAXYEAR, 12, 31, 23, 59, 59, + new_datetime(st, 1, 1, 1, 0, 0, 0, 0, Py_None, 0)); + DATETIME_ADD_MACRO(d, "max", new_datetime(st, MAXYEAR, 12, 31, 23, 59, 59, 999999, Py_None, 0)); - DATETIME_ADD_MACRO(d, "resolution", new_delta(0, 0, 1, 0)); + DATETIME_ADD_MACRO(d, "resolution", new_delta(st, 0, 0, 1, 0)); - datetime_state *st = STATIC_STATE(); if (init_state(st) < 0) { goto error; } /* timezone values */ - d = PyDateTime_TimeZoneType.tp_dict; + d = st->PyDateTime_TimeZoneType->tp_dict; if (PyDict_SetItemString(d, "utc", st->utc) < 0) { goto error; } @@ -6905,11 +6930,11 @@ _datetime_exec(PyObject *module) * values. This may change in the future.*/ /* -23:59 */ - PyObject *min = create_timezone_from_delta(-1, 60, 0, 1); + PyObject *min = create_timezone_from_delta(st, -1, 60, 0, 1); DATETIME_ADD_MACRO(d, "min", min); /* +23:59 */ - PyObject *max = create_timezone_from_delta(0, (23 * 60 + 59) * 60, 0, 0); + PyObject *max = create_timezone_from_delta(st, 0, (23 * 60 + 59) * 60, 0, 0); DATETIME_ADD_MACRO(d, "max", max); /* Add module level attributes */ @@ -6924,7 +6949,7 @@ _datetime_exec(PyObject *module) } /* At last, set up and add the encapsulated C API */ - PyDateTime_CAPI *capi = get_datetime_capi(); + PyDateTime_CAPI *capi = get_datetime_capi(st); if (capi == NULL) { goto error; } @@ -6960,32 +6985,87 @@ _datetime_exec(PyObject *module) return 0; error: - datetime_clear(module); + module_clear(module); return -1; } #undef DATETIME_ADD_MACRO +static int +module_traverse(PyObject *module, visitproc visit, void *arg) +{ + datetime_state *st = get_module_state(module); + Py_VISIT(st->us_per_ms); + Py_VISIT(st->us_per_second); + Py_VISIT(st->us_per_minute); + Py_VISIT(st->us_per_hour); + Py_VISIT(st->us_per_day); + Py_VISIT(st->us_per_week); + Py_VISIT(st->seconds_per_day); + Py_VISIT(st->utc); + Py_VISIT(st->epoch); + Py_VISIT(st->strptime); + Py_VISIT(st->PyDateTime_DateTimeType); + Py_VISIT(st->PyDateTime_DateType); + Py_VISIT(st->PyDateTime_DeltaType); + Py_VISIT(st->PyDateTime_IsoCalendarDateType); + Py_VISIT(st->PyDateTime_TZInfoType); + Py_VISIT(st->PyDateTime_TimeType); + Py_VISIT(st->PyDateTime_TimeZoneType); + return 0; +} + +static int +module_clear(PyObject *module) +{ + datetime_state *st = get_module_state(module); + Py_CLEAR(st->us_per_ms); + Py_CLEAR(st->us_per_second); + Py_CLEAR(st->us_per_minute); + Py_CLEAR(st->us_per_hour); + Py_CLEAR(st->us_per_day); + Py_CLEAR(st->us_per_week); + Py_CLEAR(st->seconds_per_day); + Py_CLEAR(st->utc); + Py_CLEAR(st->epoch); + Py_CLEAR(st->strptime); + Py_CLEAR(st->PyDateTime_DateTimeType); + Py_CLEAR(st->PyDateTime_DateType); + Py_CLEAR(st->PyDateTime_DeltaType); + Py_CLEAR(st->PyDateTime_IsoCalendarDateType); + Py_CLEAR(st->PyDateTime_TZInfoType); + Py_CLEAR(st->PyDateTime_TimeType); + Py_CLEAR(st->PyDateTime_TimeZoneType); + return 0; +} + +static void +module_free(void *module) +{ + (void)module_clear((PyObject *)module); +} + +static struct PyModuleDef_Slot module_slots[] = { + {Py_mod_exec, _datetime_exec}, + {Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED}, + {0, NULL}, +}; + static struct PyModuleDef datetimemodule = { .m_base = PyModuleDef_HEAD_INIT, .m_name = "_datetime", .m_doc = "Fast implementation of the datetime type.", - .m_size = -1, + .m_size = sizeof(datetime_state), .m_methods = module_methods, + .m_slots = module_slots, + .m_traverse = module_traverse, + .m_clear = module_clear, + .m_free = module_free, }; PyMODINIT_FUNC PyInit__datetime(void) { - PyObject *mod = PyModule_Create(&datetimemodule); - if (mod == NULL) - return NULL; - - if (_datetime_exec(mod) < 0) { - Py_DECREF(mod); - return NULL; - } - - return mod; + return PyModuleDef_Init(&datetimemodule); } /* --------------------------------------------------------------------------- From bfab79f60c6165f7931d1f4cad272e2d5f623787 Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Wed, 3 Apr 2024 17:28:58 +0900 Subject: [PATCH 02/18] PyCapsule_Import() every time for subinterp --- Include/datetime.h | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/Include/datetime.h b/Include/datetime.h index b78cc0e8e2e5ac..46a743bfd492b8 100644 --- a/Include/datetime.h +++ b/Include/datetime.h @@ -194,10 +194,24 @@ typedef struct { * */ #ifndef _PY_DATETIME_IMPL /* Define global variable for the C API and a macro for setting it. */ -static PyDateTime_CAPI *PyDateTimeAPI = NULL; +static PyDateTime_CAPI *_pydatetimeapi_main = NULL; -#define PyDateTime_IMPORT \ - PyDateTimeAPI = (PyDateTime_CAPI *)PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0) +static inline void _import_pydatetime(void) { + if (PyInterpreterState_Get() == PyInterpreterState_Main()) { + _pydatetimeapi_main = PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0); + } +} +#define PyDateTime_IMPORT _import_pydatetime() + +static inline PyDateTime_CAPI *_get_pydatetime_api(void) { + if (PyInterpreterState_Get() == PyInterpreterState_Main()) { + return _pydatetimeapi_main; + } + else { + return PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0); + } +} +#define PyDateTimeAPI _get_pydatetime_api() /* Macro for access to the UTC singleton */ #define PyDateTime_TimeZone_UTC PyDateTimeAPI->TimeZone_UTC From 501c3e91805d117bb149aa546098bd24be71d32d Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Wed, 3 Apr 2024 17:31:40 +0900 Subject: [PATCH 03/18] test_datetime_capi() for multi-phase init --- Modules/_testcapi/datetime.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/Modules/_testcapi/datetime.c b/Modules/_testcapi/datetime.c index b1796039f0d83a..9803a830a25af1 100644 --- a/Modules/_testcapi/datetime.c +++ b/Modules/_testcapi/datetime.c @@ -3,23 +3,11 @@ #include "datetime.h" // PyDateTimeAPI -static int test_run_counter = 0; - static PyObject * test_datetime_capi(PyObject *self, PyObject *args) { - if (PyDateTimeAPI) { - if (test_run_counter) { - /* Probably regrtest.py -R */ - Py_RETURN_NONE; - } - else { - PyErr_SetString(PyExc_AssertionError, - "PyDateTime_CAPI somehow initialized"); - return NULL; - } - } - test_run_counter++; + // PyDateTimeAPI cannot be carried over + // with multi-phase init enabled. PyDateTime_IMPORT; if (PyDateTimeAPI) { From a835158adbe7b810b31a787fa26f26f25d93e1fa Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Wed, 3 Apr 2024 17:35:00 +0900 Subject: [PATCH 04/18] add a test case --- Lib/test/test_capi/test_misc.py | 16 +++++++++ Modules/_testmultiphase.c | 59 +++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/Lib/test/test_capi/test_misc.py b/Lib/test/test_capi/test_misc.py index 2f2bf03749f834..00b3ac51b49c4b 100644 --- a/Lib/test/test_capi/test_misc.py +++ b/Lib/test/test_capi/test_misc.py @@ -2203,6 +2203,22 @@ def test_module_state_shared_in_global(self): subinterp_attr_id = os.read(r, 100) self.assertEqual(main_attr_id, subinterp_attr_id) + @unittest.skipIf(_testmultiphase is None, "test requires _testmultiphase module") + def test_datetime_capi_client(self): + script = textwrap.dedent(""" + import importlib.machinery + import importlib.util + fullname = '_test_datetime_capi_client' + origin = importlib.util.find_spec('_testmultiphase').origin + loader = importlib.machinery.ExtensionFileLoader(fullname, origin) + spec = importlib.util.spec_from_loader(fullname, loader) + module = importlib.util.module_from_spec(spec) + spec.loader.exec_module(module) + """) + exec(script) # run main interp first + ret = support.run_in_subinterp(script) + self.assertEqual(ret, 0) + @requires_subinterpreters class InterpreterConfigTests(unittest.TestCase): diff --git a/Modules/_testmultiphase.c b/Modules/_testmultiphase.c index 21c5f696a4f2ec..e09de1d5a7b793 100644 --- a/Modules/_testmultiphase.c +++ b/Modules/_testmultiphase.c @@ -952,3 +952,62 @@ PyInit__test_shared_gil_only(void) { return PyModuleDef_Init(&shared_gil_only_def); } + + +#include "datetime.h" + +static int +datetime_capi_client_exec(PyObject *m) +{ + int ismain = PyInterpreterState_Get() == PyInterpreterState_Main(); + if (ismain) { + _pydatetimeapi_main = NULL; + } + + PyDateTime_IMPORT; + if (PyDateTimeAPI == NULL) { + return -1; + } + if (PyDateTimeAPI != PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0)) { + return -1; + } + if (ismain) { + if (PyDateTimeAPI != _pydatetimeapi_main) { + return -1; + } + } + else { + if (PyDateTimeAPI == _pydatetimeapi_main) { + PyObject *module = PyImport_ImportModule("_datetime"); + if (module == NULL) { + return -1; + } + PyModuleDef *def = PyModule_GetDef(module); + Py_DECREF(module); + if (def) { + // multi-phase init + return -1; + } + else { + // legacy init (shared module) + return 0; + } + } + } + return 0; +} + +static PyModuleDef_Slot datetime_capi_client_slots[] = { + {Py_mod_exec, datetime_capi_client_exec}, + {Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED}, + {0, NULL}, +}; + +static PyModuleDef datetime_capi_client_def = TEST_MODULE_DEF( + "_testmultiphase_datetime_capi_client", datetime_capi_client_slots, NULL); + +PyMODINIT_FUNC +PyInit__test_datetime_capi_client(void) +{ + return PyModuleDef_Init(&datetime_capi_client_def); +} From d11c46a1c7290cf020e4aeb274ecce6565d2a829 Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Wed, 3 Apr 2024 22:02:28 +0900 Subject: [PATCH 05/18] PEP 7 --- Include/datetime.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Include/datetime.h b/Include/datetime.h index 46a743bfd492b8..76544a5ece7267 100644 --- a/Include/datetime.h +++ b/Include/datetime.h @@ -196,14 +196,16 @@ typedef struct { /* Define global variable for the C API and a macro for setting it. */ static PyDateTime_CAPI *_pydatetimeapi_main = NULL; -static inline void _import_pydatetime(void) { +static inline void +_import_pydatetime(void) { if (PyInterpreterState_Get() == PyInterpreterState_Main()) { _pydatetimeapi_main = PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0); } } #define PyDateTime_IMPORT _import_pydatetime() -static inline PyDateTime_CAPI *_get_pydatetime_api(void) { +static inline PyDateTime_CAPI * +_get_pydatetime_api(void) { if (PyInterpreterState_Get() == PyInterpreterState_Main()) { return _pydatetimeapi_main; } From 8329082b0597feea2a404c63c96d91a651cff0d4 Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Wed, 3 Apr 2024 22:23:19 +0900 Subject: [PATCH 06/18] globals-to-fix.tsv, news --- .../2023-03-24-11-10-16.gh-issue-117398.q4ueXs.rst | 1 + Tools/c-analyzer/cpython/globals-to-fix.tsv | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2023-03-24-11-10-16.gh-issue-117398.q4ueXs.rst diff --git a/Misc/NEWS.d/next/Library/2023-03-24-11-10-16.gh-issue-117398.q4ueXs.rst b/Misc/NEWS.d/next/Library/2023-03-24-11-10-16.gh-issue-117398.q4ueXs.rst new file mode 100644 index 00000000000000..843e44d0b78cb8 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2023-03-24-11-10-16.gh-issue-117398.q4ueXs.rst @@ -0,0 +1 @@ +Apply :pep:`687` to :mod:`datetime`. Patch by Erlend Aasland. diff --git a/Tools/c-analyzer/cpython/globals-to-fix.tsv b/Tools/c-analyzer/cpython/globals-to-fix.tsv index 65f94e50e1bd7d..d14a5c2e005f44 100644 --- a/Tools/c-analyzer/cpython/globals-to-fix.tsv +++ b/Tools/c-analyzer/cpython/globals-to-fix.tsv @@ -382,13 +382,6 @@ Modules/_ctypes/ctypes.h - _ctypes_ptrtype_cache - Modules/_ctypes/ctypes.h - basespec_string - Modules/_ctypes/stgdict.c - PyCStgDict_Type - Modules/_cursesmodule.c - PyCursesWindow_Type - -Modules/_datetimemodule.c - PyDateTime_DateTimeType - -Modules/_datetimemodule.c - PyDateTime_DateType - -Modules/_datetimemodule.c - PyDateTime_DeltaType - -Modules/_datetimemodule.c - PyDateTime_IsoCalendarDateType - -Modules/_datetimemodule.c - PyDateTime_TZInfoType - -Modules/_datetimemodule.c - PyDateTime_TimeType - -Modules/_datetimemodule.c - PyDateTime_TimeZoneType - Modules/xxmodule.c - Null_Type - Modules/xxmodule.c - Str_Type - Modules/xxmodule.c - Xxo_Type - @@ -425,13 +418,11 @@ Modules/_ctypes/_ctypes.c CreateSwappedType swapped_suffix - Modules/_ctypes/_ctypes.c - _unpickle - Modules/_ctypes/_ctypes.c PyCArrayType_from_ctype array_cache - Modules/_cursesmodule.c - ModDict - -Modules/_datetimemodule.c datetime_strptime module - ## state Modules/_ctypes/_ctypes.c - _ctypes_ptrtype_cache - Modules/_ctypes/_ctypes.c - global_state - Modules/_ctypes/ctypes.h - global_state - -Modules/_datetimemodule.c - _datetime_global_state - Modules/_tkinter.c - tcl_lock - Modules/_tkinter.c - excInCmd - Modules/_tkinter.c - valInCmd - From b186cc60aeef470313351e6ba485759eca857940 Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Wed, 3 Apr 2024 22:47:33 +0900 Subject: [PATCH 07/18] globals-to-fix again --- Tools/c-analyzer/cpython/globals-to-fix.tsv | 1 + 1 file changed, 1 insertion(+) diff --git a/Tools/c-analyzer/cpython/globals-to-fix.tsv b/Tools/c-analyzer/cpython/globals-to-fix.tsv index d14a5c2e005f44..f7f4239af908e3 100644 --- a/Tools/c-analyzer/cpython/globals-to-fix.tsv +++ b/Tools/c-analyzer/cpython/globals-to-fix.tsv @@ -437,6 +437,7 @@ Modules/_tkinter.c - trbInCmd - ## other Include/datetime.h - PyDateTimeAPI - +Include/datetime.h - _pydatetimeapi_main - Modules/_ctypes/cfield.c _ctypes_get_fielddesc initialized - Modules/_ctypes/malloc_closure.c - _pagesize - Modules/_cursesmodule.c - initialised - From 8198bd0e5966e5cad2cfd624133c73b54e7cac66 Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Wed, 3 Apr 2024 23:06:15 +0900 Subject: [PATCH 08/18] edit globals-to-fix --- Tools/c-analyzer/cpython/globals-to-fix.tsv | 1 - 1 file changed, 1 deletion(-) diff --git a/Tools/c-analyzer/cpython/globals-to-fix.tsv b/Tools/c-analyzer/cpython/globals-to-fix.tsv index f7f4239af908e3..29bc879de31b15 100644 --- a/Tools/c-analyzer/cpython/globals-to-fix.tsv +++ b/Tools/c-analyzer/cpython/globals-to-fix.tsv @@ -436,7 +436,6 @@ Modules/_tkinter.c - trbInCmd - ## initialized once ## other -Include/datetime.h - PyDateTimeAPI - Include/datetime.h - _pydatetimeapi_main - Modules/_ctypes/cfield.c _ctypes_get_fielddesc initialized - Modules/_ctypes/malloc_closure.c - _pagesize - From 5cd698e147a7b450667dcaaa0f9bc6366d5fd202 Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Thu, 11 Apr 2024 04:35:41 +0900 Subject: [PATCH 09/18] fix typos in unused macros --- Modules/_datetimemodule.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index 6a68dfb9cf9706..db86567e06663a 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -26,19 +26,19 @@ #endif #define PyDate_Check(st, op) PyObject_TypeCheck(op, (st)->PyDateTime_DateType) -#define PyDate_CheckExact(st, op) Py_IS_TYPE((op, (st)->PyDateTime_DateType) +#define PyDate_CheckExact(st, op) Py_IS_TYPE(op, (st)->PyDateTime_DateType) #define PyDateTime_Check(st, op) PyObject_TypeCheck(op, (st)->PyDateTime_DateTimeType) -#define PyDateTime_CheckExact(st, op) Py_IS_TYPE((op, (st)->PyDateTime_DateTimeType) +#define PyDateTime_CheckExact(st, op) Py_IS_TYPE(op, (st)->PyDateTime_DateTimeType) #define PyTime_Check(st, op) PyObject_TypeCheck(op, (st)->PyDateTime_TimeType) -#define PyTime_CheckExact(st, op) Py_IS_TYPE((op, (st)->PyDateTime_TimeType) +#define PyTime_CheckExact(st, op) Py_IS_TYPE(op, (st)->PyDateTime_TimeType) #define PyDelta_Check(st, op) PyObject_TypeCheck(op, (st)->PyDateTime_DeltaType) -#define PyDelta_CheckExact(st, op) Py_IS_TYPE((op, (st)->PyDateTime_DeltaType) +#define PyDelta_CheckExact(st, op) Py_IS_TYPE(op, (st)->PyDateTime_DeltaType) #define PyTZInfo_Check(st, op) PyObject_TypeCheck(op, (st)->PyDateTime_TZInfoType) -#define PyTZInfo_CheckExact(st, op) Py_IS_TYPE((op, (st)->PyDateTime_TZInfoType) +#define PyTZInfo_CheckExact(st, op) Py_IS_TYPE(op, (st)->PyDateTime_TZInfoType) #define PyTimezone_Check(st, op) PyObject_TypeCheck(op, (st)->PyDateTime_TimeZoneType) From bbb07fdafdcb5e7029663d50276c026fa218fb49 Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Thu, 11 Apr 2024 06:47:23 +0900 Subject: [PATCH 10/18] less module-state getters --- Modules/_datetimemodule.c | 431 ++++++++++++++++++++++++-------------- 1 file changed, 274 insertions(+), 157 deletions(-) diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index db86567e06663a..6511a9831dcf5d 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -79,6 +79,14 @@ get_module_state(PyObject *mod) return (datetime_state *)state; } +static inline datetime_state * +get_module_state_by_cls(PyTypeObject *cls) +{ + datetime_state *state = (datetime_state *)_PyType_GetModuleState(cls); + assert(state != NULL); + return state; +} + static struct PyModuleDef datetimemodule; static inline datetime_state * @@ -970,20 +978,20 @@ new_date_ex(int year, int month, int day, PyTypeObject *type) // Forward declaration static PyObject * -new_datetime_ex(int, int, int, int, int, int, int, PyObject *, PyTypeObject *); +new_datetime_ex(datetime_state *, int, int, int, int, int, int, int, PyObject *, PyTypeObject *); /* Create date instance with no range checking, or call subclass constructor */ static PyObject * -new_date_subclass_ex(int year, int month, int day, PyObject *cls) +new_date_subclass_ex(datetime_state *st, + int year, int month, int day, PyObject *cls) { - datetime_state *st = find_module_state_by_def(cls); PyObject *result; // We have "fast path" constructors for two subclasses: date and datetime if ((PyTypeObject *)cls == st->PyDateTime_DateType) { result = new_date_ex(year, month, day, (PyTypeObject *)cls); } else if ((PyTypeObject *)cls == st->PyDateTime_DateTimeType) { - result = new_datetime_ex(year, month, day, 0, 0, 0, 0, Py_None, + result = new_datetime_ex(st, year, month, day, 0, 0, 0, 0, Py_None, (PyTypeObject *)cls); } else { @@ -995,7 +1003,8 @@ new_date_subclass_ex(int year, int month, int day, PyObject *cls) /* Create a datetime instance with no range checking. */ static PyObject * -new_datetime_ex2(int year, int month, int day, int hour, int minute, +new_datetime_ex2(datetime_state *st, + int year, int month, int day, int hour, int minute, int second, int usecond, PyObject *tzinfo, int fold, PyTypeObject *type) { PyDateTime_DateTime *self; @@ -1007,7 +1016,6 @@ new_datetime_ex2(int year, int month, int day, int hour, int minute, if (check_time_args(hour, minute, second, usecond, fold) < 0) { return NULL; } - datetime_state *st = find_module_state_by_def(type); if (check_tzinfo_subclass(st, tzinfo) < 0) { return NULL; } @@ -1029,15 +1037,36 @@ new_datetime_ex2(int year, int month, int day, int hour, int minute, } static PyObject * -new_datetime_ex(int year, int month, int day, int hour, int minute, +new_datetime_ex(datetime_state *st, + int year, int month, int day, int hour, int minute, int second, int usecond, PyObject *tzinfo, PyTypeObject *type) { - return new_datetime_ex2(year, month, day, hour, minute, second, usecond, - tzinfo, 0, type); + return new_datetime_ex2(st, year, month, day, hour, minute, second, + usecond, tzinfo, 0, type); +} + +static PyObject * +new_datetime_ex_capi(int year, int month, int day, int hour, int minute, + int second, int usecond, PyObject *tzinfo, + PyTypeObject *type) +{ + datetime_state *st = get_module_state_by_cls(type); + return new_datetime_ex(st, year, month, day, hour, minute, second, + usecond, tzinfo, type); +} + +static PyObject * +new_datetime_ex2_capi(int year, int month, int day, int hour, int minute, + int second, int usecond, PyObject *tzinfo, int fold, + PyTypeObject *type) +{ + datetime_state *st = get_module_state_by_cls(type); + return new_datetime_ex2(st, year, month, day, hour, minute, second, + usecond, tzinfo, fold, type); } #define new_datetime(st, y, m, d, hh, mm, ss, us, tzinfo, fold) \ - new_datetime_ex2(y, m, d, hh, mm, ss, us, tzinfo, fold, \ + new_datetime_ex2(st, y, m, d, hh, mm, ss, us, tzinfo, fold, \ st->PyDateTime_DateTimeType) static PyObject * @@ -1075,11 +1104,11 @@ call_subclass_fold(PyObject *cls, int fold, const char *format, ...) } static PyObject * -new_datetime_subclass_fold_ex(int year, int month, int day, int hour, int minute, +new_datetime_subclass_fold_ex(datetime_state *st, + int year, int month, int day, int hour, int minute, int second, int usecond, PyObject *tzinfo, int fold, PyObject *cls) { PyObject* dt; - datetime_state *st = find_module_state_by_def(cls); if ((PyTypeObject*)cls == st->PyDateTime_DateTimeType) { // Use the fast path constructor dt = new_datetime(st, year, month, day, hour, minute, second, usecond, @@ -1095,17 +1124,19 @@ new_datetime_subclass_fold_ex(int year, int month, int day, int hour, int minute } static PyObject * -new_datetime_subclass_ex(int year, int month, int day, int hour, int minute, +new_datetime_subclass_ex(datetime_state *st, + int year, int month, int day, int hour, int minute, int second, int usecond, PyObject *tzinfo, PyObject *cls) { - return new_datetime_subclass_fold_ex(year, month, day, hour, minute, + return new_datetime_subclass_fold_ex(st, year, month, day, hour, minute, second, usecond, tzinfo, 0, cls); } /* Create a time instance with no range checking. */ static PyObject * -new_time_ex2(int hour, int minute, int second, int usecond, +new_time_ex2(datetime_state *st, + int hour, int minute, int second, int usecond, PyObject *tzinfo, int fold, PyTypeObject *type) { PyDateTime_Time *self; @@ -1114,7 +1145,6 @@ new_time_ex2(int hour, int minute, int second, int usecond, if (check_time_args(hour, minute, second, usecond, fold) < 0) { return NULL; } - datetime_state *st = find_module_state_by_def(type); if (check_tzinfo_subclass(st, tzinfo) < 0) { return NULL; } @@ -1136,20 +1166,29 @@ new_time_ex2(int hour, int minute, int second, int usecond, } static PyObject * -new_time_ex(int hour, int minute, int second, int usecond, +new_time_ex_capi(int hour, int minute, int second, int usecond, PyObject *tzinfo, PyTypeObject *type) { - return new_time_ex2(hour, minute, second, usecond, tzinfo, 0, type); + datetime_state *st = get_module_state_by_cls(type); + return new_time_ex2(st, hour, minute, second, usecond, tzinfo, 0, type); +} + +static PyObject * +new_time_ex2_capi(int hour, int minute, int second, int usecond, + PyObject *tzinfo, int fold, PyTypeObject *type) +{ + datetime_state *st = get_module_state_by_cls(type); + return new_time_ex2(st, hour, minute, second, usecond, tzinfo, fold, type); } #define new_time(st, hh, mm, ss, us, tzinfo, fold) \ - new_time_ex2(hh, mm, ss, us, tzinfo, fold, st->PyDateTime_TimeType) + new_time_ex2(st, hh, mm, ss, us, tzinfo, fold, st->PyDateTime_TimeType) static PyObject * -new_time_subclass_fold_ex(int hour, int minute, int second, int usecond, +new_time_subclass_fold_ex(datetime_state *st, + int hour, int minute, int second, int usecond, PyObject *tzinfo, int fold, PyObject *cls) { - datetime_state *st = find_module_state_by_def(cls); PyObject *t; if ((PyTypeObject*)cls == st->PyDateTime_TimeType) { // Use the fast path constructor @@ -1230,9 +1269,8 @@ create_timezone(datetime_state *st, PyObject *offset, PyObject *name) static int delta_bool(PyDateTime_Delta *self); static PyObject * -new_timezone(PyObject *offset, PyObject *name) +new_timezone(datetime_state *st, PyObject *offset, PyObject *name) { - datetime_state *st = find_module_state_by_def(Py_TYPE(offset)); assert(offset != NULL); assert(PyDelta_Check(st, offset)); assert(name == NULL || PyUnicode_Check(name)); @@ -1254,6 +1292,13 @@ new_timezone(PyObject *offset, PyObject *name) return create_timezone(st, offset, name); } +static PyObject * +new_timezone_capi(PyObject *offset, PyObject *name) +{ + datetime_state *st = find_module_state_by_def(Py_TYPE(offset)); + return new_timezone(st, offset, name); +} + /* --------------------------------------------------------------------------- * tzinfo helpers. */ @@ -1278,11 +1323,10 @@ check_tzinfo_subclass(datetime_state *st, PyObject *p) * and the caller must not decref the result. */ static PyObject * -get_tzinfo_member(PyObject *self) +get_tzinfo_member(datetime_state *st, PyObject *self) { PyObject *tzinfo = NULL; - datetime_state *st = find_module_state_by_def(Py_TYPE(self)); if (PyDateTime_Check(st, self) && HASTZINFO(self)) tzinfo = ((PyDateTime_DateTime *)self)->tzinfo; else if (PyTime_Check(st, self) && HASTZINFO(self)) @@ -1461,7 +1505,7 @@ tzinfo_from_isoformat_results(datetime_state *st, int rv, int tzoffset, if (delta == NULL) { return NULL; } - tzinfo = new_timezone(delta, NULL); + tzinfo = new_timezone(st, delta, NULL); Py_DECREF(delta); } else { @@ -1494,7 +1538,9 @@ format_ctime(PyDateTime_Date *date, int hours, int minutes, int seconds) GET_YEAR(date)); } -static PyObject *delta_negative(PyDateTime_Delta *self); +static inline PyObject * +_delta_negative(datetime_state *st, PyDateTime_Delta *self); + /* Add formatted UTC offset string to buf. buf has no more than * buflen bytes remaining. The UTC offset is gotten by calling @@ -1527,7 +1573,7 @@ format_utcoffset(datetime_state *st, char *buf, size_t buflen, const char *sep, /* Offset is normalized, so it is negative if days < 0 */ if (GET_TD_DAYS(offset) < 0) { sign = '-'; - Py_SETREF(offset, delta_negative((PyDateTime_Delta *)offset)); + Py_SETREF(offset, _delta_negative(st, (PyDateTime_Delta *)offset)); if (offset == NULL) return -1; } @@ -1559,7 +1605,7 @@ make_somezreplacement(datetime_state *st, PyObject *object, char *sep, PyObject *tzinfoarg) { char buf[100]; - PyObject *tzinfo = get_tzinfo_member(object); + PyObject *tzinfo = get_tzinfo_member(st, object); if (tzinfo == Py_None || tzinfo == NULL) { return PyBytes_FromStringAndSize(NULL, 0); @@ -1581,7 +1627,7 @@ make_Zreplacement(datetime_state *st, PyObject *object, PyObject *tzinfoarg) { PyObject *temp; - PyObject *tzinfo = get_tzinfo_member(object); + PyObject *tzinfo = get_tzinfo_member(st, object); PyObject *Zreplacement = PyUnicode_FromStringAndSize(NULL, 0); if (Zreplacement == NULL) @@ -1621,9 +1667,8 @@ make_Zreplacement(datetime_state *st, PyObject *object, } static PyObject * -make_freplacement(PyObject *object) +make_freplacement(datetime_state *st, PyObject *object) { - datetime_state *st = find_module_state_by_def(Py_TYPE(object)); char freplacement[64]; if (PyTime_Check(st, object)) sprintf(freplacement, "%06d", TIME_GET_MICROSECOND(object)); @@ -1643,7 +1688,8 @@ make_freplacement(PyObject *object) * needed. */ static PyObject * -wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple, +wrap_strftime(datetime_state *st, + PyObject *object, PyObject *format, PyObject *timetuple, PyObject *tzinfoarg) { PyObject *result = NULL; /* guilty until proved innocent */ @@ -1688,7 +1734,6 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple, pnew = PyBytes_AsString(newfmt); usednew = 0; - datetime_state *st = find_module_state_by_def(Py_TYPE(object)); while ((ch = *pin++) != '\0') { if (ch != '%') { ptoappend = pin - 1; @@ -1746,7 +1791,7 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple, else if (ch == 'f') { /* format microseconds */ if (freplacement == NULL) { - freplacement = make_freplacement(object); + freplacement = make_freplacement(st, object); if (freplacement == NULL) goto Done; } @@ -2213,10 +2258,9 @@ delta_add(PyObject *left, PyObject *right) return result; } -static PyObject * -delta_negative(PyDateTime_Delta *self) +static inline PyObject * +_delta_negative(datetime_state *st, PyDateTime_Delta *self) { - datetime_state *st = find_module_state_by_def(Py_TYPE(self)); return new_delta(st, -GET_TD_DAYS(self), -GET_TD_SECONDS(self), @@ -2224,6 +2268,13 @@ delta_negative(PyDateTime_Delta *self) 1); } +static PyObject * +delta_negative(PyDateTime_Delta *self) +{ + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return _delta_negative(st, self); +} + static PyObject * delta_positive(PyDateTime_Delta *self) { @@ -2254,12 +2305,10 @@ delta_abs(PyDateTime_Delta *self) return result; } -static PyObject * -delta_subtract(PyObject *left, PyObject *right) +static inline PyObject * +_delta_subtract(datetime_state *st, PyObject *left, PyObject *right) { PyObject *result = Py_NotImplemented; - datetime_state *st = find_state_left_or_right(left, right); - if (PyDelta_Check(st, left) && PyDelta_Check(st, right)) { /* delta - delta */ /* The C-level additions can't overflow because of the @@ -2277,6 +2326,13 @@ delta_subtract(PyObject *left, PyObject *right) return result; } +static PyObject * +delta_subtract(PyObject *left, PyObject *right) +{ + datetime_state *st = find_state_left_or_right(left, right); + return _delta_subtract(st, left, right); +} + static int delta_cmp(PyObject *self, PyObject *other) { @@ -2290,10 +2346,9 @@ delta_cmp(PyObject *self, PyObject *other) return diff; } -static PyObject * -delta_richcompare(PyObject *self, PyObject *other, int op) +static inline PyObject * +_delta_richcompare(datetime_state *st, PyObject *self, PyObject *other, int op) { - datetime_state *st = find_module_state_by_def(Py_TYPE(self)); if (PyDelta_Check(st, other)) { int diff = delta_cmp(self, other); return diff_to_bool(diff, op); @@ -2303,6 +2358,13 @@ delta_richcompare(PyObject *self, PyObject *other, int op) } } +static PyObject * +delta_richcompare(PyObject *self, PyObject *other, int op) +{ + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return _delta_richcompare(st, self, other, op); +} + static PyObject *delta_getstate(PyDateTime_Delta *self); static Py_hash_t @@ -2768,13 +2830,12 @@ delta_getstate(PyDateTime_Delta *self) GET_TD_MICROSECONDS(self)); } -static PyObject * -delta_total_seconds(PyObject *self, PyObject *Py_UNUSED(ignored)) +static inline PyObject * +_delta_total_seconds(datetime_state *st, PyObject *self) { PyObject *total_seconds; PyObject *total_microseconds; - datetime_state *st = find_module_state_by_def(Py_TYPE(self)); total_microseconds = delta_to_microseconds(st, (PyDateTime_Delta *)self); if (total_microseconds == NULL) return NULL; @@ -2785,6 +2846,13 @@ delta_total_seconds(PyObject *self, PyObject *Py_UNUSED(ignored)) return total_seconds; } +static PyObject * +delta_total_seconds(PyObject *self, PyObject *Py_UNUSED(ignored)) +{ + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return _delta_total_seconds(st, self); +} + static PyObject * delta_reduce(PyDateTime_Delta* self, PyObject *Py_UNUSED(ignored)) { @@ -2973,7 +3041,7 @@ date_new(PyTypeObject *type, PyObject *args, PyObject *kw) } static PyObject * -date_fromtimestamp(PyObject *cls, PyObject *obj) +date_fromtimestamp(datetime_state *st, PyObject *cls, PyObject *obj) { struct tm tm; time_t t; @@ -2984,7 +3052,8 @@ date_fromtimestamp(PyObject *cls, PyObject *obj) if (_PyTime_localtime(t, &tm) != 0) return NULL; - return new_date_subclass_ex(tm.tm_year + 1900, + return new_date_subclass_ex(st, + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, cls); @@ -3032,7 +3101,8 @@ static PyObject * datetime_date_fromtimestamp(PyTypeObject *type, PyObject *timestamp) /*[clinic end generated code: output=fd045fda58168869 input=eabb3fe7f40491fe]*/ { - return date_fromtimestamp((PyObject *) type, timestamp); + datetime_state *st = find_module_state_by_def(type); + return date_fromtimestamp(st, (PyObject *)type, timestamp); } /* bpo-36025: This is a wrapper for API compatibility with the public C API, @@ -3046,7 +3116,8 @@ datetime_date_fromtimestamp_capi(PyObject *cls, PyObject *args) PyObject *result = NULL; if (PyArg_UnpackTuple(args, "fromtimestamp", 1, 1, ×tamp)) { - result = date_fromtimestamp(cls, timestamp); + datetime_state *st = find_module_state_by_def(cls); + result = date_fromtimestamp(st, cls, timestamp); } return result; @@ -3071,7 +3142,8 @@ date_fromordinal(PyObject *cls, PyObject *args) ">= 1"); else { ord_to_ymd(ordinal, &year, &month, &day); - result = new_date_subclass_ex(year, month, day, cls); + datetime_state *st = find_module_state_by_def(cls); + result = new_date_subclass_ex(st, year, month, day, cls); } } return result; @@ -3109,8 +3181,8 @@ date_fromisoformat(PyObject *cls, PyObject *dtstr) if (rv < 0) { goto invalid_string_error; } - - return new_date_subclass_ex(year, month, day, cls); + datetime_state *st = find_module_state_by_def(cls); + return new_date_subclass_ex(st, year, month, day, cls); invalid_string_error: PyErr_Format(PyExc_ValueError, "Invalid isoformat string: %R", dtstr); @@ -3155,8 +3227,8 @@ date_fromisocalendar(PyObject *cls, PyObject *args, PyObject *kw) day); return NULL; } - - return new_date_subclass_ex(year, month, day, cls); + datetime_state *st = find_module_state_by_def(cls); + return new_date_subclass_ex(st, year, month, day, cls); } @@ -3168,7 +3240,8 @@ date_fromisocalendar(PyObject *cls, PyObject *args, PyObject *kw) * instead. */ static PyObject * -add_date_timedelta(PyDateTime_Date *date, PyDateTime_Delta *delta, int negate) +add_date_timedelta(datetime_state *st, + PyDateTime_Date *date, PyDateTime_Delta *delta, int negate) { PyObject *result = NULL; int year = GET_YEAR(date); @@ -3178,7 +3251,7 @@ add_date_timedelta(PyDateTime_Date *date, PyDateTime_Delta *delta, int negate) int day = GET_DAY(date) + (negate ? -deltadays : deltadays); if (normalize_date(&year, &month, &day) >= 0) - result = new_date_subclass_ex(year, month, day, + result = new_date_subclass_ex(st, year, month, day, (PyObject* )Py_TYPE(date)); return result; } @@ -3194,7 +3267,7 @@ date_add(PyObject *left, PyObject *right) /* date + ??? */ if (PyDelta_Check(st, right)) /* date + delta */ - return add_date_timedelta((PyDateTime_Date *) left, + return add_date_timedelta(st, (PyDateTime_Date *) left, (PyDateTime_Delta *) right, 0); } @@ -3204,7 +3277,7 @@ date_add(PyObject *left, PyObject *right) */ if (PyDelta_Check(st, left)) /* delta + date */ - return add_date_timedelta((PyDateTime_Date *) right, + return add_date_timedelta(st, (PyDateTime_Date *) right, (PyDateTime_Delta *) left, 0); } @@ -3231,7 +3304,7 @@ date_subtract(PyObject *left, PyObject *right) } if (PyDelta_Check(st, right)) { /* date - delta */ - return add_date_timedelta((PyDateTime_Date *) left, + return add_date_timedelta(st, (PyDateTime_Date *) left, (PyDateTime_Delta *) right, 1); } @@ -3289,7 +3362,8 @@ date_strftime(PyDateTime_Date *self, PyObject *args, PyObject *kw) tuple = PyObject_CallMethodNoArgs((PyObject *)self, &_Py_ID(timetuple)); if (tuple == NULL) return NULL; - result = wrap_strftime((PyObject *)self, format, tuple, + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + result = wrap_strftime(st, (PyObject *)self, format, tuple, (PyObject *)self); Py_DECREF(tuple); return result; @@ -3549,7 +3623,8 @@ datetime_date_replace_impl(PyDateTime_Date *self, int year, int month, int day) /*[clinic end generated code: output=2a9430d1e6318aeb input=0d1f02685b3e90f6]*/ { - return new_date_subclass_ex(year, month, day, (PyObject *)Py_TYPE(self)); + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return new_date_subclass_ex(st, year, month, day, (PyObject *)Py_TYPE(self)); } static Py_hash_t @@ -3766,11 +3841,16 @@ tzinfo_dst(PyDateTime_TZInfo *self, PyObject *dt) } -static PyObject *add_datetime_timedelta(PyDateTime_DateTime *date, - PyDateTime_Delta *delta, - int factor); -static PyObject *datetime_utcoffset(PyObject *self, PyObject *); -static PyObject *datetime_dst(PyObject *self, PyObject *); +static inline PyObject * +add_datetime_timedelta(datetime_state *st, PyDateTime_DateTime *date, + PyDateTime_Delta *delta, int factor); + +static inline PyObject * +_datetime_utcoffset(datetime_state *st, PyObject *self); + +static inline PyObject * +_datetime_dst(datetime_state *st, PyObject *self); + static PyObject * tzinfo_fromutc(PyDateTime_TZInfo *self, PyObject *dt) @@ -3791,7 +3871,7 @@ tzinfo_fromutc(PyDateTime_TZInfo *self, PyObject *dt) return NULL; } - off = datetime_utcoffset(dt, NULL); + off = _datetime_utcoffset(st, dt); if (off == NULL) return NULL; if (off == Py_None) { @@ -3800,7 +3880,7 @@ tzinfo_fromutc(PyDateTime_TZInfo *self, PyObject *dt) goto Fail; } - dst = datetime_dst(dt, NULL); + dst = _datetime_dst(st, dt); if (dst == NULL) goto Fail; if (dst == Py_None) { @@ -3809,10 +3889,10 @@ tzinfo_fromutc(PyDateTime_TZInfo *self, PyObject *dt) goto Fail; } - delta = (PyDateTime_Delta *)delta_subtract(off, dst); + delta = (PyDateTime_Delta *)_delta_subtract(st, off, dst); if (delta == NULL) goto Fail; - result = add_datetime_timedelta((PyDateTime_DateTime *)dt, delta, 1); + result = add_datetime_timedelta(st, (PyDateTime_DateTime *)dt, delta, 1); if (result == NULL) goto Fail; @@ -3823,7 +3903,7 @@ tzinfo_fromutc(PyDateTime_TZInfo *self, PyObject *dt) if (dst == Py_None) goto Inconsistent; if (delta_bool((PyDateTime_Delta *)dst) != 0) { - Py_SETREF(result, add_datetime_timedelta((PyDateTime_DateTime *)result, + Py_SETREF(result, add_datetime_timedelta(st, (PyDateTime_DateTime *)result, (PyDateTime_Delta *)dst, 1)); if (result == NULL) goto Fail; @@ -3948,7 +4028,7 @@ timezone_new(PyTypeObject *type, PyObject *args, PyObject *kw) datetime_state *st = find_module_state_by_def(type); if (PyArg_ParseTupleAndKeywords(args, kw, "O!|U:timezone", timezone_kws, st->PyDateTime_DeltaType, &offset, &name)) - return new_timezone(offset, name); + return new_timezone(st, offset, name); return NULL; } @@ -3990,7 +4070,7 @@ timezone_richcompare(PyDateTime_TimeZone *self, if (!PyTimezone_Check(st, other)) { Py_RETURN_NOTIMPLEMENTED; } - return delta_richcompare(self->offset, other->offset, op); + return _delta_richcompare(st, self->offset, other->offset, op); } static Py_hash_t @@ -4054,7 +4134,7 @@ timezone_str(PyDateTime_TimeZone *self) /* Offset is normalized, so it is negative if days < 0 */ if (GET_TD_DAYS(self->offset) < 0) { sign = '-'; - offset = delta_negative((PyDateTime_Delta *)self->offset); + offset = _delta_negative(st, (PyDateTime_Delta *)self->offset); if (offset == NULL) return NULL; } @@ -4125,7 +4205,7 @@ timezone_fromutc(PyDateTime_TimeZone *self, PyDateTime_DateTime *dt) return NULL; } - return add_datetime_timedelta(dt, (PyDateTime_Delta *)self->offset, 1); + return add_datetime_timedelta(st, dt, (PyDateTime_Delta *)self->offset, 1); } static PyObject * @@ -4327,7 +4407,8 @@ time_new(PyTypeObject *type, PyObject *args, PyObject *kw) if (PyArg_ParseTupleAndKeywords(args, kw, "|iiiiO$i", time_kws, &hour, &minute, &second, &usecond, &tzinfo, &fold)) { - self = new_time_ex2(hour, minute, second, usecond, tzinfo, fold, + datetime_state *st = find_module_state_by_def(type); + self = new_time_ex2(st, hour, minute, second, usecond, tzinfo, fold, type); } return self; @@ -4366,11 +4447,15 @@ time_dealloc(PyDateTime_Time *self) * Indirect access to tzinfo methods. */ -/* These are all METH_NOARGS, so don't need to check the arglist. */ +static inline PyObject * +_time_utcoffset(datetime_state *st, PyObject *self) +{ + return call_utcoffset(st, GET_TIME_TZINFO(self), Py_None); +} static PyObject * time_utcoffset(PyObject *self, PyObject *unused) { datetime_state *st = find_module_state_by_def(Py_TYPE(self)); - return call_utcoffset(st, GET_TIME_TZINFO(self), Py_None); + return _time_utcoffset(st, (PyObject *)self); } static PyObject * @@ -4512,7 +4597,8 @@ time_strftime(PyDateTime_Time *self, PyObject *args, PyObject *kw) if (tuple == NULL) return NULL; assert(PyTuple_Size(tuple) == 9); - result = wrap_strftime((PyObject *)self, format, tuple, + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + result = wrap_strftime(st, (PyObject *)self, format, tuple, Py_None); Py_DECREF(tuple); return result; @@ -4539,10 +4625,10 @@ time_richcompare(PyObject *self, PyObject *other, int op) _PyDateTime_TIME_DATASIZE); return diff_to_bool(diff, op); } - offset1 = time_utcoffset(self, NULL); + offset1 = _time_utcoffset(st, self); if (offset1 == NULL) return NULL; - offset2 = time_utcoffset(other, NULL); + offset2 = _time_utcoffset(st, other); if (offset2 == NULL) goto done; /* If they're both naive, or both aware and have the same offsets, @@ -4599,8 +4685,10 @@ time_hash(PyDateTime_Time *self) { if (self->hashcode == -1) { PyObject *offset, *self0; + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); if (TIME_GET_FOLD(self)) { - self0 = new_time_ex2(TIME_GET_HOUR(self), + self0 = new_time_ex2(st, + TIME_GET_HOUR(self), TIME_GET_MINUTE(self), TIME_GET_SECOND(self), TIME_GET_MICROSECOND(self), @@ -4612,7 +4700,7 @@ time_hash(PyDateTime_Time *self) else { self0 = Py_NewRef(self); } - offset = time_utcoffset(self0, NULL); + offset = _time_utcoffset(st, self0); Py_DECREF(self0); if (offset == NULL) @@ -4631,13 +4719,12 @@ time_hash(PyDateTime_Time *self) TIME_GET_SECOND(self); microseconds = TIME_GET_MICROSECOND(self); - datetime_state *st = find_module_state_by_def(Py_TYPE(self)); temp1 = new_delta(st, 0, seconds, microseconds, 1); if (temp1 == NULL) { Py_DECREF(offset); return -1; } - temp2 = delta_subtract(temp1, offset); + temp2 = _delta_subtract(st, temp1, offset); Py_DECREF(temp1); if (temp2 == NULL) { Py_DECREF(offset); @@ -4671,8 +4758,9 @@ datetime_time_replace_impl(PyDateTime_Time *self, int hour, int minute, int fold) /*[clinic end generated code: output=0b89a44c299e4f80 input=9b6a35b1e704b0ca]*/ { - return new_time_subclass_fold_ex(hour, minute, second, microsecond, tzinfo, - fold, (PyObject *)Py_TYPE(self)); + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return new_time_subclass_fold_ex(st, hour, minute, second, microsecond, + tzinfo, fold, (PyObject *)Py_TYPE(self)); } static PyObject * @@ -5000,7 +5088,8 @@ datetime_new(PyTypeObject *type, PyObject *args, PyObject *kw) if (PyArg_ParseTupleAndKeywords(args, kw, "iii|iiiiO$i", datetime_kws, &year, &month, &day, &hour, &minute, &second, &usecond, &tzinfo, &fold)) { - self = new_datetime_ex2(year, month, day, + datetime_state *st = find_module_state_by_def(type); + self = new_datetime_ex2(st, year, month, day, hour, minute, second, usecond, tzinfo, fold, type); } @@ -5060,7 +5149,8 @@ local(long long u) * Pass localtime or gmtime for f, to control the interpretation of timet. */ static PyObject * -datetime_from_timet_and_us(PyObject *cls, TM_FUNC f, time_t timet, int us, +datetime_from_timet_and_us(datetime_state *st, + PyObject *cls, TM_FUNC f, time_t timet, int us, PyObject *tzinfo) { struct tm tm; @@ -5120,7 +5210,7 @@ datetime_from_timet_and_us(PyObject *cls, TM_FUNC f, time_t timet, int us, fold = 1; } } - return new_datetime_subclass_fold_ex(year, month, day, hour, minute, + return new_datetime_subclass_fold_ex(st, year, month, day, hour, minute, second, us, tzinfo, fold, cls); } @@ -5132,7 +5222,8 @@ datetime_from_timet_and_us(PyObject *cls, TM_FUNC f, time_t timet, int us, * to get that much precision (e.g., C time() isn't good enough). */ static PyObject * -datetime_from_timestamp(PyObject *cls, TM_FUNC f, PyObject *timestamp, +datetime_from_timestamp(datetime_state *st, + PyObject *cls, TM_FUNC f, PyObject *timestamp, PyObject *tzinfo) { time_t timet; @@ -5142,7 +5233,7 @@ datetime_from_timestamp(PyObject *cls, TM_FUNC f, PyObject *timestamp, &timet, &us, _PyTime_ROUND_HALF_EVEN) == -1) return NULL; - return datetime_from_timet_and_us(cls, f, timet, (int)us, tzinfo); + return datetime_from_timet_and_us(st, cls, f, timet, (int)us, tzinfo); } /* Internal helper. @@ -5150,7 +5241,8 @@ datetime_from_timestamp(PyObject *cls, TM_FUNC f, PyObject *timestamp, * gmtime for f as appropriate. */ static PyObject * -datetime_best_possible(PyObject *cls, TM_FUNC f, PyObject *tzinfo) +datetime_best_possible(datetime_state *st, + PyObject *cls, TM_FUNC f, PyObject *tzinfo) { PyTime_t ts; if (PyTime_Time(&ts) < 0) { @@ -5164,7 +5256,7 @@ datetime_best_possible(PyObject *cls, TM_FUNC f, PyObject *tzinfo) return NULL; assert(0 <= us && us <= 999999); - return datetime_from_timet_and_us(cls, f, secs, us, tzinfo); + return datetime_from_timet_and_us(st, cls, f, secs, us, tzinfo); } /*[clinic input] @@ -5193,7 +5285,7 @@ datetime_datetime_now_impl(PyTypeObject *type, PyObject *tz) if (check_tzinfo_subclass(st, tz) < 0) return NULL; - self = datetime_best_possible((PyObject *)type, + self = datetime_best_possible(st, (PyObject *)type, tz == Py_None ? _PyTime_localtime : _PyTime_gmtime, tz); @@ -5219,7 +5311,8 @@ datetime_utcnow(PyObject *cls, PyObject *dummy) { return NULL; } - return datetime_best_possible(cls, _PyTime_gmtime, Py_None); + datetime_state *st = find_module_state_by_def(cls); + return datetime_best_possible(st, cls, _PyTime_gmtime, Py_None); } /* Return new local datetime from timestamp (Python timestamp -- a double). */ @@ -5238,7 +5331,7 @@ datetime_fromtimestamp(PyObject *cls, PyObject *args, PyObject *kw) if (check_tzinfo_subclass(st, tzinfo) < 0) return NULL; - self = datetime_from_timestamp(cls, + self = datetime_from_timestamp(st, cls, tzinfo == Py_None ? _PyTime_localtime : _PyTime_gmtime, timestamp, @@ -5266,9 +5359,11 @@ datetime_utcfromtimestamp(PyObject *cls, PyObject *args) PyObject *timestamp; PyObject *result = NULL; - if (PyArg_ParseTuple(args, "O:utcfromtimestamp", ×tamp)) - result = datetime_from_timestamp(cls, _PyTime_gmtime, timestamp, + if (PyArg_ParseTuple(args, "O:utcfromtimestamp", ×tamp)) { + datetime_state *st = find_module_state_by_def(cls); + result = datetime_from_timestamp(st, cls, _PyTime_gmtime, timestamp, Py_None); + } return result; } @@ -5313,7 +5408,8 @@ datetime_combine(PyObject *cls, PyObject *args, PyObject *kw) else tzinfo = Py_None; } - result = new_datetime_subclass_fold_ex(GET_YEAR(date), + result = new_datetime_subclass_fold_ex(st, + GET_YEAR(date), GET_MONTH(date), GET_DAY(date), TIME_GET_HOUR(time), @@ -5563,7 +5659,7 @@ datetime_fromisoformat(PyObject *cls, PyObject *dtstr) goto error; } - PyObject *dt = new_datetime_subclass_ex(year, month, day, hour, minute, + PyObject *dt = new_datetime_subclass_ex(st, year, month, day, hour, minute, second, microsecond, tzinfo, cls); Py_DECREF(tzinfo); @@ -5611,16 +5707,15 @@ datetime_dealloc(PyDateTime_DateTime *self) * Indirect access to tzinfo methods. */ -/* These are all METH_NOARGS, so don't need to check the arglist. */ -static PyObject * -datetime_utcoffset(PyObject *self, PyObject *unused) { - datetime_state *st = find_module_state_by_def(Py_TYPE(self)); +static inline PyObject * +_datetime_utcoffset(datetime_state *st, PyObject *self) +{ return call_utcoffset(st, GET_DT_TZINFO(self), self); } -static PyObject * -datetime_dst(PyObject *self, PyObject *unused) { - datetime_state *st = find_module_state_by_def(Py_TYPE(self)); +static inline PyObject * +_datetime_dst(datetime_state *st, PyObject *self) +{ return call_dst(st, GET_DT_TZINFO(self), self); } @@ -5630,6 +5725,19 @@ datetime_tzname(PyObject *self, PyObject *unused) { return call_tzname(st, GET_DT_TZINFO(self), self); } + +static PyObject * +datetime_utcoffset(PyObject *self, PyObject *unused) { + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return _datetime_utcoffset(st, self); +} + +static PyObject * +datetime_dst(PyObject *self, PyObject *unused) { + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return _datetime_dst(st, self); +} + /* * datetime arithmetic. */ @@ -5638,7 +5746,8 @@ datetime_tzname(PyObject *self, PyObject *unused) { * the tzinfo state of date. */ static PyObject * -add_datetime_timedelta(PyDateTime_DateTime *date, PyDateTime_Delta *delta, +add_datetime_timedelta(datetime_state *st, + PyDateTime_DateTime *date, PyDateTime_Delta *delta, int factor) { /* Note that the C-level additions can't overflow, because of @@ -5659,7 +5768,7 @@ add_datetime_timedelta(PyDateTime_DateTime *date, PyDateTime_Delta *delta, return NULL; } - return new_datetime_subclass_ex(year, month, day, + return new_datetime_subclass_ex(st, year, month, day, hour, minute, second, microsecond, HASTZINFO(date) ? date->tzinfo : Py_None, (PyObject *)Py_TYPE(date)); @@ -5673,25 +5782,24 @@ datetime_add(PyObject *left, PyObject *right) /* datetime + ??? */ if (PyDelta_Check(st, right)) /* datetime + delta */ - return add_datetime_timedelta( + return add_datetime_timedelta(st, (PyDateTime_DateTime *)left, (PyDateTime_Delta *)right, 1); } else if (PyDelta_Check(st, left)) { /* delta + datetime */ - return add_datetime_timedelta((PyDateTime_DateTime *) right, + return add_datetime_timedelta(st, (PyDateTime_DateTime *) right, (PyDateTime_Delta *) left, 1); } Py_RETURN_NOTIMPLEMENTED; } -static PyObject * -datetime_subtract(PyObject *left, PyObject *right) +static inline PyObject * +_datetime_subtract(datetime_state *st, PyObject *left, PyObject *right) { PyObject *result = Py_NotImplemented; - datetime_state *st = find_state_left_or_right(left, right); if (PyDateTime_Check(st, left)) { /* datetime - ??? */ if (PyDateTime_Check(st, right)) { @@ -5704,10 +5812,10 @@ datetime_subtract(PyObject *left, PyObject *right) offset2 = Py_NewRef(Py_None); } else { - offset1 = datetime_utcoffset(left, NULL); + offset1 = _datetime_utcoffset(st, left); if (offset1 == NULL) return NULL; - offset2 = datetime_utcoffset(right, NULL); + offset2 = _datetime_utcoffset(st, right); if (offset2 == NULL) { Py_DECREF(offset1); return NULL; @@ -5723,7 +5831,7 @@ datetime_subtract(PyObject *left, PyObject *right) } if ((offset1 != offset2) && delta_cmp(offset1, offset2) != 0) { - offdiff = delta_subtract(offset1, offset2); + offdiff = _delta_subtract(st, offset1, offset2); if (offdiff == NULL) { Py_DECREF(offset1); Py_DECREF(offset2); @@ -5755,13 +5863,13 @@ datetime_subtract(PyObject *left, PyObject *right) return NULL; if (offdiff != NULL) { - Py_SETREF(result, delta_subtract(result, offdiff)); + Py_SETREF(result, _delta_subtract(st, result, offdiff)); Py_DECREF(offdiff); } } else if (PyDelta_Check(st, right)) { /* datetime - delta */ - result = add_datetime_timedelta( + result = add_datetime_timedelta(st, (PyDateTime_DateTime *)left, (PyDateTime_Delta *)right, -1); @@ -5773,6 +5881,13 @@ datetime_subtract(PyObject *left, PyObject *right) return result; } +static PyObject * +datetime_subtract(PyObject *left, PyObject *right) +{ + datetime_state *st = find_state_left_or_right(left, right); + return _datetime_subtract(st, left, right); +} + /* Various ways to turn a datetime into a string. */ static PyObject * @@ -5905,9 +6020,10 @@ datetime_ctime(PyDateTime_DateTime *self, PyObject *Py_UNUSED(ignored)) /* Miscellaneous methods. */ static PyObject * -flip_fold(PyObject *dt) +flip_fold(datetime_state *st, PyObject *dt) { - return new_datetime_ex2(GET_YEAR(dt), + return new_datetime_ex2(st, + GET_YEAR(dt), GET_MONTH(dt), GET_DAY(dt), DATE_GET_HOUR(dt), @@ -5921,14 +6037,14 @@ flip_fold(PyObject *dt) } static PyObject * -get_flip_fold_offset(PyObject *dt) +get_flip_fold_offset(datetime_state *st, PyObject *dt) { PyObject *result, *flip_dt; - flip_dt = flip_fold(dt); + flip_dt = flip_fold(st, dt); if (flip_dt == NULL) return NULL; - result = datetime_utcoffset(flip_dt, NULL); + result = _datetime_utcoffset(st, flip_dt); Py_DECREF(flip_dt); return result; } @@ -5940,13 +6056,13 @@ get_flip_fold_offset(PyObject *dt) * Return 1 if exception applies, 0 if not, and -1 on error. */ static int -pep495_eq_exception(PyObject *self, PyObject *other, +pep495_eq_exception(datetime_state *st, PyObject *self, PyObject *other, PyObject *offset_self, PyObject *offset_other) { int result = 0; PyObject *flip_offset; - flip_offset = get_flip_fold_offset(self); + flip_offset = get_flip_fold_offset(st, self); if (flip_offset == NULL) return -1; if (flip_offset != offset_self && @@ -5957,7 +6073,7 @@ pep495_eq_exception(PyObject *self, PyObject *other, } Py_DECREF(flip_offset); - flip_offset = get_flip_fold_offset(other); + flip_offset = get_flip_fold_offset(st, other); if (flip_offset == NULL) return -1; if (flip_offset != offset_other && @@ -5985,10 +6101,10 @@ datetime_richcompare(PyObject *self, PyObject *other, int op) _PyDateTime_DATETIME_DATASIZE); return diff_to_bool(diff, op); } - offset1 = datetime_utcoffset(self, NULL); + offset1 = _datetime_utcoffset(st, self); if (offset1 == NULL) return NULL; - offset2 = datetime_utcoffset(other, NULL); + offset2 = _datetime_utcoffset(st, other); if (offset2 == NULL) goto done; /* If they're both naive, or both aware and have the same offsets, @@ -6002,7 +6118,7 @@ datetime_richcompare(PyObject *self, PyObject *other, int op) ((PyDateTime_DateTime *)other)->data, _PyDateTime_DATETIME_DATASIZE); if ((op == Py_EQ || op == Py_NE) && diff == 0) { - int ex = pep495_eq_exception(self, other, offset1, offset2); + int ex = pep495_eq_exception(st, self, other, offset1, offset2); if (ex == -1) goto done; if (ex) @@ -6024,7 +6140,7 @@ datetime_richcompare(PyObject *self, PyObject *other, int op) GET_TD_MICROSECONDS(delta); Py_DECREF(delta); if ((op == Py_EQ || op == Py_NE) && diff == 0) { - int ex = pep495_eq_exception(self, other, offset1, offset2); + int ex = pep495_eq_exception(st, self, other, offset1, offset2); if (ex == -1) goto done; if (ex) @@ -6052,10 +6168,12 @@ datetime_richcompare(PyObject *self, PyObject *other, int op) static Py_hash_t datetime_hash(PyDateTime_DateTime *self) { + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); if (self->hashcode == -1) { PyObject *offset, *self0; if (DATE_GET_FOLD(self)) { - self0 = new_datetime_ex2(GET_YEAR(self), + self0 = new_datetime_ex2(st, + GET_YEAR(self), GET_MONTH(self), GET_DAY(self), DATE_GET_HOUR(self), @@ -6070,7 +6188,7 @@ datetime_hash(PyDateTime_DateTime *self) else { self0 = Py_NewRef(self); } - offset = datetime_utcoffset(self0, NULL); + offset = _datetime_utcoffset(st, self0); Py_DECREF(self0); if (offset == NULL) @@ -6092,7 +6210,6 @@ datetime_hash(PyDateTime_DateTime *self) DATE_GET_MINUTE(self) * 60 + DATE_GET_SECOND(self); - datetime_state *st = find_module_state_by_def(Py_TYPE(self)); temp1 = new_delta(st, days, seconds, DATE_GET_MICROSECOND(self), 1); @@ -6100,7 +6217,7 @@ datetime_hash(PyDateTime_DateTime *self) Py_DECREF(offset); return -1; } - temp2 = delta_subtract(temp1, offset); + temp2 = _delta_subtract(st, temp1, offset); Py_DECREF(temp1); if (temp2 == NULL) { Py_DECREF(offset); @@ -6138,7 +6255,8 @@ datetime_datetime_replace_impl(PyDateTime_DateTime *self, int year, int fold) /*[clinic end generated code: output=00bc96536833fddb input=9b38253d56d9bcad]*/ { - return new_datetime_subclass_fold_ex(year, month, day, hour, minute, + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + return new_datetime_subclass_fold_ex(st, year, month, day, hour, minute, second, microsecond, tzinfo, fold, (PyObject *)Py_TYPE(self)); } @@ -6200,7 +6318,7 @@ local_timezone_from_timestamp(datetime_state *st, time_t timestamp) if (nameo == NULL) goto error; } - result = new_timezone(delta, nameo); + result = new_timezone(st, delta, nameo); Py_XDECREF(nameo); error: Py_DECREF(delta); @@ -6208,14 +6326,13 @@ local_timezone_from_timestamp(datetime_state *st, time_t timestamp) } static PyObject * -local_timezone(PyDateTime_DateTime *utc_time) +local_timezone(datetime_state *st, PyDateTime_DateTime *utc_time) { time_t timestamp; PyObject *delta; PyObject *one_second; PyObject *seconds; - datetime_state *st = find_module_state_by_def(Py_TYPE(utc_time)); delta = datetime_subtract((PyObject *)utc_time, st->epoch); if (delta == NULL) return NULL; @@ -6242,7 +6359,7 @@ local_to_seconds(int year, int month, int day, int hour, int minute, int second, int fold); static PyObject * -local_timezone_from_local(PyDateTime_DateTime *local_dt) +local_timezone_from_local(datetime_state *st, PyDateTime_DateTime *local_dt) { long long seconds, seconds2; time_t timestamp; @@ -6272,7 +6389,6 @@ local_timezone_from_local(PyDateTime_DateTime *local_dt) /* XXX: add bounds check */ timestamp = seconds - epoch; - datetime_state *st = find_module_state_by_def(Py_TYPE(local_dt)); return local_timezone_from_timestamp(st, timestamp); } @@ -6296,7 +6412,7 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) if (!HASTZINFO(self) || self->tzinfo == Py_None) { naive: - self_tzinfo = local_timezone_from_local(self); + self_tzinfo = local_timezone_from_local(st, self); if (self_tzinfo == NULL) return NULL; } else { @@ -6325,8 +6441,8 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) return NULL; } /* result = self - offset */ - result = (PyDateTime_DateTime *)add_datetime_timedelta(self, - (PyDateTime_Delta *)offset, -1); + result = (PyDateTime_DateTime *)add_datetime_timedelta(st, self, + (PyDateTime_Delta *)offset, -1); Py_DECREF(offset); if (result == NULL) return NULL; @@ -6335,7 +6451,8 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) if (!HASTZINFO(result)) { temp = (PyObject *)result; result = (PyDateTime_DateTime *) - new_datetime_ex2(GET_YEAR(result), + new_datetime_ex2(st, + GET_YEAR(result), GET_MONTH(result), GET_DAY(result), DATE_GET_HOUR(result), @@ -6356,7 +6473,7 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) /* Attach new tzinfo and let fromutc() do the rest. */ if (tzinfo == Py_None) { - tzinfo = local_timezone(result); + tzinfo = local_timezone(st, result); if (tzinfo == NULL) { Py_DECREF(result); return NULL; @@ -6461,7 +6578,7 @@ datetime_timestamp(PyDateTime_DateTime *self, PyObject *Py_UNUSED(ignored)) delta = datetime_subtract((PyObject *)self, st->epoch); if (delta == NULL) return NULL; - result = delta_total_seconds(delta, NULL); + result = _delta_total_seconds(st, delta); Py_DECREF(delta); } else { @@ -6539,7 +6656,7 @@ datetime_utctimetuple(PyDateTime_DateTime *self, PyObject *Py_UNUSED(ignored)) utcself = (PyDateTime_DateTime*)Py_NewRef(self); } else { - utcself = (PyDateTime_DateTime *)add_datetime_timedelta(self, + utcself = (PyDateTime_DateTime *)add_datetime_timedelta(st, self, (PyDateTime_Delta *)offset, -1); Py_DECREF(offset); if (utcself == NULL) @@ -6750,14 +6867,14 @@ get_datetime_capi(datetime_state *st) capi->DeltaType = st->PyDateTime_DeltaType; capi->TZInfoType = st->PyDateTime_TZInfoType; capi->Date_FromDate = new_date_ex; - capi->DateTime_FromDateAndTime = new_datetime_ex; - capi->Time_FromTime = new_time_ex; + capi->DateTime_FromDateAndTime = new_datetime_ex_capi; + capi->Time_FromTime = new_time_ex_capi; capi->Delta_FromDelta = new_delta_ex; - capi->TimeZone_FromTimeZone = new_timezone; + capi->TimeZone_FromTimeZone = new_timezone_capi; capi->DateTime_FromTimestamp = datetime_fromtimestamp; capi->Date_FromTimestamp = datetime_date_fromtimestamp_capi; - capi->DateTime_FromDateAndTimeAndFold = new_datetime_ex2; - capi->Time_FromTimeAndFold = new_time_ex2; + capi->DateTime_FromDateAndTimeAndFold = new_datetime_ex2_capi; + capi->Time_FromTimeAndFold = new_time_ex2_capi; // Make sure this function is called after utc has // been initialized. assert(st->utc != NULL); From 0abdd335de6a17c8289b0d1f9da389faaa75b177 Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Fri, 19 Apr 2024 23:46:44 +0900 Subject: [PATCH 11/18] make the code parsible --- Modules/_datetimemodule.c | 89 ++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index db782731498f4d..d48f446bca22d7 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -978,7 +978,7 @@ new_date_ex(int year, int month, int day, PyTypeObject *type) // Forward declaration static PyObject * -new_datetime_ex(datetime_state *, int, int, int, int, int, int, int, PyObject *, PyTypeObject *); +new_datetime_ex(datetime_state *st, int, int, int, int, int, int, int, PyObject *, PyTypeObject *); /* Create date instance with no range checking, or call subclass constructor */ static PyObject * @@ -1041,8 +1041,8 @@ new_datetime_ex(datetime_state *st, int year, int month, int day, int hour, int minute, int second, int usecond, PyObject *tzinfo, PyTypeObject *type) { - return new_datetime_ex2(st, year, month, day, hour, minute, second, - usecond, tzinfo, 0, type); + return new_datetime_ex2(st, year, month, day, hour, minute, second, usecond, + tzinfo, 0, type); } static PyObject * @@ -1067,7 +1067,7 @@ new_datetime_ex2_capi(int year, int month, int day, int hour, int minute, #define new_datetime(st, y, m, d, hh, mm, ss, us, tzinfo, fold) \ new_datetime_ex2(st, y, m, d, hh, mm, ss, us, tzinfo, fold, \ - st->PyDateTime_DateTimeType) + st->PyDateTime_DateTimeType) static PyObject * call_subclass_fold(PyObject *cls, int fold, const char *format, ...) @@ -1181,7 +1181,7 @@ new_time_ex2_capi(int hour, int minute, int second, int usecond, return new_time_ex2(st, hour, minute, second, usecond, tzinfo, fold, type); } -#define new_time(st, hh, mm, ss, us, tzinfo, fold) \ +#define new_time(st, hh, mm, ss, us, tzinfo, fold) \ new_time_ex2(st, hh, mm, ss, us, tzinfo, fold, st->PyDateTime_TimeType) static PyObject * @@ -1253,6 +1253,7 @@ create_timezone(datetime_state *st, PyObject *offset, PyObject *name) { PyDateTime_TimeZone *self; PyTypeObject *type = st->PyDateTime_TimeZoneType; + assert(offset != NULL); assert(PyDelta_Check(st, offset)); assert(name == NULL || PyUnicode_Check(name)); @@ -1343,8 +1344,8 @@ get_tzinfo_member(datetime_state *st, PyObject *self) * this returns NULL. Else result is returned. */ static PyObject * -call_tzinfo_method(datetime_state *st, PyObject *tzinfo, const char *name, - PyObject *tzinfoarg) +call_tzinfo_method(datetime_state *st, + PyObject *tzinfo, const char *name, PyObject *tzinfoarg) { PyObject *offset; @@ -1491,8 +1492,8 @@ append_keyword_fold(PyObject *repr, int fold) } static inline PyObject * -tzinfo_from_isoformat_results(datetime_state *st, int rv, int tzoffset, - int tz_useconds) +tzinfo_from_isoformat_results(datetime_state *st, + int rv, int tzoffset, int tz_useconds) { PyObject *tzinfo; if (rv == 1) { @@ -1601,8 +1602,8 @@ format_utcoffset(datetime_state *st, char *buf, size_t buflen, const char *sep, } static PyObject * -make_somezreplacement(datetime_state *st, PyObject *object, char *sep, - PyObject *tzinfoarg) +make_somezreplacement(datetime_state *st, + PyObject *object, char *sep, PyObject *tzinfoarg) { char buf[100]; PyObject *tzinfo = get_tzinfo_member(st, object); @@ -1623,8 +1624,8 @@ make_somezreplacement(datetime_state *st, PyObject *object, char *sep, } static PyObject * -make_Zreplacement(datetime_state *st, PyObject *object, - PyObject *tzinfoarg) +make_Zreplacement(datetime_state *st, + PyObject *object, PyObject *tzinfoarg) { PyObject *temp; PyObject *tzinfo = get_tzinfo_member(st, object); @@ -1997,8 +1998,8 @@ checked_divmod(PyObject *a, PyObject *b) /* Convert a number of us (as a Python int) to a timedelta. */ static PyObject * -microseconds_to_delta_ex(datetime_state *st, PyObject *pyus, - PyTypeObject *type) +microseconds_to_delta_ex(datetime_state *st, + PyObject *pyus, PyTypeObject *type) { int us; int s; @@ -2063,8 +2064,8 @@ microseconds_to_delta_ex(datetime_state *st, PyObject *pyus, microseconds_to_delta_ex(st, pymicros, (st)->PyDateTime_DeltaType) static PyObject * -multiply_int_timedelta(datetime_state *st, PyObject *intobj, - PyDateTime_Delta *delta) +multiply_int_timedelta(datetime_state *st, + PyObject *intobj, PyDateTime_Delta *delta) { PyObject *pyus_in; PyObject *pyus_out; @@ -2114,8 +2115,7 @@ get_float_as_integer_ratio(PyObject *floatobj) /* op is 0 for multiplication, 1 for division */ static PyObject * multiply_truedivide_timedelta_float(datetime_state *st, - PyDateTime_Delta *delta, - PyObject *floatobj, int op) + PyDateTime_Delta *delta, PyObject *floatobj, int op) { PyObject *result = NULL; PyObject *pyus_in = NULL, *temp, *pyus_out; @@ -2146,8 +2146,8 @@ multiply_truedivide_timedelta_float(datetime_state *st, } static PyObject * -divide_timedelta_int(datetime_state *st, PyDateTime_Delta *delta, - PyObject *intobj) +divide_timedelta_int(datetime_state *st, + PyDateTime_Delta *delta, PyObject *intobj) { PyObject *pyus_in; PyObject *pyus_out; @@ -2168,8 +2168,8 @@ divide_timedelta_int(datetime_state *st, PyDateTime_Delta *delta, } static PyObject * -divide_timedelta_timedelta(datetime_state *st, PyDateTime_Delta *left, - PyDateTime_Delta *right) +divide_timedelta_timedelta(datetime_state *st, + PyDateTime_Delta *left, PyDateTime_Delta *right) { PyObject *pyus_left; PyObject *pyus_right; @@ -2192,8 +2192,8 @@ divide_timedelta_timedelta(datetime_state *st, PyDateTime_Delta *left, } static PyObject * -truedivide_timedelta_timedelta(datetime_state *st, PyDateTime_Delta *left, - PyDateTime_Delta *right) +truedivide_timedelta_timedelta(datetime_state *st, + PyDateTime_Delta *left, PyDateTime_Delta *right) { PyObject *pyus_left; PyObject *pyus_right; @@ -2216,8 +2216,8 @@ truedivide_timedelta_timedelta(datetime_state *st, PyDateTime_Delta *left, } static PyObject * -truedivide_timedelta_int(datetime_state *st, PyDateTime_Delta *delta, - PyObject *i) +truedivide_timedelta_int(datetime_state *st, + PyDateTime_Delta *delta, PyObject *i) { PyObject *result; PyObject *pyus_in, *pyus_out; @@ -2228,7 +2228,6 @@ truedivide_timedelta_int(datetime_state *st, PyDateTime_Delta *delta, Py_DECREF(pyus_in); if (pyus_out == NULL) return NULL; - result = microseconds_to_delta(st, pyus_out); Py_DECREF(pyus_out); @@ -2297,11 +2296,13 @@ delta_abs(PyDateTime_Delta *self) assert(GET_TD_MICROSECONDS(self) >= 0); assert(GET_TD_SECONDS(self) >= 0); - if (GET_TD_DAYS(self) < 0) - result = delta_negative(self); - else + if (GET_TD_DAYS(self) < 0) { + datetime_state *st = find_module_state_by_def(Py_TYPE(self)); + result = _delta_negative(st, self); + } + else { result = delta_positive(self); - + } return result; } @@ -2309,6 +2310,7 @@ static inline PyObject * _delta_subtract(datetime_state *st, PyObject *left, PyObject *right) { PyObject *result = Py_NotImplemented; + if (PyDelta_Check(st, left) && PyDelta_Check(st, right)) { /* delta - delta */ /* The C-level additions can't overflow because of the @@ -3102,7 +3104,7 @@ datetime_date_fromtimestamp(PyTypeObject *type, PyObject *timestamp) /*[clinic end generated code: output=fd045fda58168869 input=eabb3fe7f40491fe]*/ { datetime_state *st = find_module_state_by_def(type); - return date_fromtimestamp(st, (PyObject *)type, timestamp); + return date_fromtimestamp(st, (PyObject *) type, timestamp); } /* bpo-36025: This is a wrapper for API compatibility with the public C API, @@ -3116,7 +3118,7 @@ datetime_date_fromtimestamp_capi(PyObject *cls, PyObject *args) PyObject *result = NULL; if (PyArg_UnpackTuple(args, "fromtimestamp", 1, 1, ×tamp)) { - datetime_state *st = find_module_state_by_def(cls); + datetime_state *st = get_module_state_by_cls(cls); result = date_fromtimestamp(st, cls, timestamp); } @@ -4719,7 +4721,6 @@ time_hash(PyDateTime_Time *self) TIME_GET_MINUTE(self) * 60 + TIME_GET_SECOND(self); microseconds = TIME_GET_MICROSECOND(self); - temp1 = new_delta(st, 0, seconds, microseconds, 1); if (temp1 == NULL) { Py_DECREF(offset); @@ -4760,8 +4761,9 @@ datetime_time_replace_impl(PyDateTime_Time *self, int hour, int minute, /*[clinic end generated code: output=0b89a44c299e4f80 input=9b6a35b1e704b0ca]*/ { datetime_state *st = find_module_state_by_def(Py_TYPE(self)); - return new_time_subclass_fold_ex(st, hour, minute, second, microsecond, - tzinfo, fold, (PyObject *)Py_TYPE(self)); + return new_time_subclass_fold_ex(st, + hour, minute, second, microsecond, tzinfo, + fold, (PyObject *)Py_TYPE(self)); } static PyObject * @@ -5784,7 +5786,8 @@ datetime_add(PyObject *left, PyObject *right) /* datetime + ??? */ if (PyDelta_Check(st, right)) /* datetime + delta */ - return add_datetime_timedelta(st, + return add_datetime_timedelta( + st, (PyDateTime_DateTime *)left, (PyDateTime_Delta *)right, 1); @@ -5802,6 +5805,7 @@ static inline PyObject * _datetime_subtract(datetime_state *st, PyObject *left, PyObject *right) { PyObject *result = Py_NotImplemented; + if (PyDateTime_Check(st, left)) { /* datetime - ??? */ if (PyDateTime_Check(st, right)) { @@ -6307,7 +6311,7 @@ local_timezone_from_timestamp(datetime_state *st, time_t timestamp) Py_DECREF(local_time); return NULL; } - delta = datetime_subtract(local_time, utc_time); + delta = _datetime_subtract(st, local_time, utc_time); Py_DECREF(local_time); Py_DECREF(utc_time); } @@ -6335,7 +6339,7 @@ local_timezone(datetime_state *st, PyDateTime_DateTime *utc_time) PyObject *one_second; PyObject *seconds; - delta = datetime_subtract((PyObject *)utc_time, st->epoch); + delta = _datetime_subtract(st, (PyObject *)utc_time, st->epoch); if (delta == NULL) return NULL; one_second = new_delta(st, 0, 1, 0, 0); @@ -6390,7 +6394,6 @@ local_timezone_from_local(datetime_state *st, PyDateTime_DateTime *local_dt) /* XXX: add bounds check */ timestamp = seconds - epoch; - return local_timezone_from_timestamp(st, timestamp); } @@ -6444,7 +6447,7 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) } /* result = self - offset */ result = (PyDateTime_DateTime *)add_datetime_timedelta(st, self, - (PyDateTime_Delta *)offset, -1); + (PyDateTime_Delta *)offset, -1); Py_DECREF(offset); if (result == NULL) return NULL; @@ -6577,7 +6580,7 @@ datetime_timestamp(PyDateTime_DateTime *self, PyObject *Py_UNUSED(ignored)) if (HASTZINFO(self) && self->tzinfo != Py_None) { datetime_state *st = find_module_state_by_def(Py_TYPE(self)); PyObject *delta; - delta = datetime_subtract((PyObject *)self, st->epoch); + delta = _datetime_subtract(st, (PyObject *)self, st->epoch); if (delta == NULL) return NULL; result = _delta_total_seconds(st, delta); From 05de8f09055e4dc0ce06e7f84bf43ef88d6530a9 Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Sat, 20 Apr 2024 00:40:59 +0900 Subject: [PATCH 12/18] fix warning --- Modules/_datetimemodule.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index d48f446bca22d7..edd9a6e837ab27 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -82,9 +82,9 @@ get_module_state(PyObject *mod) static inline datetime_state * get_module_state_by_cls(PyTypeObject *cls) { - datetime_state *state = (datetime_state *)_PyType_GetModuleState(cls); + void *state = _PyType_GetModuleState(cls); assert(state != NULL); - return state; + return (datetime_state *)state; } static struct PyModuleDef datetimemodule; @@ -3118,7 +3118,7 @@ datetime_date_fromtimestamp_capi(PyObject *cls, PyObject *args) PyObject *result = NULL; if (PyArg_UnpackTuple(args, "fromtimestamp", 1, 1, ×tamp)) { - datetime_state *st = get_module_state_by_cls(cls); + datetime_state *st = get_module_state_by_cls((PyTypeObject *)cls); result = date_fromtimestamp(st, cls, timestamp); } @@ -3483,8 +3483,7 @@ static void iso_calendar_date_dealloc(PyDateTime_IsoCalendarDate *self) { PyTypeObject *tp = Py_TYPE(self); - // tupledealloc does PyObject_GC_UnTrack - PyTuple_Type.tp_dealloc((PyObject *)self); + PyTuple_Type.tp_dealloc((PyObject *)self); // delegate GC-untrack as well Py_DECREF(tp); } From 9d6de973f7ed77761123096c973f2530b1d70a1e Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Sat, 20 Apr 2024 01:03:57 +0900 Subject: [PATCH 13/18] a inlining fix --- Modules/_datetimemodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index edd9a6e837ab27..d020543e6c4670 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -6135,7 +6135,7 @@ datetime_richcompare(PyObject *self, PyObject *other, int op) PyDateTime_Delta *delta; assert(offset1 != offset2); /* else last "if" handled it */ - delta = (PyDateTime_Delta *)datetime_subtract((PyObject *)self, + delta = (PyDateTime_Delta *)_datetime_subtract(st, (PyObject *)self, other); if (delta == NULL) goto done; From 1fff86d091a4291a0009cbce8dcfbb5bc566fe3a Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Sat, 27 Apr 2024 00:27:37 +0900 Subject: [PATCH 14/18] use _PyType_GetModuleByDef2() --- Modules/_datetimemodule.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index d020543e6c4670..4c2c4209451177 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -100,11 +100,8 @@ find_module_state_by_def(PyTypeObject *type) static inline datetime_state * find_state_left_or_right(PyObject *left, PyObject *right) { - PyObject *mod = PyType_GetModuleByDef(Py_TYPE(left), &datetimemodule); - if (mod == NULL) { - PyErr_Clear(); - mod = PyType_GetModuleByDef(Py_TYPE(right), &datetimemodule); - } + PyObject *mod = _PyType_GetModuleByDef2(Py_TYPE(left), Py_TYPE(right), + &datetimemodule); assert(mod != NULL); return get_module_state(mod); } From 5abaffe2ac9fd1a0045b10a2a70d4cf6821826d2 Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Sat, 27 Apr 2024 03:45:22 +0900 Subject: [PATCH 15/18] fix style --- Modules/_datetimemodule.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index 4c2c4209451177..fb39cba54ad11c 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -975,7 +975,8 @@ new_date_ex(int year, int month, int day, PyTypeObject *type) // Forward declaration static PyObject * -new_datetime_ex(datetime_state *st, int, int, int, int, int, int, int, PyObject *, PyTypeObject *); +new_datetime_ex(datetime_state *st, + int, int, int, int, int, int, int, PyObject *, PyTypeObject *); /* Create date instance with no range checking, or call subclass constructor */ static PyObject * @@ -1002,7 +1003,8 @@ new_date_subclass_ex(datetime_state *st, static PyObject * new_datetime_ex2(datetime_state *st, int year, int month, int day, int hour, int minute, - int second, int usecond, PyObject *tzinfo, int fold, PyTypeObject *type) + int second, int usecond, PyObject *tzinfo, int fold, + PyTypeObject *type) { PyDateTime_DateTime *self; char aware = tzinfo != Py_None; @@ -2112,7 +2114,8 @@ get_float_as_integer_ratio(PyObject *floatobj) /* op is 0 for multiplication, 1 for division */ static PyObject * multiply_truedivide_timedelta_float(datetime_state *st, - PyDateTime_Delta *delta, PyObject *floatobj, int op) + PyDateTime_Delta *delta, + PyObject *floatobj, int op) { PyObject *result = NULL; PyObject *pyus_in = NULL, *temp, *pyus_out; From cd39278e808245252fd00b71272c77bda70338dd Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Sat, 27 Apr 2024 03:51:37 +0900 Subject: [PATCH 16/18] fix longline --- Modules/_datetimemodule.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index fb39cba54ad11c..4788a1bbbc165e 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -6895,7 +6895,8 @@ datetime_destructor(PyObject *op) } static PyObject * -create_timezone_from_delta(datetime_state *st, int days, int sec, int ms, int normalize) +create_timezone_from_delta(datetime_state *st, + int days, int sec, int ms, int normalize) { PyObject *delta = new_delta(st, days, sec, ms, normalize); if (delta == NULL) { From 752c030bc1958e4d0ce875ca7a34a1dc5bff43c3 Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Mon, 29 Apr 2024 01:01:03 +0900 Subject: [PATCH 17/18] fix gil-disabled test --- Modules/_testmultiphase.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Modules/_testmultiphase.c b/Modules/_testmultiphase.c index e09de1d5a7b793..a8ed507f8815d0 100644 --- a/Modules/_testmultiphase.c +++ b/Modules/_testmultiphase.c @@ -965,19 +965,20 @@ datetime_capi_client_exec(PyObject *m) } PyDateTime_IMPORT; - if (PyDateTimeAPI == NULL) { - return -1; - } - if (PyDateTimeAPI != PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0)) { + PyErr_Clear(); + PyDateTime_CAPI *capi = PyDateTimeAPI; + PyErr_Clear(); + if (capi != PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0)) { return -1; } + PyErr_Clear(); if (ismain) { - if (PyDateTimeAPI != _pydatetimeapi_main) { + if (capi != _pydatetimeapi_main) { return -1; } } else { - if (PyDateTimeAPI == _pydatetimeapi_main) { + if (capi == _pydatetimeapi_main) { PyObject *module = PyImport_ImportModule("_datetime"); if (module == NULL) { return -1; From 74294c21115da9c0245c14265d8e6a0b38c4ca0a Mon Sep 17 00:00:00 2001 From: neonene <53406459+neonene@users.noreply.github.com> Date: Sun, 5 May 2024 04:08:54 +0900 Subject: [PATCH 18/18] use latest #117413 (041b1dd) --- Include/datetime.h | 31 ++++---- Lib/test/datetimetester.py | 2 +- Lib/test/test_capi/test_misc.py | 1 + Modules/_datetimemodule.c | 58 +++++++++++++++ Modules/_testcapi/datetime.c | 16 ++++- Modules/_testmultiphase.c | 78 +++++++++++++-------- Tools/c-analyzer/cpython/globals-to-fix.tsv | 3 +- Tools/c-analyzer/cpython/ignored.tsv | 1 + 8 files changed, 139 insertions(+), 51 deletions(-) diff --git a/Include/datetime.h b/Include/datetime.h index 76544a5ece7267..54d80303a281ce 100644 --- a/Include/datetime.h +++ b/Include/datetime.h @@ -186,34 +186,31 @@ typedef struct { } PyDateTime_CAPI; #define PyDateTime_CAPSULE_NAME "datetime.datetime_CAPI" - +#define PyDateTime_INTERNAL_CAPSULE_NAME "datetime.datetime_CAPI_INTERNAL" /* This block is only used as part of the public API and should not be * included in _datetimemodule.c, which does not use the C API capsule. * See bpo-35081 for more details. * */ #ifndef _PY_DATETIME_IMPL -/* Define global variable for the C API and a macro for setting it. */ -static PyDateTime_CAPI *_pydatetimeapi_main = NULL; +static PyDateTime_CAPI * +_PyDateTimeAPI_not_ready(void) +{ + return NULL; +} +static PyDateTime_CAPI *(*_PyDateTimeAPI_Get)(void) = _PyDateTimeAPI_not_ready; static inline void -_import_pydatetime(void) { - if (PyInterpreterState_Get() == PyInterpreterState_Main()) { - _pydatetimeapi_main = PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0); +_PyDateTimeAPI_Import(void) +{ + void *(*func)(void) = PyCapsule_Import(PyDateTime_INTERNAL_CAPSULE_NAME, 0); + if (func) { + _PyDateTimeAPI_Get = func(); } } -#define PyDateTime_IMPORT _import_pydatetime() -static inline PyDateTime_CAPI * -_get_pydatetime_api(void) { - if (PyInterpreterState_Get() == PyInterpreterState_Main()) { - return _pydatetimeapi_main; - } - else { - return PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0); - } -} -#define PyDateTimeAPI _get_pydatetime_api() +#define PyDateTimeAPI _PyDateTimeAPI_Get() +#define PyDateTime_IMPORT _PyDateTimeAPI_Import() /* Macro for access to the UTC singleton */ #define PyDateTime_TimeZone_UTC PyDateTimeAPI->TimeZone_UTC diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index 570110893629cf..6946b394e68a82 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -91,7 +91,7 @@ def test_name_cleanup(self): if not name.startswith('__') and not name.endswith('__')) allowed = set(['MAXYEAR', 'MINYEAR', 'date', 'datetime', 'datetime_CAPI', 'time', 'timedelta', 'timezone', - 'tzinfo', 'UTC', 'sys']) + 'tzinfo', 'UTC', 'sys', 'datetime_CAPI_INTERNAL']) self.assertEqual(names - allowed, set([])) def test_divide_and_round(self): diff --git a/Lib/test/test_capi/test_misc.py b/Lib/test/test_capi/test_misc.py index 9786e0d88cbf66..2cbaac346e915c 100644 --- a/Lib/test/test_capi/test_misc.py +++ b/Lib/test/test_capi/test_misc.py @@ -2295,6 +2295,7 @@ def test_datetime_capi_client(self): spec.loader.exec_module(module) """) exec(script) # run main interp first + exec(script) # run main interp twice ret = support.run_in_subinterp(script) self.assertEqual(ret, 0) diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index 4788a1bbbc165e..2d6d5b0ac67048 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -108,6 +108,50 @@ find_state_left_or_right(PyObject *left, PyObject *right) #define find_module_state_by_def(obj) find_module_state_by_def((PyTypeObject *)(obj)) +typedef struct { + PyInterpreterState *interp; + PyDateTime_CAPI *capi; +} CAPI_Cache; + +static CAPI_Cache apicache[2]; + +static inline void +set_datetime_capi_by_interp(PyDateTime_CAPI *capi) +{ + PyInterpreterState *interp = PyInterpreterState_Get(); + int i = interp == PyInterpreterState_Main() ? 0 : 1; + apicache[i].interp = interp; + apicache[i].capi = capi; +} + +static PyDateTime_CAPI * +_PyDateTimeAPI_Get(void) +{ + PyInterpreterState *interp = PyInterpreterState_Get(); + for (int i = 0; i < 2; i++) { + if (apicache[i].interp == interp) { + return apicache[i].capi; + } + } + PyDateTime_CAPI *capi = PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0); + if (capi) { + set_datetime_capi_by_interp(capi); + } + return capi; +} + +static void * +_PyDateTimeAPI_Import(void) +{ + PyDateTime_CAPI *capi = PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0); + if (capi) { + // PyInit__datetime() is not called when the module is already loaded + // with single-phase init. + set_datetime_capi_by_interp(capi); + return _PyDateTimeAPI_Get; + } + return NULL; +} /* We require that C int be at least 32 bits, and use int virtually * everywhere. In just a few cases we use a temp long, where a Python @@ -7089,6 +7133,20 @@ _datetime_exec(PyObject *module) goto error; } + capsule = PyCapsule_New(_PyDateTimeAPI_Import, + PyDateTime_INTERNAL_CAPSULE_NAME, NULL); + if (capsule == NULL) { + PyMem_Free(capi); + goto error; + } + if (PyModule_Add(module, "datetime_CAPI_INTERNAL", capsule) < 0) { + PyMem_Free(capi); + goto error; + } + + /* Ensure that the newest capi is used on multi-phase init */ + set_datetime_capi_by_interp(capi); + /* A 4-year cycle has an extra leap day over what we'd get from * pasting together 4 single years. */ diff --git a/Modules/_testcapi/datetime.c b/Modules/_testcapi/datetime.c index 9803a830a25af1..b1796039f0d83a 100644 --- a/Modules/_testcapi/datetime.c +++ b/Modules/_testcapi/datetime.c @@ -3,11 +3,23 @@ #include "datetime.h" // PyDateTimeAPI +static int test_run_counter = 0; + static PyObject * test_datetime_capi(PyObject *self, PyObject *args) { - // PyDateTimeAPI cannot be carried over - // with multi-phase init enabled. + if (PyDateTimeAPI) { + if (test_run_counter) { + /* Probably regrtest.py -R */ + Py_RETURN_NONE; + } + else { + PyErr_SetString(PyExc_AssertionError, + "PyDateTime_CAPI somehow initialized"); + return NULL; + } + } + test_run_counter++; PyDateTime_IMPORT; if (PyDateTimeAPI) { diff --git a/Modules/_testmultiphase.c b/Modules/_testmultiphase.c index a8ed507f8815d0..429824fbede1fa 100644 --- a/Modules/_testmultiphase.c +++ b/Modules/_testmultiphase.c @@ -957,44 +957,62 @@ PyInit__test_shared_gil_only(void) #include "datetime.h" static int -datetime_capi_client_exec(PyObject *m) +datetime_capi_import_with_error(void) { + static int is_datetime_multiphase = -1; int ismain = PyInterpreterState_Get() == PyInterpreterState_Main(); - if (ismain) { - _pydatetimeapi_main = NULL; + if (ismain && is_datetime_multiphase < 0) { + PyObject *module = PyImport_ImportModule("_datetime"); + if (module == NULL) { + return -1; + } + PyModuleDef *def = PyModule_GetDef(module); + Py_DECREF(module); + if (def && def->m_size >= 0) { + is_datetime_multiphase = 1; + } + else { + is_datetime_multiphase = 0; + } + } + if (is_datetime_multiphase < 0) { + PyErr_SetString(PyExc_AssertionError, + "Main interpreter must be loaded first."); + return -1; } - PyDateTime_IMPORT; - PyErr_Clear(); - PyDateTime_CAPI *capi = PyDateTimeAPI; - PyErr_Clear(); - if (capi != PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0)) { + _PyDateTimeAPI_Import(); + if (!PyErr_Occurred()) { + return 0; + } +#ifdef Py_GIL_DISABLED + if (!ismain && !is_datetime_multiphase) { + // _datetime module and Capsule are not imported + PyErr_WriteUnraisable(NULL); + return 0; + } +#endif + return -1; +} + +static int +datetime_capi_client_exec(PyObject *m) +{ + _PyDateTimeAPI_Get = _PyDateTimeAPI_not_ready; + if (_PyDateTimeAPI_Get() != NULL) { + PyErr_SetString(PyExc_AssertionError, + "DateTime API is expected to remain NULL."); return -1; } - PyErr_Clear(); - if (ismain) { - if (capi != _pydatetimeapi_main) { - return -1; - } + if (datetime_capi_import_with_error() < 0) { + return -1; } - else { - if (capi == _pydatetimeapi_main) { - PyObject *module = PyImport_ImportModule("_datetime"); - if (module == NULL) { - return -1; - } - PyModuleDef *def = PyModule_GetDef(module); - Py_DECREF(module); - if (def) { - // multi-phase init - return -1; - } - else { - // legacy init (shared module) - return 0; - } - } + if (PyDateTimeAPI != PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0)) { + PyErr_SetString(PyExc_AssertionError, + "DateTime API does not match Capsule CAPI."); + return -1; } + PyErr_Clear(); return 0; } diff --git a/Tools/c-analyzer/cpython/globals-to-fix.tsv b/Tools/c-analyzer/cpython/globals-to-fix.tsv index 3e4b36ce411d90..7fd6777a5f131f 100644 --- a/Tools/c-analyzer/cpython/globals-to-fix.tsv +++ b/Tools/c-analyzer/cpython/globals-to-fix.tsv @@ -437,7 +437,7 @@ Modules/_tkinter.c - trbInCmd - ## initialized once ## other -Include/datetime.h - _pydatetimeapi_main - +Include/datetime.h - _PyDateTimeAPI_Get - Modules/_ctypes/cfield.c _ctypes_get_fielddesc initialized - Modules/_ctypes/malloc_closure.c - _pagesize - Modules/_cursesmodule.c - initialised - @@ -455,6 +455,7 @@ Modules/readline.c - libedit_history_start - Modules/_ctypes/cfield.c - formattable - Modules/_ctypes/malloc_closure.c - free_list - Modules/_curses_panel.c - lop - +Modules/_datetimemodule.c - apicache - Modules/_ssl/debughelpers.c _PySSL_keylog_callback lock - Modules/_tkinter.c - quitMainLoop - Modules/_tkinter.c - errorInCmd - diff --git a/Tools/c-analyzer/cpython/ignored.tsv b/Tools/c-analyzer/cpython/ignored.tsv index 87b695de23e25e..11e56658951af8 100644 --- a/Tools/c-analyzer/cpython/ignored.tsv +++ b/Tools/c-analyzer/cpython/ignored.tsv @@ -591,6 +591,7 @@ Modules/_testmultiphase.c - slots_exec_unreported_exception - Modules/_testmultiphase.c - slots_nonmodule_with_exec_slots - Modules/_testmultiphase.c - testexport_methods - Modules/_testmultiphase.c - uninitialized_def - +Modules/_testmultiphase.c datetime_capi_import_with_error is_datetime_multiphase - Modules/_testsinglephase.c - global_state - Modules/_xxtestfuzz/_xxtestfuzz.c - _fuzzmodule - Modules/_xxtestfuzz/_xxtestfuzz.c - module_methods -