Skip to content

gh-137093: Fix race condition in test_embed.test_bpo20891 #137094

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
merged 1 commit into from
Jul 25, 2025
Merged

gh-137093: Fix race condition in test_embed.test_bpo20891 #137094

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
24 changes: 6 additions & 18 deletions Programs/_testembed.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,9 +379,9 @@ static int test_pre_initialization_sys_options(void)


/* 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();
if (!PyGILState_Check()) {
Expand All @@ -390,8 +390,7 @@ static void bpo20891_thread(void *lockp)
}

PyGILState_Release(state);

PyThread_release_lock(lock);
_PyEvent_Notify(event);
}

static int test_bpo20891(void)
Expand All @@ -401,27 +400,16 @@ static int test_bpo20891(void)

/* bpo-20891: Calling PyGILState_Ensure in a non-Python thread must not
crash. */
PyThread_type_lock lock = PyThread_allocate_lock();
if (!lock) {
error("PyThread_allocate_lock failed!");
return 1;
}

PyEvent event = {0};
_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) {
error("PyThread_start_new_thread failed!");
return 1;
}
PyThread_acquire_lock(lock, WAIT_LOCK);

Py_BEGIN_ALLOW_THREADS
/* wait until the thread exit */
PyThread_acquire_lock(lock, WAIT_LOCK);
Py_END_ALLOW_THREADS

PyThread_free_lock(lock);
PyEvent_Wait(&event);

Py_Finalize();

Expand Down
Loading