From 4bb4d5d0152fac4e5b683f9513644e10e1bf1062 Mon Sep 17 00:00:00 2001 From: Mark Hammond Date: Wed, 1 Sep 2004 22:31:23 +0000 Subject: [PATCH] Backport [ 1010677 ] thread Module Breaks PyGILState_Ensure() to the 2.3 maint branch. --- Lib/test/test_capi.py | 3 +++ Modules/threadmodule.c | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py index 82bded41cfcb..95ec060a3ad2 100644 --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -43,3 +43,6 @@ except AttributeError: if have_thread_state: TestThreadState() + import threading + t = threading.Thread(target=TestThreadState) + t.start() diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c index 24a32ae32527..ae79f2439919 100644 --- a/Modules/threadmodule.c +++ b/Modules/threadmodule.c @@ -172,11 +172,10 @@ static void t_bootstrap(void *boot_raw) { struct bootstate *boot = (struct bootstate *) boot_raw; - PyThreadState *tstate; + PyGILState_STATE gstate; PyObject *res; - tstate = PyThreadState_New(boot->interp); - PyEval_AcquireThread(tstate); + gstate = PyGILState_Ensure(); res = PyEval_CallObjectWithKeywords( boot->func, boot->args, boot->keyw); if (res == NULL) { @@ -201,8 +200,7 @@ t_bootstrap(void *boot_raw) Py_DECREF(boot->args); Py_XDECREF(boot->keyw); PyMem_DEL(boot_raw); - PyThreadState_Clear(tstate); - PyThreadState_DeleteCurrent(); + PyGILState_Release(gstate); PyThread_exit_thread(); } -- 2.47.3