greg/cpython
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

gh-137093: Fix race condition in test_embed.test_bpo20891 (GH-137094)

Browse Source 
Use a `PyEvent` instead of a lock to fix a race on the free-threaded build.
This commit is contained in:
Peter Bierma
2025-07-25 07:33:18 -05:00
committed by GitHub
parent fece15d29f
commit 9b451fb457
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Programs/_testembed.c
View File

@@ -379,9 +379,9 @@ static int test_pre_initialization_sys_options(void)
/* bpo-20891: Avoid race condition when initialising the GIL */ /* bpo-20891: Avoid race condition when initialising the GIL */
static void bpo20891_thread(void *lockp) static void bpo20891_thread(void *eventp)
{ {
PyThread_type_lock lock = *((PyThread_type_lock*)lockp); PyEvent *event = (PyEvent *)eventp;
PyGILState_STATE state = PyGILState_Ensure(); PyGILState_STATE state = PyGILState_Ensure();
if (!PyGILState_Check()) { if (!PyGILState_Check()) {
@@ -390,8 +390,7 @@ static void bpo20891_thread(void *lockp)
} }
PyGILState_Release(state); PyGILState_Release(state);
_PyEvent_Notify(event);
PyThread_release_lock(lock);
} }
static int test_bpo20891(void) static int test_bpo20891(void)
@@ -401,27 +400,16 @@ static int test_bpo20891(void)
/* bpo-20891: Calling PyGILState_Ensure in a non-Python thread must not /* bpo-20891: Calling PyGILState_Ensure in a non-Python thread must not
crash. */ crash. */
PyThread_type_lock lock = PyThread_allocate_lock(); PyEvent event = {0};
if (!lock) {
error("PyThread_allocate_lock failed!");
return 1;
}
_testembed_initialize(); _testembed_initialize();
unsigned long thrd = PyThread_start_new_thread(bpo20891_thread, &lock); unsigned long thrd = PyThread_start_new_thread(bpo20891_thread, &event);
if (thrd == PYTHREAD_INVALID_THREAD_ID) { if (thrd == PYTHREAD_INVALID_THREAD_ID) {
error("PyThread_start_new_thread failed!"); error("PyThread_start_new_thread failed!");
return 1; return 1;
} }
PyThread_acquire_lock(lock, WAIT_LOCK);
Py_BEGIN_ALLOW_THREADS PyEvent_Wait(&event);
/* wait until the thread exit */
PyThread_acquire_lock(lock, WAIT_LOCK);
Py_END_ALLOW_THREADS
PyThread_free_lock(lock);
Py_Finalize(); Py_Finalize();