Expose unsafe wrappers for Py_BEGIN_CRITICAL_SECTION_MUTEX API #5642

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.

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

ngoldbaum merged 32 commits into PyO3:main from ngoldbaum:critical-section-mutex-2

Dec 12, 2025

newsfragments/5642.added.md

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		added FFI definitions and an unsafe Rust API wrapping `Py_BEGIN_CRITICAL_SECTION_MUTEX` and `Py_BEGIN_CRITICAL_SECTION_MUTEX2`.

newsfragments/5642.changed.md

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		The `with_critical_section` and `with_critical_section2` functions are now available in `pyo3::sync::critical_section`. Aliases that generate deprecation warnings are available in `pyo3::sync`.

pyo3-ffi/src/cpython/critical_section.rs

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    #[cfg(Py_GIL_DISABLED)]
+    #[cfg(any(Py_3_14, Py_GIL_DISABLED))]
     use crate::PyMutex;
     use crate::PyObject;
@@ Expand All / @@ -24,7 +24,15 @@ opaque_struct!(pub PyCriticalSection2); @@
     extern "C" {
         pub fn PyCriticalSection_Begin(c: *mut PyCriticalSection, op: *mut PyObject);
+        #[cfg(Py_3_14)]
+        pub fn PyCriticalSection_BeginMutex(c: *mut PyCriticalSection, m: *mut PyMutex);
         pub fn PyCriticalSection_End(c: *mut PyCriticalSection);
         pub fn PyCriticalSection2_Begin(c: *mut PyCriticalSection2, a: *mut PyObject, b: *mut PyObject);
+        #[cfg(Py_3_14)]
+        pub fn PyCriticalSection2_BeginMutex(
+            c: *mut PyCriticalSection2,
+            m1: *mut PyMutex,
+            m2: *mut PyMutex,
+        );
         pub fn PyCriticalSection2_End(c: *mut PyCriticalSection2);
     }

src/conversions/std/num.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -342,10 +342,12 @@ impl BytesSequenceExtractor<'_, '_> { @@
             match self {
                 BytesSequenceExtractor::Bytes(b) => copy_slice(b.as_bytes()),
-                BytesSequenceExtractor::ByteArray(b) => crate::sync::with_critical_section(b, || {
-                    // Safety: b is protected by a critical section
-                    copy_slice(unsafe { b.as_bytes() })
-                }),
+                BytesSequenceExtractor::ByteArray(b) => {
+                    crate::sync::critical_section::with_critical_section(b, || {
+                        // Safety: b is protected by a critical section
+                        copy_slice(unsafe { b.as_bytes() })
+                    })
+                }
             }
         }
     }
@@ Expand Down @@

Provide feedback