Skip to content

gh-59956: Add a Test to Verify GILState Matches the "Current" Thread State #101625

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
ericsnowcurrently merged 1 commit into from
Feb 6, 2023
+40 −0
Merged

gh-59956: Add a Test to Verify GILState Matches the "Current" Thread State #101625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions Lib/test/test_capi/test_misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,6 +1413,9 @@ def callback():
ret = assert_python_ok('-X', 'tracemalloc', '-c', code)
self.assertIn(b'callback called', ret.out)

def test_gilstate_matches_current(self):
_testcapi.test_current_tstate_matches()


class Test_testcapi(unittest.TestCase):
locals().update((name, getattr(_testcapi, name))
Expand Down
37 changes: 37 additions & 0 deletions Modules/_testcapimodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1534,6 +1534,42 @@ crash_no_current_thread(PyObject *self, PyObject *Py_UNUSED(ignored))
return NULL;
}

/* Test that the GILState thread and the "current" thread match. */
static PyObject *
test_current_tstate_matches(PyObject *self, PyObject *Py_UNUSED(ignored))
{
PyThreadState *orig_tstate = PyThreadState_Get();

if (orig_tstate != PyGILState_GetThisThreadState()) {
PyErr_SetString(PyExc_RuntimeError,
"current thread state doesn't match GILState");
return NULL;
}

const char *err = NULL;
PyThreadState_Swap(NULL);
PyThreadState *substate = Py_NewInterpreter();

if (substate != PyThreadState_Get()) {
err = "subinterpreter thread state not current";
goto finally;
}
if (substate != PyGILState_GetThisThreadState()) {
err = "subinterpreter thread state doesn't match GILState";
goto finally;
}

finally:
Py_EndInterpreter(substate);
PyThreadState_Swap(orig_tstate);

if (err != NULL) {
PyErr_SetString(PyExc_RuntimeError, err);
return NULL;
}
Py_RETURN_NONE;
}

/* To run some code in a sub-interpreter. */
static PyObject *
run_in_subinterp(PyObject *self, PyObject *args)
Expand Down Expand Up @@ -3354,6 +3390,7 @@ static PyMethodDef TestMethods[] = {
{"make_memoryview_from_NULL_pointer", make_memoryview_from_NULL_pointer,
METH_NOARGS},
{"crash_no_current_thread", crash_no_current_thread, METH_NOARGS},
{"test_current_tstate_matches", test_current_tstate_matches, METH_NOARGS},
{"run_in_subinterp", run_in_subinterp, METH_VARARGS},
{"run_in_subinterp_with_config",
_PyCFunction_CAST(run_in_subinterp_with_config),
Expand Down