From 41586cd520a4addd7f7a6f9bef35a2e887699da0 Mon Sep 17 00:00:00 2001 From: Sam Gross Date: Thu, 9 Nov 2023 18:37:11 -0500 Subject: [PATCH] gh-111569: Fix critical sections test on WebAssembly (GH-111897) This adds a macro `Py_CAN_START_THREADS` that corresponds to the Python function `test.support.threading_helper.can_start_thread()`. WASI and some Emscripten builds do not have a working pthread implementation. This macro is used to guard the critical sections C API tests that require a working threads implementation. --- Include/pyport.h | 8 ++++++++ Modules/_testinternalcapi/test_critical_sections.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/Include/pyport.h b/Include/pyport.h index d30fcd7f6cb7da8..abb526d503fddd7 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -470,6 +470,14 @@ extern "C" { # define WITH_THREAD #endif +/* Some WebAssembly platforms do not provide a working pthread implementation. + * Thread support is stubbed and any attempt to create a new thread fails. + */ +#if (!defined(HAVE_PTHREAD_STUBS) && \ + (!defined(__EMSCRIPTEN__) || defined(__EMSCRIPTEN_PTHREADS__))) +# define Py_CAN_START_THREADS 1 +#endif + #ifdef WITH_THREAD # ifdef Py_BUILD_CORE # ifdef HAVE_THREAD_LOCAL diff --git a/Modules/_testinternalcapi/test_critical_sections.c b/Modules/_testinternalcapi/test_critical_sections.c index 238f29c3c62e643..9392096a16d1bf4 100644 --- a/Modules/_testinternalcapi/test_critical_sections.c +++ b/Modules/_testinternalcapi/test_critical_sections.c @@ -170,6 +170,7 @@ thread_critical_sections(void *arg) } } +#ifdef Py_CAN_START_THREADS static PyObject * test_critical_sections_threads(PyObject *self, PyObject *Py_UNUSED(args)) { @@ -194,12 +195,15 @@ test_critical_sections_threads(PyObject *self, PyObject *Py_UNUSED(args)) Py_DECREF(test_data.obj1); Py_RETURN_NONE; } +#endif static PyMethodDef test_methods[] = { {"test_critical_sections", test_critical_sections, METH_NOARGS}, {"test_critical_sections_nest", test_critical_sections_nest, METH_NOARGS}, {"test_critical_sections_suspend", test_critical_sections_suspend, METH_NOARGS}, +#ifdef Py_CAN_START_THREADS {"test_critical_sections_threads", test_critical_sections_threads, METH_NOARGS}, +#endif {NULL, NULL} /* sentinel */ };