Skip to content

Use parking_lot in faulthandler #6438

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
youknowone merged 1 commit into from
Dec 15, 2025
Merged

Use parking_lot in faulthandler #6438

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: 12 additions & 12 deletions crates/stdlib/src/faulthandler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ mod decl {
PyObjectRef, PyResult, VirtualMachine, builtins::PyFloat, frame::Frame,
function::OptionalArg, py_io::Write,
};
use parking_lot::{Condvar, Mutex};
#[cfg(any(unix, windows))]
use rustpython_common::os::{get_errno, set_errno};
use std::sync::Arc;
use std::sync::atomic::{AtomicBool, AtomicI32, Ordering};
use std::sync::{Arc, Condvar, Mutex};
use std::thread;
use std::time::Duration;

Expand Down Expand Up @@ -692,13 +693,12 @@ mod decl {

loop {
// Hold lock across wait_timeout to avoid race condition
let mut guard = lock.lock().unwrap();
let mut guard = lock.lock();
if guard.cancel {
return;
}
let timeout = Duration::from_micros(guard.timeout_us);
let result = cvar.wait_timeout(guard, timeout).unwrap();
guard = result.0;
cvar.wait_for(&mut guard, timeout);

// Check if cancelled after wait
if guard.cancel {
Expand Down Expand Up @@ -818,7 +818,7 @@ mod decl {

// Store the state
{
let mut watchdog = WATCHDOG.lock().unwrap();
let mut watchdog = WATCHDOG.lock();
*watchdog = Some(Arc::clone(&state));
}

Expand All @@ -833,14 +833,14 @@ mod decl {
#[pyfunction]
fn cancel_dump_traceback_later() {
let state = {
let mut watchdog = WATCHDOG.lock().unwrap();
let mut watchdog = WATCHDOG.lock();
watchdog.take()
};

if let Some(state) = state {
let (lock, cvar) = &*state;
{
let mut guard = lock.lock().unwrap();
let mut guard = lock.lock();
guard.cancel = true;
}
cvar.notify_all();
Expand All @@ -849,7 +849,7 @@ mod decl {

#[cfg(unix)]
mod user_signals {
use std::sync::Mutex;
use parking_lot::Mutex;

const NSIG: usize = 64;

Expand Down Expand Up @@ -878,12 +878,12 @@ mod decl {
static USER_SIGNALS: Mutex<Option<Vec<UserSignal>>> = Mutex::new(None);

pub fn get_user_signal(signum: usize) -> Option<UserSignal> {
let guard = USER_SIGNALS.lock().unwrap();
let guard = USER_SIGNALS.lock();
guard.as_ref().and_then(|v| v.get(signum).cloned())
}

pub fn set_user_signal(signum: usize, signal: UserSignal) {
let mut guard = USER_SIGNALS.lock().unwrap();
let mut guard = USER_SIGNALS.lock();
if guard.is_none() {
*guard = Some(vec![UserSignal::default(); NSIG]);
}
Expand All @@ -895,7 +895,7 @@ mod decl {
}

pub fn clear_user_signal(signum: usize) -> Option<UserSignal> {
let mut guard = USER_SIGNALS.lock().unwrap();
let mut guard = USER_SIGNALS.lock();
if let Some(ref mut v) = *guard
&& signum < v.len()
&& v[signum].enabled
Expand All @@ -908,7 +908,7 @@ mod decl {
}

pub fn is_enabled(signum: usize) -> bool {
let guard = USER_SIGNALS.lock().unwrap();
let guard = USER_SIGNALS.lock();
guard
.as_ref()
.and_then(|v| v.get(signum))
Expand Down
Loading