Skip to content

gh-117398: datetime: Make use of C-API capsules for sub-interpreters #117413

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

Closed
neonene wants to merge 16 commits into from
Closed

gh-117398: datetime: Make use of C-API capsules for sub-interpreters #117413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a9dee17
do not cache sub interp capi
neonene Apr 1, 2024
4c9d200
Apply PEP 7
neonene Apr 1, 2024
836f5cf
non-null main on subinterp test
neonene Apr 1, 2024
34f5a6f
don't touch main-ptr during tests
neonene Apr 1, 2024
321ea7d
fix test_datetime_capi()
neonene Apr 1, 2024
39186c2
check if legacy module or not
neonene Apr 1, 2024
b8e545f
try again 836f5cf
neonene Apr 1, 2024
d2de01a
renames
neonene Apr 2, 2024
1f90272
globals-to-fix.tsv
neonene Apr 3, 2024
777fdbb
edit globals-to-fix
neonene Apr 3, 2024
c8c2d43
Merge branch 'main' into capsule
neonene Apr 28, 2024
da769ba
fix gil-disabled test
neonene Apr 28, 2024
fb2145c
use cache instead of interp state
neonene May 1, 2024
511bbf8
Merge branch 'main' into capsule
neonene May 1, 2024
041b1dd
Update globals-to-fix.tsv
neonene May 1, 2024
ab5b968
Merge branch 'main' into capsule
neonene May 4, 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
23 changes: 18 additions & 5 deletions Include/datetime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,18 +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 = NULL;
static PyDateTime_CAPI *
_PyDateTimeAPI_not_ready(void)
{
return NULL;
}
static PyDateTime_CAPI *(*_PyDateTimeAPI_Get)(void) = _PyDateTimeAPI_not_ready;

static inline void
_PyDateTimeAPI_Import(void)
{
void *(*func)(void) = PyCapsule_Import(PyDateTime_INTERNAL_CAPSULE_NAME, 0);
if (func) {
_PyDateTimeAPI_Get = func();
}
}

#define PyDateTime_IMPORT \
PyDateTimeAPI = (PyDateTime_CAPI *)PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0)
#define PyDateTimeAPI _PyDateTimeAPI_Get()
#define PyDateTime_IMPORT _PyDateTimeAPI_Import()

/* Macro for access to the UTC singleton */
#define PyDateTime_TimeZone_UTC PyDateTimeAPI->TimeZone_UTC
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/datetimetester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
17 changes: 17 additions & 0 deletions Lib/test/test_capi/test_misc.py
View file
Open in desktop