And another one down

Sebastian Thiel committed 5 years ago

Commit abce75e1 parent 7f9be362 files · +12 −4Browse files

Unified · Split

2 files

 use crate::{data, index::traverse};
-use git_features::{interrupt::is_triggered, parallel, progress::Progress};
+use git_features::{parallel, progress::Progress};
-use std::time::Instant;
+use std::{
+    sync::atomic::{AtomicBool, Ordering},
+    time::Instant,
+};
 fn add_decode_result(lhs: &mut data::decode_entry::Outcome, rhs: data::decode_entry::Outcome) {
     lhs.num_deltas += rhs.num_deltas;
     then: Instant,
     entries_seen: usize,
     stats: traverse::Outcome,
+    should_interrupt: &'a AtomicBool,
     _error: std::marker::PhantomData<E>,
 }
         progress: &'a parking_lot::Mutex<P>,
         pack_data_len_in_bytes: usize,
         check: traverse::SafetyCheck,
+        should_interrupt: &'a AtomicBool,
     ) -> Self {
         let stats = traverse::Outcome {
             pack_size: pack_data_len_in_bytes as u64,
             check,
             then: Instant::now(),
             entries_seen: 0,
+            should_interrupt,
             stats,
             _error: Default::default(),
         }
         add_decode_result(&mut self.stats.average, chunk_total);
         self.progress.lock().set(self.entries_seen);
-        if is_triggered() {
+        if self.should_interrupt.load(Ordering::SeqCst) {
             return Err(Self::Error::Interrupted);
         }
         Ok(())

     parallel::{self, in_parallel_if},
     progress::{self, unit, Progress},
 };
+use std::sync::Arc;
 mod options {
     use crate::index::traverse::SafetyCheck;
             {
                 let pack_progress = progress.add_child("SHA1 of pack");
                 let index_progress = progress.add_child("SHA1 of index");
+                let should_interrupt = Arc::clone(&should_interrupt);
                 move || {
                     let res = self.possibly_verify(pack, check, pack_progress, index_progress, should_interrupt);
                     if res.is_err() {
                         }
                         Ok(stats)
                     },
-                    Reducer::from_progress(&reduce_progress, pack.data_len(), check),
+                    Reducer::from_progress(&reduce_progress, pack.data_len(), check, &should_interrupt),
                 )
             },
         );

Keyboard shortcuts