tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/tools/parallel_handler.rs: cleanup check_abort code

This commit is contained in:
Dietmar Maurer 2020-10-01 14:37:29 +02:00
parent da6e67b321
commit 0a8f3ae0b3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tools/parallel_handler.rs
View File

@ -11,7 +11,7 @@ pub struct SendHandle<I> {
} }
/// Returns the first error happened, if any /// Returns the first error happened, if any
pub fn check_abort(abort: Arc<Mutex<Option<String>>>) -> Result<(), Error> { pub fn check_abort(abort: &Mutex<Option<String>>) -> Result<(), Error> {
let guard = abort.lock().unwrap(); let guard = abort.lock().unwrap();
if let Some(err_msg) = &*guard { if let Some(err_msg) = &*guard {
return Err(format_err!("{}", err_msg)); return Err(format_err!("{}", err_msg));
@ -22,7 +22,7 @@ pub fn check_abort(abort: Arc<Mutex<Option<String>>>) -> Result<(), Error> {
impl<I: Send> SendHandle<I> { impl<I: Send> SendHandle<I> {
/// Send data to the worker threads /// Send data to the worker threads
pub fn send(&self, input: I) -> Result<(), Error> { pub fn send(&self, input: I) -> Result<(), Error> {
check_abort(Arc::clone(&self.abort))?; check_abort(&self.abort)?;
match self.input.send(input) { match self.input.send(input) {
Ok(()) => Ok(()), Ok(()) => Ok(()),
Err(_) => bail!("send failed - channel closed"), Err(_) => bail!("send failed - channel closed"),
@ -123,14 +123,15 @@ impl<'a, I: Send + 'static> ParallelHandler<'a, I> {
pub fn complete(mut self) -> Result<(), Error> { pub fn complete(mut self) -> Result<(), Error> {
let input = self.input.take().unwrap(); let input = self.input.take().unwrap();
let abort = Arc::clone(&input.abort); let abort = Arc::clone(&input.abort);
check_abort(Arc::clone(&abort))?; check_abort(&abort)?;
drop(input); drop(input);
let msg_list = self.join_threads(); let msg_list = self.join_threads();
// an error might be encountered while waiting for the join
check_abort(&abort)?;
if msg_list.is_empty() { if msg_list.is_empty() {
// an error might be encountered while waiting for the join
check_abort(abort)?;
return Ok(()); return Ok(());
} }
Err(format_err!("{}", msg_list.join("\n"))) Err(format_err!("{}", msg_list.join("\n")))