Skip to content

Commit

Permalink
allow input error to be logged and abort program (#693)
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephan Dilly authored May 9, 2021
1 parent 43d125b commit 423a014
Showing 1 changed file with 40 additions and 28 deletions.
68 changes: 40 additions & 28 deletions src/input.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
use crate::notify_mutex::NotifyableMutex;
use crossbeam_channel::{unbounded, Receiver};
use anyhow::Result;
use crossbeam_channel::{unbounded, Receiver, Sender};
use crossterm::event::{self, Event};
use std::{
process,
sync::{
atomic::{AtomicBool, Ordering},
Arc,
Expand Down Expand Up @@ -44,33 +46,12 @@ impl Input {
let arc_desired = Arc::clone(&desired_state);
let arc_current = Arc::clone(&current_state);

thread::spawn(move || loop {
if arc_desired.get() {
if !arc_current.load(Ordering::Relaxed) {
log::info!("input polling resumed");

tx.send(InputEvent::State(InputState::Polling))
.expect("send state failed");
}
arc_current.store(true, Ordering::Relaxed);

if let Some(e) = Self::poll(POLL_DURATION)
.expect("failed to pull events.")
{
tx.send(InputEvent::Input(e))
.expect("send input failed");
}
} else {
if arc_current.load(Ordering::Relaxed) {
log::info!("input polling suspended");

tx.send(InputEvent::State(InputState::Paused))
.expect("send state failed");
}

arc_current.store(false, Ordering::Relaxed);

arc_desired.wait(true);
thread::spawn(move || {
if let Err(e) =
Self::input_loop(&arc_desired, &arc_current, &tx)
{
log::error!("input thread error: {}", e);
process::abort();
}
});

Expand Down Expand Up @@ -108,4 +89,35 @@ impl Input {
Ok(None)
}
}

fn input_loop(
arc_desired: &Arc<NotifyableMutex<bool>>,
arc_current: &Arc<AtomicBool>,
tx: &Sender<InputEvent>,
) -> Result<()> {
loop {
if arc_desired.get() {
if !arc_current.load(Ordering::Relaxed) {
log::info!("input polling resumed");

tx.send(InputEvent::State(InputState::Polling))?;
}
arc_current.store(true, Ordering::Relaxed);

if let Some(e) = Self::poll(POLL_DURATION)? {
tx.send(InputEvent::Input(e))?;
}
} else {
if arc_current.load(Ordering::Relaxed) {
log::info!("input polling suspended");

tx.send(InputEvent::State(InputState::Paused))?
}

arc_current.store(false, Ordering::Relaxed);

arc_desired.wait(true);
}
}
}
}

0 comments on commit 423a014

Please sign in to comment.