Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

gh-71587: Establish global state in _datetime #110475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Oct 12, 2023
Merged

gh-71587: Establish global state in _datetime #110475

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
cacf1e8
Consistency: use explicit initialiser for m_base
erlend-aasland Feb 15, 2023
c2eba8f
Add module state stub; establish global state on stack
erlend-aasland Feb 15, 2023
8d54ecd
Put conversion factors in state struct
erlend-aasland Feb 15, 2023
360397a
Move PyDateTime_TimeZone_UTC to state
erlend-aasland Feb 15, 2023
4f509f9
Move PyDateTime_Epoch to state struct
erlend-aasland Feb 15, 2023
6b14c8c
Remove datetime_strptime globals entry
erlend-aasland Feb 15, 2023
2eb3315
Apply Victor's suggestions from gh-102995
erlend-aasland Oct 6, 2023
f5ede1e
Apply PEP-7 to modified code
erlend-aasland Oct 6, 2023
f6ac875
Merge branch 'main' into isolate-datetime/part1-establish-global-state
erlend-aasland Oct 6, 2023
7139569
Fix check-c-globals
erlend-aasland Oct 6, 2023
26e6454
Merge PR updates
erlend-aasland Oct 6, 2023
227dd2c
Pull in main
erlend-aasland Oct 10, 2023
beb0977
Address review: use shorter names
erlend-aasland Oct 10, 2023
8525be6
Pull in main
erlend-aasland Oct 11, 2023
6863f76
Address review: rename global_state => _datetime_global_state
erlend-aasland Oct 11, 2023
0738205
Pull in main
erlend-aasland Oct 11, 2023
c56b5e1
Address review
erlend-aasland Oct 11, 2023
3ee48d2
Fix ref leak in init
erlend-aasland Oct 11, 2023
0a1d770
Pull in main
erlend-aasland Oct 11, 2023
a9e8d1a
Clean up initialisation
erlend-aasland Oct 11, 2023
c3ba7fe
Preserve comment
erlend-aasland Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Put conversion factors in state struct
  • Loading branch information
@erlend-aasland
erlend-aasland committed Oct 6, 2023
commit 8d54ecdc4e71e6f7dcfbb0ee3d5aa9cbc729453a
89 changes: 44 additions & 45 deletions 89 Modules/_datetimemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@
#define PyTimezone_Check(op) PyObject_TypeCheck(op, &PyDateTime_TimeZoneType)

typedef struct {
/* Conversion factors. */
PyObject *us_per_ms; // 1000
PyObject *us_per_second; // 1000000
PyObject *us_per_minute; // 1e6 * 60 as Python int
PyObject *us_per_hour; // 1e6 * 3600 as Python int
PyObject *us_per_day; // 1e6 * 3600 * 24 as Python int
PyObject *us_per_week; // 1e6*3600*24*7 as Python int
PyObject *seconds_per_day; // 3600*24 as Python int
} datetime_state;

static datetime_state global_state;
erlend-aasland marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -1814,19 +1822,6 @@ cmperror(PyObject *a, PyObject *b)
return NULL;
}

/* ---------------------------------------------------------------------------
* Cached Python objects; these are set by the module init function.
*/

/* Conversion factors. */
static PyObject *us_per_ms = NULL; /* 1000 */
static PyObject *us_per_second = NULL; /* 1000000 */
static PyObject *us_per_minute = NULL; /* 1e6 * 60 as Python int */
static PyObject *us_per_hour = NULL; /* 1e6 * 3600 as Python int */
static PyObject *us_per_day = NULL; /* 1e6 * 3600 * 24 as Python int */
static PyObject *us_per_week = NULL; /* 1e6*3600*24*7 as Python int */
static PyObject *seconds_per_day = NULL; /* 3600*24 as Python int */

/* ---------------------------------------------------------------------------
* Class implementations.
*/
Expand All @@ -1852,7 +1847,8 @@ delta_to_microseconds(PyDateTime_Delta *self)
x1 = PyLong_FromLong(GET_TD_DAYS(self));
if (x1 == NULL)
goto Done;
x2 = PyNumber_Multiply(x1, seconds_per_day); /* days in seconds */
datetime_state *st = GLOBAL_STATE();
x2 = PyNumber_Multiply(x1, st->seconds_per_day); /* days in seconds */
if (x2 == NULL)
goto Done;
Py_SETREF(x1, NULL);
Expand All @@ -1869,7 +1865,7 @@ delta_to_microseconds(PyDateTime_Delta *self)
/* x1 = */ x2 = NULL;

/* x3 has days+seconds in seconds */
x1 = PyNumber_Multiply(x3, us_per_second); /* us */
x1 = PyNumber_Multiply(x3, st->us_per_second); /* us */
if (x1 == NULL)
goto Done;
Py_SETREF(x3, NULL);
Expand Down Expand Up @@ -1924,7 +1920,8 @@ microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type)
PyObject *num = NULL;
PyObject *result = NULL;

tuple = checked_divmod(pyus, us_per_second);
datetime_state *st = GLOBAL_STATE();
tuple = checked_divmod(pyus, st->us_per_second);
if (tuple == NULL) {
goto Done;
}
Expand All @@ -1942,7 +1939,7 @@ microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type)
num = Py_NewRef(PyTuple_GET_ITEM(tuple, 0)); /* leftover seconds */
Py_DECREF(tuple);

