mirrors/coreutils
1
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2025-12-23 08:47:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tail: batch inotify events to prevent redundant headers after SIGSTOP/SIGCONT

Browse source 
Hopefully will fix the intermittent tests/tail/overlay-headers
This commit is contained in:
Sylvestre Ledru 2025-12-05 22:57:23 +01:00
parent 443c2014fb
commit 627a0bf2d0
1 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/uu/tail/src/follow/watch.rs
View file

@ -548,13 +548,37 @@ pub fn follow(mut observer: Observer, settings: &Settings) -> UResult<()> {
}
let mut paths = vec![]; // Paths worth checking for new content to print
// Helper closure to process a single event
let process_event = |observer: &mut Observer,
event: notify::Event,
settings: &Settings,
paths: &mut Vec<PathBuf>|
-> UResult<()> {
if let Some(event_path) = event.paths.first() {
if observer.files.contains_key(event_path) {
// Handle Event if it is about a path that we are monitoring
let new_paths = observer.handle_event(&event, settings)?;
for p in new_paths {
if !paths.contains(&p) {
paths.push(p);
}
}
}
}
Ok(())
};
match rx_result {
Ok(Ok(event)) => {
if let Some(event_path) = event.paths.first() {
if observer.files.contains_key(event_path) {
// Handle Event if it is about a path that we are monitoring
paths = observer.handle_event(&event, settings)?;
}
process_event(&mut observer, event, settings, &mut paths)?;
// Drain any additional pending events to batch them together.
// This prevents redundant headers when multiple inotify events
// are queued (e.g., after resuming from SIGSTOP).
while let Ok(Ok(event)) = observer.watcher_rx.as_mut().unwrap().receiver.try_recv()
{
process_event(&mut observer, event, settings, &mut paths)?;
}
}
Ok(Err(notify::Error {