Add monitoring lock reinit and use raw() accessor

youknowone · youknowone · commit 5446fc586191 · 2026-03-03T22:31:10.000+09:00
Add missing reinit_mutex_after_fork for vm.state.monitoring
PyMutex in reinit_locks_after_fork.

Use Mutex::raw() accessor in reinit_parking_lot_mutex instead
of pointer cast from struct start for layout safety.
diff --git a/crates/vm/src/stdlib/posix.rs b/crates/vm/src/stdlib/posix.rs
@@ -759,6 +759,7 @@ pub mod module {
             reinit_mutex_after_fork(&vm.state.atexit_funcs);
             reinit_mutex_after_fork(&vm.state.global_trace_func);
             reinit_mutex_after_fork(&vm.state.global_profile_func);
+            reinit_mutex_after_fork(&vm.state.monitoring);
 
             // PyGlobalState parking_lot::Mutex locks
             reinit_mutex_after_fork(&vm.state.thread_frames);
diff --git a/crates/vm/src/stdlib/thread.rs b/crates/vm/src/stdlib/thread.rs
@@ -987,8 +987,8 @@ pub(crate) mod _thread {
     #[cfg(unix)]
     fn reinit_parking_lot_mutex<T: ?Sized>(mutex: &parking_lot::Mutex<T>) {
         unsafe {
-            let ptr = mutex as *const parking_lot::Mutex<T> as *mut u8;
-            core::ptr::write_bytes(ptr, 0, core::mem::size_of::<parking_lot::RawMutex>());
+            let raw = mutex.raw() as *const parking_lot::RawMutex as *mut u8;
+            core::ptr::write_bytes(raw, 0, core::mem::size_of::<parking_lot::RawMutex>());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -987,8 +987,8 @@ pub(crate) mod _thread {`
`987`	`987`	`#[cfg(unix)]`
`988`	`988`	`fn reinit_parking_lot_mutex<T: ?Sized>(mutex: &parking_lot::Mutex<T>) {`
`989`	`989`	`unsafe {`
`990`		`- let ptr = mutex as const parking_lot::Mutex<T> as mut u8;`
`991`		`- core::ptr::write_bytes(ptr, 0, core::mem::size_of::<parking_lot::RawMutex>());`
	`990`	`+ let raw = mutex.raw() as const parking_lot::RawMutex as mut u8;`
	`991`	`+ core::ptr::write_bytes(raw, 0, core::mem::size_of::<parking_lot::RawMutex>());`
`992`	`992`	`}`
`993`	`993`	`}`
`994`	`994`