Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2025-01-19 00:24:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

tail: implement sub-second sleep interval e.g. -s.1

Browse source
This commit is contained in:
Jan Scheer 2021-09-16 17:14:23 +02:00
parent b1317c589e
commit 1f24b1f59c
No known key found for this signature in database
GPG key ID: C62AD4C29E2B9828
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/uu/tail/src/tail.rs
View file

@ -27,6 +27,7 @@ use std::io::{stdin, stdout, BufRead, BufReader, Read, Seek, SeekFrom, Write};
use std::path::Path; use std::path::Path;
use std::thread::sleep; use std::thread::sleep;
use std::time::Duration; use std::time::Duration;
use uucore::display::Quotable;
use uucore::parse_size::{parse_size, ParseSizeError}; use uucore::parse_size::{parse_size, ParseSizeError};
use uucore::ringbuffer::RingBuffer; use uucore::ringbuffer::RingBuffer;
@ -56,7 +57,7 @@ enum FilterMode {
struct Settings { struct Settings {
mode: FilterMode, mode: FilterMode,
sleep_msec: u32, sleep_sec: Duration,
beginning: bool, beginning: bool,
follow: bool, follow: bool,
pid: platform::Pid, pid: platform::Pid,
@ -66,7 +67,7 @@ impl Default for Settings {
fn default() -> Settings { fn default() -> Settings {
Settings { Settings {
mode: FilterMode::Lines(10, b'\n'), mode: FilterMode::Lines(10, b'\n'),
sleep_msec: 1000, sleep_sec: Duration::from_secs_f32(1.0),
beginning: false, beginning: false,
follow: false, follow: false,
pid: 0, pid: 0,
@ -83,12 +84,11 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
let matches = app.get_matches_from(args); let matches = app.get_matches_from(args);
settings.follow = matches.is_present(options::FOLLOW); settings.follow = matches.is_present(options::FOLLOW);
if settings.follow {
if let Some(n) = matches.value_of(options::SLEEP_INT) { if let Some(s) = matches.value_of(options::SLEEP_INT) {
let parsed: Option<u32> = n.parse().ok(); settings.sleep_sec = match s.parse::<f32>() {
if let Some(m) = parsed { Ok(s) => Duration::from_secs_f32(s),
settings.sleep_msec = m * 1000 Err(_) => crash!(1, "invalid number of seconds: {}", s.quote()),
}
} }
} }
@ -297,7 +297,7 @@ fn follow<T: BufRead>(readers: &mut [(T, &String)], settings: &Settings) {
let mut process = platform::ProcessChecker::new(settings.pid); let mut process = platform::ProcessChecker::new(settings.pid);
loop { loop {
sleep(Duration::new(0, settings.sleep_msec * 1000)); sleep(settings.sleep_sec);
let pid_is_dead = !read_some && settings.pid != 0 && process.is_dead(); let pid_is_dead = !read_some && settings.pid != 0 && process.is_dead();
read_some = false; read_some = false;

10
tests/by-util/test_tail.rs
View file

@ -326,6 +326,16 @@ fn test_negative_indexing() {
#[test] #[test]
fn test_sleep_interval() { fn test_sleep_interval() {
new_ucmd!().arg("-s").arg("10").arg(FOOBAR_TXT).succeeds(); new_ucmd!().arg("-s").arg("10").arg(FOOBAR_TXT).succeeds();
new_ucmd!().arg("-s").arg(".1").arg(FOOBAR_TXT).succeeds();
new_ucmd!().arg("-s.1").arg(FOOBAR_TXT).succeeds();
new_ucmd!().arg("-s").arg("-1").arg(FOOBAR_TXT).fails();
new_ucmd!()
.arg("-s")
.arg("1..1")
.arg(FOOBAR_TXT)
.fails()
.stderr_contains("invalid number of seconds: '1..1'")
.code_is(1);
} }
/// Test for reading all but the first NUM bytes: `tail -c +3`. /// Test for reading all but the first NUM bytes: `tail -c +3`.