Skip to content

gh-117398: datetime: Access C-API via PyInterpreterState #118357

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 24 commits into from
Closed

gh-117398: datetime: Access C-API via PyInterpreterState #118357

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4c1325e
set capi-struct pointer to interp state
neonene Apr 27, 2024
fecd192
globals-to-fix.tsv
neonene Apr 27, 2024
2bdf01c
make exit code individual
neonene Apr 28, 2024
bead431
fix gil-disabled test
neonene Apr 28, 2024
d361ee4
add an assertion in datetime_destructor()
neonene Apr 29, 2024
3b721bc
fix assert()
neonene Apr 29, 2024
53b0219
add a struct for internal use
neonene Apr 29, 2024
7333d39
Merge branch 'main' into capsule2
neonene Apr 29, 2024
8b10d70
try hiding internal info
neonene Apr 30, 2024
fb0f5ef
apply suggested changes
neonene Apr 30, 2024
7de45ac
ignored.tsv
neonene Apr 30, 2024
98564cf
Merge branch 'main' into capsule2
neonene Apr 30, 2024
f412c55
globals-to-fix.tsv
neonene Apr 30, 2024
c00ed1f
globals-to-fix.tsv
neonene Apr 30, 2024
e4986f5
ignored.tsv again
neonene Apr 30, 2024
39e17c7
run main interp twice in test
neonene Apr 30, 2024
7aa369e
add a comment to a test
neonene Apr 30, 2024
0769c96
add an internal capsule
neonene May 1, 2024
de31431
remove typedef
neonene May 1, 2024
c814186
Merge branch 'main' into capsule2
neonene May 1, 2024
92d4205
Merge branch 'main' into capsule2
neonene May 4, 2024
8dadc49
add Py_MOD_GIL_NOT_USED to the test
neonene May 5, 2024
6527a3b
Merge branch 'main' into capsule2
neonene May 5, 2024
ca89e9b
Merge branch 'main' into capsule2
neonene May 8, 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
apply suggested changes
  • Loading branch information
@neonene
neonene committed Apr 30, 2024
commit fb0f5efdf95cf56b288ce70bfddac18addf22fda
2 changes: 1 addition & 1 deletion Lib/test/test_capi/test_misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2294,7 +2294,7 @@ def test_datetime_capi_client(self):
module = importlib.util.module_from_spec(spec)
spec.loader.exec_module(module)
""")
exec(script)
exec(script) # run main interp first
ret = support.run_in_subinterp(script)
self.assertEqual(ret, 0)

Expand Down
2 changes: 1 addition & 1 deletion Modules/_datetimemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ _PyDateTimeAPI_Import(void)
if (capi) {
// PyInit__datetime() is not called when the module is already loaded
// with single-phase init.
set_datetime_capi_by_interp((PyDateTime_CAPI *)capi);
set_datetime_capi_by_interp(capi);
}
}

Expand Down
49 changes: 46 additions & 3 deletions Modules/_testmultiphase.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,16 +956,59 @@ PyInit__test_shared_gil_only(void)

#include "datetime.h"

static int
datetime_capi_import_with_error(void)
{
static int multiphase = -1;
int ismain = PyInterpreterState_Get() == PyInterpreterState_Main();
if (ismain) {
PyObject *module = PyImport_ImportModule("_datetime");
if (module == NULL) {
return -1;
}
PyModuleDef *def = PyModule_GetDef(module);
Py_DECREF(module);
if (def && def->m_size >= 0) {
multiphase = 1;
}
else {
multiphase = 0;
}
}
if (multiphase < 0) {
PyErr_SetString(PyExc_AssertionError,
"Main interpreter must be loaded first.");
return -1;
}

_PyDateTimeAPI_Import();
if (!PyErr_Occurred()) {
return 0;
}
#ifdef Py_GIL_DISABLED
if (!ismain && !multiphase) {
PyErr_WriteUnraisable(NULL);
return 0;
}
#endif
return -1;
}

static int
datetime_capi_client_exec(PyObject *m)
{
_PyDateTimeAPI_Clear();
if (PyDateTimeAPI != NULL) {
if (_PyDateTimeAPI_Get() != NULL) {
PyErr_SetString(PyExc_AssertionError,
"DateTime API is expected to remain NULL.");
return -1;
}
if (datetime_capi_import_with_error() < 0) {
return -1;
}
PyDateTime_IMPORT;
PyErr_Clear();
if (PyDateTimeAPI != PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0)) {
PyErr_SetString(PyExc_AssertionError,
"DateTime API does not match Capsule CAPI.");
return -1;
}
PyErr_Clear();
Expand Down