U::from(self).","","","","",""],"i":[0,1,1,0,1,1,1,1,1,0,0],"f":[0,[[]],[[]],[[1,[2,[0]],3],[[4,[0]]]],[[]],[[]],[[],4],[[],4],[[],5],[[],6],[7,8]],"c":[],"p":[[3,"CsplitOptions"],[3,"Vec"],[8,"BufRead"],[4,"Result"],[3,"TypeId"],[3,"Command"],[8,"Args"],[15,"i32"]]},\
"uu_cut":{"doc":"","t":"FF","n":["uu_app","uumain"],"q":[[0,"uu_cut"]],"d":["",""],"i":[0,0],"f":[[[],1],[2,3]],"c":[],"p":[[3,"Command"],[8,"Args"],[15,"i32"]]},\
"uu_date":{"doc":"","t":"FF","n":["uu_app","uumain"],"q":[[0,"uu_date"]],"d":["",""],"i":[0,0],"f":[[[],1],[2,3]],"c":[],"p":[[3,"Command"],[8,"Args"],[15,"i32"]]},\
-"uu_dd":{"doc":"","t":"FF","n":["uu_app","uumain"],"q":[[0,"uu_dd"]],"d":["",""],"i":[0,0],"f":[[[],1],[2,3]],"c":[],"p":[[3,"Command"],[8,"Args"],[15,"i32"]]},\
+"uu_dd":{"doc":"","t":"DLLLLLLLLLLLLLFFL","n":["Alarm","borrow","borrow_mut","clone","clone_into","fmt","from","get_interval","into","is_triggered","to_owned","try_from","try_into","type_id","uu_app","uumain","with_interval"],"q":[[0,"uu_dd"]],"d":["A timer which triggers on a given interval","","","","","","Returns the argument unchanged.","","Calls U::from(self).","","","","","","","",""],"i":[0,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,1],"f":[0,[[]],[[]],[1,1],[[]],[[1,2],3],[[]],[1,4],[[]],[1,5],[[]],[[],6],[[],6],[[],7],[[],8],[9,10],[4,1]],"c":[],"p":[[3,"Alarm"],[3,"Formatter"],[6,"Result"],[3,"Duration"],[15,"bool"],[4,"Result"],[3,"TypeId"],[3,"Command"],[8,"Args"],[15,"i32"]]},\
"uu_df":{"doc":"","t":"FF","n":["uu_app","uumain"],"q":[[0,"uu_df"]],"d":["",""],"i":[0,0],"f":[[[],1],[2,3]],"c":[],"p":[[3,"Command"],[8,"Args"],[15,"i32"]]},\
"uu_dir":{"doc":"","t":"FF","n":["uu_app","uumain"],"q":[[0,"uu_dir"]],"d":["",""],"i":[0,0],"f":[[[],1],[2,3]],"c":[],"p":[[3,"Command"],[8,"Args"],[15,"i32"]]},\
"uu_dircolors":{"doc":"","t":"NNENINLLLLKLFLKKLLLFF","n":["CShell","Display","OutputFmt","Shell","StrUtils","Unknown","borrow","borrow_mut","eq","fmt","fnmatch","from","guess_syntax","into","purify","split_two","try_from","try_into","type_id","uu_app","uumain"],"q":[[0,"uu_dircolors"]],"d":["","","","","","","","","","","","Returns the argument unchanged.","","Calls U::from(self).","Remove comments and trim whitespace","Like split_whitespace() but only produce 2 components","","","","",""],"i":[1,1,0,1,0,1,1,1,1,1,11,1,0,1,11,11,1,1,1,0,0],"f":[0,0,0,0,0,0,[[]],[[]],[[1,1],2],[[1,3],4],[5,2],[[]],[[],1],[[]],[[]],[[]],[[],6],[[],6],[[],7],[[],8],[9,10]],"c":[],"p":[[4,"OutputFmt"],[15,"bool"],[3,"Formatter"],[6,"Result"],[15,"str"],[4,"Result"],[3,"TypeId"],[3,"Command"],[8,"Args"],[15,"i32"],[8,"StrUtils"]]},\
diff --git a/dev/src/uu_dd/dd.rs.html b/dev/src/uu_dd/dd.rs.html
index 2cfc4b8e1..6c5f6e6a6 100644
--- a/dev/src/uu_dd/dd.rs.html
+++ b/dev/src/uu_dd/dd.rs.html
@@ -1227,6 +1227,52 @@
1227
1228
1229
+1230
+1231
+1232
+1233
+1234
+1235
+1236
+1237
+1238
+1239
+1240
+1241
+1242
+1243
+1244
+1245
+1246
+1247
+1248
+1249
+1250
+1251
+1252
+1253
+1254
+1255
+1256
+1257
+1258
+1259
+1260
+1261
+1262
+1263
+1264
+1265
+1266
+1267
+1268
+1269
+1270
+1271
+1272
+1273
+1274
+1275
// This file is part of the uutils coreutils package.
//
// (c) Tyler Steele <tyler.steele@protonmail.com>
@@ -1265,9 +1311,12 @@
io::{AsRawFd, FromRawFd},
};
use std::path::Path;
-use std::sync::mpsc;
+use std::sync::{
+ atomic::{AtomicBool, Ordering::Relaxed},
+ mpsc, Arc,
+};
use std::thread;
-use std::time;
+use std::time::{Duration, Instant};
use clap::{crate_version, Arg, Command};
use gcd::Gcd;
@@ -1304,6 +1353,45 @@
status: Option<StatusLevel>,
}
+/// A timer which triggers on a given interval
+///
+/// After being constructed with [`Alarm::with_interval`], [`Alarm::is_triggered`]
+/// will return true once per the given [`Duration`].
+///
+/// Can be cloned, but the trigger status is shared across all instances so only
+/// the first caller each interval will yield true.
+///
+/// When all instances are dropped the background thread will exit on the next interval.
+#[derive(Debug, Clone)]
+pub struct Alarm {
+ interval: Duration,
+ trigger: Arc<AtomicBool>,
+}
+
+impl Alarm {
+ pub fn with_interval(interval: Duration) -> Self {
+ let trigger = Arc::new(AtomicBool::default());
+
+ let weak_trigger = Arc::downgrade(&trigger);
+ thread::spawn(move || {
+ while let Some(trigger) = weak_trigger.upgrade() {
+ thread::sleep(interval);
+ trigger.store(true, Relaxed);
+ }
+ });
+
+ Self { interval, trigger }
+ }
+
+ pub fn is_triggered(&self) -> bool {
+ self.trigger.swap(false, Relaxed)
+ }
+
+ pub fn get_interval(&self) -> Duration {
+ self.interval
+ }
+}
+
/// A number in blocks or bytes
///
/// Some values (seek, skip, iseek, oseek) can have values either in blocks or in bytes.
@@ -1989,7 +2077,7 @@
// of its report includes the throughput in bytes per second,
// which requires knowing how long the process has been
// running.
- let start = time::Instant::now();
+ let start = Instant::now();
// A good buffer size for reading.
//
@@ -2009,7 +2097,6 @@
// information.
let (prog_tx, rx) = mpsc::channel();
let output_thread = thread::spawn(gen_prog_updater(rx, i.settings.status));
- let mut progress_as_secs = 0;
// Optimization: if no blocks are to be written, then don't
// bother allocating any buffers.
@@ -2042,6 +2129,12 @@
// This is the max size needed.
let mut buf = vec![BUF_INIT_BYTE; bsize];
+ // Spawn a timer thread to provide a scheduled signal indicating when we
+ // should send an update of our progress to the reporting thread.
+ //
+ // This avoids the need to query the OS monotonic clock for every block.
+ let alarm = Alarm::with_interval(Duration::from_secs(1));
+
// Index in the input file where we are reading bytes and in
// the output file where we are writing bytes.
//
@@ -2100,9 +2193,8 @@
// error.
rstat += rstat_update;
wstat += wstat_update;
- let prog_update = ProgUpdate::new(rstat, wstat, start.elapsed(), false);
- if prog_update.duration.as_secs() >= progress_as_secs {
- progress_as_secs = prog_update.duration.as_secs() + 1;
+ if alarm.is_triggered() {
+ let prog_update = ProgUpdate::new(rstat, wstat, start.elapsed(), false);
prog_tx.send(prog_update).unwrap_or(());
}
}
@@ -2114,7 +2206,7 @@
output: &mut Output,
rstat: ReadStat,
wstat: WriteStat,
- start: time::Instant,
+ start: Instant,
prog_tx: &mpsc::Sender<ProgUpdate>,
output_thread: thread::JoinHandle<T>,
) -> std::io::Result<()> {
diff --git a/dev/uu_dd/all.html b/dev/uu_dd/all.html
index 1202d9455..f6c87c8bc 100644
--- a/dev/uu_dd/all.html
+++ b/dev/uu_dd/all.html
@@ -1 +1 @@
-List of all items in this crate List of all items in this crate uu_app in uu_dd - Rust uu_app in uu_dd - Rust uumain in uu_dd - Rust uumain in uu_dd - Rust uu_dd - Rust uu_dd - Rust Alarm in uu_dd - Rust pub struct Alarm { /* private fields */ }
Expand description
A timer which triggers on a given interval
+After being constructed with Alarm::with_interval, Alarm::is_triggered
+will return true once per the given Duration.
+Can be cloned, but the trigger status is shared across all instances so only
+the first caller each interval will yield true.
+When all instances are dropped the background thread will exit on the next interval.
+Implementations§
source§impl Alarm
sourcepub fn with_interval(interval: Duration) -> Self
sourcepub fn is_triggered(&self) -> bool
sourcepub fn get_interval(&self) -> Duration
Trait Implementations§
Auto Trait Implementations§
§impl RefUnwindSafe for Alarm
§impl Send for Alarm
§impl Sync for Alarm
§impl Unpin for Alarm
§impl UnwindSafe for Alarm
Blanket Implementations§