From c03309ac53d4f84caaf644a2740abbb20a337be4 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Thu, 19 Mar 2020 12:57:35 +0100 Subject: [PATCH] some cleanups --- src/poll.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/poll.rs b/src/poll.rs index cc2c78a4..c7cf29da 100644 --- a/src/poll.rs +++ b/src/poll.rs @@ -30,16 +30,16 @@ pub fn start_polling_thread() -> Receiver> { let mut batch = Vec::new(); loop { - let timeout = if batch.len() > 0 { - MIN_POLL_DURATION - } else { + let timeout = if batch.is_empty() { MAX_POLL_DURATION + } else { + MIN_POLL_DURATION }; if let Some(e) = poll(timeout) { batch.push(QueueEvent::Event(e)); } - if batch.len() > 0 + if !batch.is_empty() && last_send.elapsed() > MAX_BATCHING_DURATION { tx1.send(batch).unwrap(); @@ -60,7 +60,6 @@ pub fn start_polling_thread() -> Receiver> { /// fn poll(dur: Duration) -> Option { if event::poll(dur).unwrap() { - // It's guaranteed that read() wont block if `poll` returns `Ok(true)` let event = event::read().unwrap(); Some(event) } else {