Skip to content

gh-117398: gh-119655: datetime: Init static state once & don't free it #119662

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 3 commits into from
May 28, 2024
Merged

gh-117398: gh-119655: datetime: Init static state once & don't free it #119662

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3dbfcc5
While datetime uses global state, only initialize it once
encukou May 28, 2024
2f7970d
Do not free the static `capi`
encukou May 28, 2024
2923078
typo
encukou May 28, 2024
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
18 changes: 13 additions & 5 deletions Modules/_datetimemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ typedef struct {

/* The interned Unix epoch datetime instance */
PyObject *epoch;

/* While we use a global state, we ensure it's only initialized once */
int initialized;
} datetime_state;

static datetime_state _datetime_global_state;
Expand Down Expand Up @@ -6841,6 +6844,12 @@ create_timezone_from_delta(int days, int sec, int ms, int normalize)
static int
init_state(datetime_state *st)
{
// While datetime uses global module "state", we unly initialize it once.
// The PyLong objects created here (once per process) are not decref'd.
if (st->initialized) {
return 0;
}

st->date_type = &PyDateTime_DateType;
st->datetime_type = &PyDateTime_DateTimeType;
st->delta_type = &PyDateTime_DeltaType;
Expand Down Expand Up @@ -6893,6 +6902,9 @@ init_state(datetime_state *st)
if (st->epoch == NULL) {
return -1;
}

st->initialized = 1;

return 0;
}

Expand Down Expand Up @@ -7005,12 +7017,8 @@ _datetime_exec(PyObject *module)
goto error;
}
PyObject *capsule = PyCapsule_New(capi, PyDateTime_CAPSULE_NAME, NULL);
if (capsule == NULL) {
PyMem_Free(capi);
goto error;
}
// (capsule == NULL) is handled by PyModule_Add
if (PyModule_Add(module, "datetime_CAPI", capsule) < 0) {
PyMem_Free(capi);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not correct to free capi here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

capi is static, we should not free it.

goto error;
}

Expand Down
Loading