tuple = checked_divmod(num, seconds_per_day);
tuple = checked_divmod(num, st->seconds_per_day);
if (tuple == NULL)
goto Done;
Py_DECREF(num);
Expand Down Expand Up @@ -2542,28 +2539,29 @@ delta_new(PyTypeObject *type, PyObject *args, PyObject *kw)
y = accum("microseconds", x, us, _PyLong_GetOne(), &leftover_us);
CLEANUP;
}
datetime_state *st = GLOBAL_STATE();
if (ms) {
y = accum("milliseconds", x, ms, us_per_ms, &leftover_us);
y = accum("milliseconds", x, ms, st->us_per_ms, &leftover_us);
CLEANUP;
}
if (second) {
y = accum("seconds", x, second, us_per_second, &leftover_us);
y = accum("seconds", x, second, st->us_per_second, &leftover_us);
CLEANUP;
}
if (minute) {
y = accum("minutes", x, minute, us_per_minute, &leftover_us);
y = accum("minutes", x, minute, st->us_per_minute, &leftover_us);
CLEANUP;
}
if (hour) {
y = accum("hours", x, hour, us_per_hour, &leftover_us);
y = accum("hours", x, hour, st->us_per_hour, &leftover_us);
CLEANUP;
}
if (day) {
y = accum("days", x, day, us_per_day, &leftover_us);
y = accum("days", x, day, st->us_per_day, &leftover_us);
CLEANUP;
}
if (week) {
y = accum("weeks", x, week, us_per_week, &leftover_us);
y = accum("weeks", x, week, st->us_per_week, &leftover_us);
CLEANUP;
}
if (leftover_us) {
Expand Down Expand Up @@ -2718,7 +2716,8 @@ delta_total_seconds(PyObject *self, PyObject *Py_UNUSED(ignored))
if (total_microseconds == NULL)
return NULL;

total_seconds = PyNumber_TrueDivide(total_microseconds, us_per_second);
datetime_state *st = GLOBAL_STATE();
total_seconds = PyNumber_TrueDivide(total_microseconds, st->us_per_second);

Py_DECREF(total_microseconds);
return total_seconds;
Expand Down Expand Up @@ -6873,49 +6872,49 @@ _datetime_exec(PyObject *module)
static_assert(DI100Y == 25 * DI4Y - 1, "DI100Y");
assert(DI100Y == days_before_year(100+1));

us_per_ms = PyLong_FromLong(1000);
if (us_per_ms == NULL) {
st->us_per_ms = PyLong_FromLong(1000);
if (st->us_per_ms == NULL) {
goto error;
}
us_per_second = PyLong_FromLong(1000000);
if (us_per_second == NULL) {
st->us_per_second = PyLong_FromLong(1000000);
if (st->us_per_second == NULL) {
goto error;
}
us_per_minute = PyLong_FromLong(60000000);
if (us_per_minute == NULL) {
st->us_per_minute = PyLong_FromLong(60000000);
if (st->us_per_minute == NULL) {
goto error;
}
seconds_per_day = PyLong_FromLong(24 * 3600);
if (seconds_per_day == NULL) {
st->seconds_per_day = PyLong_FromLong(24 * 3600);
if (st->seconds_per_day == NULL) {
goto error;
}

/* The rest are too big for 32-bit ints, but even
* us_per_week fits in 40 bits, so doubles should be exact.
*/
us_per_hour = PyLong_FromDouble(3600000000.0);
if (us_per_hour == NULL) {
st->us_per_hour = PyLong_FromDouble(3600000000.0);
if (st->us_per_hour == NULL) {
goto error;
}
us_per_day = PyLong_FromDouble(86400000000.0);
if (us_per_day == NULL) {
st->us_per_day = PyLong_FromDouble(86400000000.0);
if (st->us_per_day == NULL) {
goto error;
}
us_per_week = PyLong_FromDouble(604800000000.0);
if (us_per_week == NULL) {
st->us_per_week = PyLong_FromDouble(604800000000.0);
if (st->us_per_week == NULL) {
goto error;
}

return 0;

error:
Py_XDECREF(us_per_ms);
Py_XDECREF(us_per_second);
Py_XDECREF(us_per_minute);
Py_XDECREF(us_per_hour);
Py_XDECREF(us_per_day);
Py_XDECREF(us_per_week);
Py_XDECREF(seconds_per_day);
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);
return -1;
}

Expand Down
7 changes: 0 additions & 7 deletions 7 Tools/c-analyzer/cpython/globals-to-fix.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,13 +420,6 @@ Modules/_cursesmodule.c - ModDict -
Modules/_datetimemodule.c datetime_strptime module -
Modules/_datetimemodule.c - PyDateTime_TimeZone_UTC -
Modules/_datetimemodule.c - PyDateTime_Epoch -
Modules/_datetimemodule.c - us_per_ms -
Modules/_datetimemodule.c - us_per_second -
Modules/_datetimemodule.c - us_per_minute -
Modules/_datetimemodule.c - us_per_hour -
Modules/_datetimemodule.c - us_per_day -
Modules/_datetimemodule.c - us_per_week -
Modules/_datetimemodule.c - seconds_per_day -

## state
Modules/_ctypes/_ctypes.c - _ctypes_ptrtype_cache -
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.