zaphar/runwhen
1
0
Fork 0
mirror of https://github.com/zaphar/runwhen.git synced 2025-07-23 20:49:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get the poll timing correct again.

Browse Source
This commit is contained in:
Jeremy Wall 2023-08-17 18:58:09 -04:00
parent a7caf8a1c8
commit 2f0ea778b6
1 changed files with 16 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/file.rs
View File

@ -71,55 +71,37 @@ fn watch_for_change_events(
println!("Spawning command"); println!("Spawning command");
exec.spawn().expect("Failed to start command"); exec.spawn().expect("Failed to start command");
println!("Starting watch loop"); println!("Starting watch loop");
let mut poll_time = Instant::now(); run_loop_step(&mut exec);
let mut changed = false;
println!("Waiting for first change event"); println!("Waiting for first change event");
let _ = ch.recv().expect("Channel was closed!!!"); if let Some(poll) = poll {
loop { let mut poll_time = Instant::now();
// Wait our requisit number of seconds loop {
if let Some(poll) = poll { let _ = ch.recv().expect("Channel was closed!!!");
println!("We have a poll time {:?}", poll); let elapsed = Instant::now().duration_since(poll_time);
// If our time has passed and the value has changed then run our step immediately poll_time = Instant::now();
if changed && Instant::now().duration_since(poll_time) >= poll { if elapsed >= poll {
println!( run_loop_step(&mut exec);
"Recieved changed event and waited: {:?}",
Instant::now().duration_since(poll_time)
);
if !run_loop_step(&mut exec) {
println!("Failed to start command");
}
changed = false;
continue; continue;
} }
println!("Waiting for next change event");
let _ = ch.recv().expect("Channel was closed!!!");
changed = true;
poll_time = Instant::now();
continue;
} else {
println!("We do not have a poll time");
println!("Waiting for next change event");
let _ = ch.recv().expect("Channel was closed!!!");
if !run_loop_step(&mut exec) {
println!("Failed to start command");
}
} }
poll_time = Instant::now(); } else {
changed = false; loop {
let _ = ch.recv().expect("Channel was closed!!!");
run_loop_step(&mut exec);
}
} }
} }
fn run_loop_step(exec: &mut CancelableProcess) -> bool { fn run_loop_step(exec: &mut CancelableProcess) {
// We always want to check on our process each iteration of the loop. // We always want to check on our process each iteration of the loop.
// set signal to false so we won't trigger on the // set signal to false so we won't trigger on the
// next loop iteration unless we recieved more events. // next loop iteration unless we recieved more events.
// On a true signal we want to start or restart our process. // On a true signal we want to start or restart our process.
println!("Restarting process"); println!("Restarting process");
if let Err(err) = exec.reset() { if let Err(err) = exec.reset() {
println!("Failed to start command");
println!("{:?}", err); println!("{:?}", err);
return false;
} }
return true;
} }
fn wait_for_fs_events( fn wait_for_fs_events(
@ -146,8 +128,6 @@ fn wait_for_fs_events(
if let Some(exclude) = excluded { if let Some(exclude) = excluded {
for ef in exclude.iter() { for ef in exclude.iter() {
patterns.push(glob::Pattern::new(*ef).expect("Invalid path pattern")); patterns.push(glob::Pattern::new(*ef).expect("Invalid path pattern"));
//patterns.push(ef.clone());
println!("Added pattern {:?}", patterns.iter().last());
} }
} }
loop { loop {
@ -156,9 +136,7 @@ fn wait_for_fs_events(
// TODO(jwall): Filter this based on the exclude pattern // TODO(jwall): Filter this based on the exclude pattern
if let Some(f) = crate::events::get_file(&event) { if let Some(f) = crate::events::get_file(&event) {
for pat in patterns.iter() { for pat in patterns.iter() {
println!("Testing pattern {:?} against {:?}", pat, f);
if pat.matches_path(&f) { if pat.matches_path(&f) {
println!("Excluding: {:?}", f);
continue; continue;
} }
} }