mirror of
https://github.com/nushell/nushell.git
synced 2025-08-18 19:59:16 +02:00
Implemented job wait
This commit adds a `job wait` command so users can wait for the completion of another job. For this, a data structure for joining and signaling job completion was implemented (since the native rust `JoinHandle` cannot be cloned).
This commit is contained in:
@@ -5,7 +5,7 @@ use std::{
|
||||
|
||||
use nu_system::{kill_by_pid, UnfreezeHandle};
|
||||
|
||||
use crate::Signals;
|
||||
use crate::{Signals, Value};
|
||||
|
||||
use crate::JobId;
|
||||
|
||||
@@ -139,14 +139,20 @@ pub struct ThreadJob {
|
||||
signals: Signals,
|
||||
pids: Arc<Mutex<HashSet<u32>>>,
|
||||
tag: Option<String>,
|
||||
on_termination: Arc<WaitSignal<Value>>,
|
||||
}
|
||||
|
||||
impl ThreadJob {
|
||||
pub fn new(signals: Signals, tag: Option<String>) -> Self {
|
||||
pub fn new(
|
||||
signals: Signals,
|
||||
tag: Option<String>,
|
||||
on_termination: Arc<WaitSignal<Value>>,
|
||||
) -> Self {
|
||||
ThreadJob {
|
||||
signals,
|
||||
pids: Arc::new(Mutex::new(HashSet::default())),
|
||||
tag,
|
||||
on_termination,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -194,6 +200,10 @@ impl ThreadJob {
|
||||
|
||||
pids.remove(&pid);
|
||||
}
|
||||
|
||||
pub fn on_termination(&self) -> &Arc<WaitSignal<Value>> {
|
||||
return &self.on_termination;
|
||||
}
|
||||
}
|
||||
|
||||
impl Job {
|
||||
@@ -238,3 +248,202 @@ impl FrozenJob {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
use std::sync::OnceLock;
|
||||
|
||||
/// A synchronization primitive that allows multiple threads to wait for a single event to occur.
|
||||
///
|
||||
/// Threads that call the [`join`] method will block until the [`signal`] method is called.
|
||||
/// Once [`signal`] is called, all currently waiting threads will be woken up and will return from their `join` calls.
|
||||
/// Subsequent calls to [`join`] will not block and will return immediately.
|
||||
///
|
||||
/// The [`was_signaled`] method can be used to check if the signal has been emitted without blocking.
|
||||
pub struct WaitSignal<T> {
|
||||
mutex: std::sync::Mutex<bool>,
|
||||
value: std::sync::OnceLock<T>,
|
||||
var: std::sync::Condvar,
|
||||
}
|
||||
|
||||
impl<T> WaitSignal<T> {
|
||||
/// Creates a new `WaitSignal` in an unsignaled state.
|
||||
///
|
||||
/// No threads will be woken up initially.
|
||||
pub fn new() -> Self {
|
||||
WaitSignal {
|
||||
mutex: std::sync::Mutex::new(false),
|
||||
value: OnceLock::new(),
|
||||
var: std::sync::Condvar::new(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Blocks the current thread until this `WaitSignal` is signaled.
|
||||
///
|
||||
/// If the signal has already been emitted, this method returns immediately.
|
||||
///
|
||||
/// # Panics
|
||||
///
|
||||
/// This method will panic if the underlying mutex is poisoned. This can happen if another
|
||||
/// thread holding the mutex panics.
|
||||
pub fn join(&self) -> &T {
|
||||
let mut guard = self.mutex.lock().expect("mutex is poisoned!");
|
||||
|
||||
while !*guard {
|
||||
match self.var.wait(guard) {
|
||||
Ok(it) => guard = it,
|
||||
Err(_) => panic!("mutex is poisoned!"),
|
||||
}
|
||||
}
|
||||
|
||||
return self.value.get().unwrap();
|
||||
}
|
||||
|
||||
/// Signals all threads currently waiting on this `WaitSignal`.
|
||||
///
|
||||
/// This method sets the internal state to "signaled" and wakes up all threads that are blocked
|
||||
/// in the [`join`] method. Subsequent calls to [`join`] from any thread will return immediately.
|
||||
/// This operation has no effect if the signal has already been emitted.
|
||||
pub fn signal(&self, value: T) {
|
||||
let mut guard = self.mutex.lock().expect("mutex is poisoned!");
|
||||
|
||||
*guard = true;
|
||||
let _ = self.value.set(value);
|
||||
|
||||
self.var.notify_all();
|
||||
}
|
||||
|
||||
/// Checks if this `WaitSignal` has been signaled.
|
||||
///
|
||||
/// This method returns `true` if the [`signal`] method has been called at least once,
|
||||
/// and `false` otherwise. This method does not block the current thread.
|
||||
///
|
||||
/// # Panics
|
||||
///
|
||||
/// This method will panic if the underlying mutex is poisoned. This can happen if another
|
||||
/// thread holding the mutex panics.
|
||||
pub fn was_signaled(&self) -> bool {
|
||||
let guard = self.mutex.lock().expect("mutex is poisoned!");
|
||||
|
||||
*guard
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: move to testing directory
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
|
||||
use std::{
|
||||
sync::{mpsc, Arc},
|
||||
thread::{self, sleep},
|
||||
time::Duration,
|
||||
};
|
||||
|
||||
use pretty_assertions::assert_eq;
|
||||
|
||||
use crate::engine::jobs::WaitSignal;
|
||||
|
||||
fn run_with_timeout<F>(duration: Duration, lambda: F)
|
||||
where
|
||||
F: FnOnce() + Send + 'static,
|
||||
{
|
||||
let (send, recv) = std::sync::mpsc::channel();
|
||||
|
||||
let send_ = send.clone();
|
||||
|
||||
thread::spawn(move || {
|
||||
lambda();
|
||||
|
||||
let send = send_;
|
||||
|
||||
send.send(true).expect("send failed");
|
||||
});
|
||||
|
||||
thread::spawn(move || {
|
||||
thread::sleep(duration);
|
||||
|
||||
send.send(false).expect("send failed");
|
||||
});
|
||||
|
||||
let result = recv.recv().expect("recv failed!");
|
||||
|
||||
assert!(result == true, "timeout!");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn join_returns_when_signaled_from_another_thread() {
|
||||
run_with_timeout(Duration::from_secs(1), || {
|
||||
let signal = Arc::new(WaitSignal::new());
|
||||
|
||||
let thread_signal = signal.clone();
|
||||
|
||||
thread::spawn(move || {
|
||||
sleep(Duration::from_millis(200));
|
||||
assert!(!thread_signal.was_signaled());
|
||||
thread_signal.signal(123);
|
||||
});
|
||||
|
||||
let result = signal.join();
|
||||
|
||||
assert!(signal.was_signaled());
|
||||
|
||||
assert_eq!(*result, 123);
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn join_works_from_multiple_threads() {
|
||||
run_with_timeout(Duration::from_secs(1), || {
|
||||
let signal = Arc::new(WaitSignal::new());
|
||||
|
||||
let (send, recv) = mpsc::channel();
|
||||
|
||||
let thread_count = 4;
|
||||
|
||||
for _ in 0..thread_count {
|
||||
let signal_ = signal.clone();
|
||||
let send_ = send.clone();
|
||||
|
||||
thread::spawn(move || {
|
||||
let value = signal_.join();
|
||||
send_.send(*value).expect("send failed");
|
||||
});
|
||||
}
|
||||
|
||||
signal.signal(321);
|
||||
|
||||
for _ in 0..thread_count {
|
||||
let result = recv.recv().expect("recv failed");
|
||||
|
||||
assert_eq!(result, 321);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn was_signaled_returns_false_when_struct_is_initalized() {
|
||||
let signal = Arc::new(WaitSignal::<()>::new());
|
||||
|
||||
assert!(!signal.was_signaled())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn was_signaled_returns_true_when_signal_is_called() {
|
||||
let signal = Arc::new(WaitSignal::new());
|
||||
|
||||
signal.signal(());
|
||||
|
||||
assert!(signal.was_signaled())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn join_returns_when_own_thread_signals() {
|
||||
run_with_timeout(Duration::from_secs(1), || {
|
||||
let signal = Arc::new(WaitSignal::new());
|
||||
|
||||
signal.signal(());
|
||||
|
||||
signal.join();
|
||||
|
||||
assert!(signal.was_signaled())
|
||||
})
|
||||
}
|
||||
}
|
||||
|
@@ -1379,6 +1379,13 @@ On Windows, this would be %USERPROFILE%\AppData\Roaming"#
|
||||
span: Span,
|
||||
},
|
||||
|
||||
#[error("Job {id} is a job of type {kind}")]
|
||||
#[diagnostic(
|
||||
code(nu::shell::os_disabled),
|
||||
help("This operation does not support the given job type")
|
||||
)]
|
||||
UnsupportedJobType { id: usize, span: Span, kind: String },
|
||||
|
||||
#[error(transparent)]
|
||||
#[diagnostic(transparent)]
|
||||
ChainedError(ChainedError),
|
||||
|
Reference in New Issue
Block a user