Review changes

Author: dbcfd

src/handle.rs

@@ -4,6 +4,7 @@ use log::*;
 use pcap_sys::{pcap_fileno, pcap_set_immediate_mode};
 use std::os::raw::c_int;
 use std::path::Path;
+use std::sync::atomic::{AtomicBool, Ordering};
 
 fn compile_bpf(handle: *mut pcap_sys::pcap_t, bpf: &str) -> Result<Bpf, Error> {
     let mut bpf_program = pcap_sys::bpf_program {
@@ -187,7 +188,7 @@ impl PendingHandle {
         let h = Handle {
             handle: self.handle,
             live_capture: self.live_capture,
-            interrupted: std::sync::Arc::new(std::sync::Mutex::new(false)),
+            interrupted: AtomicBool::new(false),
         };
         if self.live_capture {
             if 0 != unsafe { pcap_sys::pcap_activate(h.handle) } {
@@ -226,7 +227,7 @@ impl std::convert::TryFrom<&Config> for PendingHandle {
 pub struct Handle {
     handle: *mut pcap_sys::pcap_t,
     live_capture: bool,
-    interrupted: std::sync::Arc<std::sync::Mutex<bool>>,
+    interrupted: AtomicBool,
 }
 
 unsafe impl Send for Handle {}
@@ -258,28 +259,19 @@ impl Handle {
     }
 
     pub fn interrupted(&self) -> bool {
-        self.interrupted.lock().map(|l| *l).unwrap_or(true)
+        self.interrupted.load(Ordering::Relaxed)
     }
 
     pub fn interrupt(&self) {
-        let interrupted = self
-            .interrupted
-            .lock()
-            .map(|mut l| {
-                *l = true;
-                false
-            })
-            .unwrap_or(true);
+        let interrupted = self.interrupted.swap(true, Ordering::Relaxed);
         if !interrupted {
             unsafe {
                 pcap_sys::pcap_breakloop(self.handle);
             }
         }
     }
 
-    pub fn set_bpf(self, bpf: Bpf) -> Result<Self, Error> {
-        let mut bpf = bpf;
-
+    pub fn set_bpf(self, mut bpf: Bpf) -> Result<Self, Error> {
         let ret_code = unsafe { pcap_sys::pcap_setfilter(self.handle, bpf.inner_mut()) };
         if ret_code != 0 {
             return Err(pcap_util::convert_libpcap_error(self.handle));

src/stream.rs

@@ -247,7 +247,7 @@ mod tests {
 
         assert!(
             stream.is_ok(),
-            format!("Could not build stream {}", stream.err().unwrap())
+            format!("Could not build stream {:?}", stream.err().unwrap())
         );
 
         let mut stream = stream.unwrap();
@@ -272,7 +272,7 @@ mod tests {
 
         assert!(
             stream.is_ok(),
-            format!("Could not build stream {}", stream.err().unwrap())
+            format!("Could not build stream {:?}", stream.err().unwrap())
         );
     }
 }