Visitar URL original
gh-117398: Statically Allocate the Datetime C-API by ericsnowcurrently · Pull Request #119472 · python/cpython · GitHub
Skip to content

gh-117398: Statically Allocate the Datetime C-API #119472

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
encukou merged 6 commits into from
May 23, 2024
Merged

gh-117398: Statically Allocate the Datetime C-API #119472

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
773ddca
Make the zero delta a global singleton.
ericsnowcurrently May 23, 2024
50a2a5b
Make the UTC timezone a global singleton.
ericsnowcurrently May 23, 2024
d0fc87e
Statically allocate the datetime capi.
ericsnowcurrently May 23, 2024
45a0a90
Add a NEWS entry.
ericsnowcurrently May 23, 2024
4dd8ff1
Add a note.
ericsnowcurrently May 23, 2024
f86cd51
Ignore the new static global variables.
ericsnowcurrently May 23, 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
Prev Previous commit
Next Next commit
Statically allocate the datetime capi.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 23, 2024
commit d0fc87e48c80ed915d3eb0b5ce1b9fe6f7e19ef5
62 changes: 27 additions & 35 deletions Modules/_datetimemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6771,45 +6771,38 @@ static PyMethodDef module_methods[] = {
{NULL, NULL}
};


/* The C-API is process-global. This violates interpreter isolation
* due to the objects stored here. Thus each of those objects must
* be managed carefully. */
// XXX Can we make this const?
static PyDateTime_CAPI capi = {
.DateType = &PyDateTime_DateType,
.DateTimeType = &PyDateTime_DateTimeType,
.TimeType = &PyDateTime_TimeType,
.DeltaType = &PyDateTime_DeltaType,
.TZInfoType = &PyDateTime_TZInfoType,

.TimeZone_UTC = (PyObject *)&utc_timezone,

.Date_FromDate = new_date_ex,
.DateTime_FromDateAndTime = new_datetime_ex,
.Time_FromTime = new_time_ex,
.Delta_FromDelta = new_delta_ex,
.TimeZone_FromTimeZone = new_timezone,
.DateTime_FromTimestamp = datetime_fromtimestamp,
.Date_FromTimestamp = datetime_date_fromtimestamp_capi,
.DateTime_FromDateAndTimeAndFold = new_datetime_ex2,
.Time_FromTimeAndFold = new_time_ex2,
};

/* Get a new C API by calling this function.
* Clients get at C API via PyDateTime_IMPORT, defined in datetime.h.
*/
static inline PyDateTime_CAPI *
get_datetime_capi(void)
{
datetime_state *st = get_datetime_state();

PyDateTime_CAPI *capi = PyMem_Malloc(sizeof(PyDateTime_CAPI));
if (capi == NULL) {
PyErr_NoMemory();
return NULL;
}
capi->DateType = st->date_type;
capi->DateTimeType = st->datetime_type;
capi->TimeType = st->time_type;
capi->DeltaType = st->delta_type;
capi->TZInfoType = st->tzinfo_type;
capi->Date_FromDate = new_date_ex;
capi->DateTime_FromDateAndTime = new_datetime_ex;
capi->Time_FromTime = new_time_ex;
capi->Delta_FromDelta = new_delta_ex;
capi->TimeZone_FromTimeZone = new_timezone;
capi->DateTime_FromTimestamp = datetime_fromtimestamp;
capi->Date_FromTimestamp = datetime_date_fromtimestamp_capi;
capi->DateTime_FromDateAndTimeAndFold = new_datetime_ex2;
capi->Time_FromTimeAndFold = new_time_ex2;
// Make sure this function is called after utc has
// been initialized.
assert(st->utc != NULL);
capi->TimeZone_UTC = st->utc; // borrowed ref
return capi;
}

static void
datetime_destructor(PyObject *op)
{
void *ptr = PyCapsule_GetPointer(op, PyDateTime_CAPSULE_NAME);
PyMem_Free(ptr);
return &capi;
}

static int
Expand Down Expand Up @@ -7007,8 +7000,7 @@ _datetime_exec(PyObject *module)
if (capi == NULL) {
goto error;
}
PyObject *capsule = PyCapsule_New(capi, PyDateTime_CAPSULE_NAME,
datetime_destructor);
PyObject *capsule = PyCapsule_New(capi, PyDateTime_CAPSULE_NAME, NULL);
if (capsule == NULL) {
PyMem_Free(capi);
goto error;
Expand Down