extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 02:24:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor 'JobSignal' into Waiter and Completer

Browse Source
This commit is contained in:
Renan Ribeiro
2025-04-21 18:03:16 -03:00
parent 75db02781d
commit d3cbf728f2
3 changed files with 123 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/nu-command/src/experimental/job_spawn.rs
View File

@ -8,7 +8,7 @@ use std::{
use nu_engine::{command_prelude::*, ClosureEvalOnce};
use nu_protocol::{
engine::{Closure, Job, Redirection, ThreadJob, WaitSignal},
engine::{completion_signal, Closure, Job, Redirection, ThreadJob},
report_shell_error, OutDest, Signals,
};
@ -77,10 +77,10 @@ impl Command for JobSpawn {
let jobs = job_state.jobs.clone();
let mut jobs = jobs.lock().expect("jobs lock is poisoned!");
let on_termination = Arc::new(WaitSignal::new());
let (complete, wait) = completion_signal();
let id = {
let thread_job = ThreadJob::new(job_signals, tag, on_termination.clone());
let thread_job = ThreadJob::new(job_signals, tag, wait);
job_state.current_thread_job = Some(thread_job.clone());
jobs.add_job(Job::Thread(thread_job))
};
@ -104,7 +104,7 @@ impl Command for JobSpawn {
Value::error(err, head)
});
on_termination.signal(result_value);
complete.complete(result_value);
{
let mut jobs = job_state.jobs.lock().expect("jobs lock is poisoned!");

6
crates/nu-command/src/experimental/job_wait.rs
View File

@ -60,12 +60,12 @@ impl Command for JobWait {
}
Some(Job::Thread(job)) => {
let on_termination = job.on_termination().clone();
let waiter = job.on_termination().clone();
// .join() blocks so we drop our mutex guard
// .wait() blocks so we drop our mutex guard
drop(jobs);
let result = on_termination.join().clone().with_span(head);
let result = waiter.wait().clone().with_span(head);
Ok(result.into_pipeline_data())
}