https://github.com/python/cpython/commit/4ebd928b0096ca1dd78d5d3e6c787dbc40a43c11 commit: 4ebd928b0096ca1dd78d5d3e6c787dbc40a43c11 branch: 3.14 author: Miss Islington (bot) <[email protected]> committer: hugovk <[email protected]> date: 2025-08-12T17:29:57+03:00 summary:
[3.14] gh-137400: Fix a crash when disabling profiling across all threads (gh-137471) (#137648) Co-authored-by: Sam Gross <[email protected]> files: A Misc/NEWS.d/next/Core_and_Builtins/2025-08-06-15-39-54.gh-issue-137400.xIw0zs.rst M Lib/test/test_free_threading/test_monitoring.py M Python/legacy_tracing.c diff --git a/Lib/test/test_free_threading/test_monitoring.py b/Lib/test/test_free_threading/test_monitoring.py index c3d0a2bcea5c17..9b9fc19364391f 100644 --- a/Lib/test/test_free_threading/test_monitoring.py +++ b/Lib/test/test_free_threading/test_monitoring.py @@ -194,6 +194,40 @@ def during_threads(self): self.set = not self.set +@threading_helper.requires_working_threading() +class SetProfileAllMultiThreaded(TestCase): + def test_profile_all_threads(self): + done = threading.Event() + + def func(): + pass + + def bg_thread(): + while not done.is_set(): + func() + func() + func() + func() + func() + + def my_profile(frame, event, arg): + return None + + bg_threads = [] + for i in range(10): + t = threading.Thread(target=bg_thread) + t.start() + bg_threads.append(t) + + for i in range(100): + threading.setprofile_all_threads(my_profile) + threading.setprofile_all_threads(None) + + done.set() + for t in bg_threads: + t.join() + + class TraceBuf: def __init__(self): self.traces = [] diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-08-06-15-39-54.gh-issue-137400.xIw0zs.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-08-06-15-39-54.gh-issue-137400.xIw0zs.rst new file mode 100644 index 00000000000000..a464cf48948f9a --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2025-08-06-15-39-54.gh-issue-137400.xIw0zs.rst @@ -0,0 +1,4 @@ +Fix a crash in the :term:`free threading` build when disabling profiling or tracing +across all threads with :c:func:`PyEval_SetProfileAllThreads` or +:c:func:`PyEval_SetTraceAllThreads` or their Python equivalents +:func:`threading.settrace_all_threads` and :func:`threading.setprofile_all_threads`. diff --git a/Python/legacy_tracing.c b/Python/legacy_tracing.c index dbd19d7755c237..af225865c4e2e8 100644 --- a/Python/legacy_tracing.c +++ b/Python/legacy_tracing.c @@ -484,13 +484,16 @@ setup_profile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg, PyObject } } + _PyEval_StopTheWorld(tstate->interp); int delta = (func != NULL) - (tstate->c_profilefunc != NULL); tstate->c_profilefunc = func; *old_profileobj = tstate->c_profileobj; tstate->c_profileobj = Py_XNewRef(arg); tstate->interp->sys_profiling_threads += delta; assert(tstate->interp->sys_profiling_threads >= 0); - return tstate->interp->sys_profiling_threads; + Py_ssize_t profiling_threads = tstate->interp->sys_profiling_threads; + _PyEval_StartTheWorld(tstate->interp); + return profiling_threads; } int @@ -581,13 +584,16 @@ setup_tracing(PyThreadState *tstate, Py_tracefunc func, PyObject *arg, PyObject } } + _PyEval_StopTheWorld(tstate->interp); int delta = (func != NULL) - (tstate->c_tracefunc != NULL); tstate->c_tracefunc = func; *old_traceobj = tstate->c_traceobj; tstate->c_traceobj = Py_XNewRef(arg); tstate->interp->sys_tracing_threads += delta; assert(tstate->interp->sys_tracing_threads >= 0); - return tstate->interp->sys_tracing_threads; + Py_ssize_t tracing_threads = tstate->interp->sys_tracing_threads; + _PyEval_StartTheWorld(tstate->interp); + return tracing_threads; } int _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3//lists/python-checkins.python.org Member address: [email protected]
