Skip to content

Commit 786a444

Browse files
committed
yes: use tee syscall as fast-path
1 parent 33745a0 commit 786a444

5 files changed

Lines changed: 57 additions & 6 deletions

File tree

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/uu/yes/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ path = "src/yes.rs"
2222
clap = { workspace = true }
2323
itertools = { workspace = true }
2424
fluent = { workspace = true }
25-
uucore = { workspace = true }
25+
rustix = { workspace = true, features = ["pipe"] }
26+
uucore = { workspace = true, features = ["pipes"] }
2627

2728
[[bin]]
2829
name = "yes"

src/uu/yes/src/yes.rs

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ use uucore::error::{UResult, USimpleError, strip_errno};
1212
use uucore::format_usage;
1313
use uucore::translate;
1414

15+
#[cfg(any(target_os = "linux", target_os = "android"))]
16+
const PAGE_SIZE: usize = 4096;
17+
#[cfg(any(target_os = "linux", target_os = "android"))]
18+
use uucore::pipes::MAX_ROOTLESS_PIPE_SIZE;
19+
#[cfg(any(target_os = "linux", target_os = "android"))]
20+
const BUF_SIZE: usize = MAX_ROOTLESS_PIPE_SIZE;
1521
// it's possible that using a smaller or larger buffer might provide better performance
22+
#[cfg(not(any(target_os = "linux", target_os = "android")))]
1623
const BUF_SIZE: usize = 16 * 1024;
1724

1825
#[uucore::main]
@@ -21,9 +28,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
2128

2229
#[allow(clippy::unwrap_used, reason = "clap provides 'y' by default")]
2330
let mut buffer = args_into_buffer(matches.get_many::<OsString>("STRING").unwrap())?;
24-
prepare_buffer(&mut buffer);
31+
#[cfg(any(target_os = "linux", target_os = "android"))]
32+
let aligned = PAGE_SIZE.is_multiple_of(buffer.len());
33+
#[cfg(not(any(target_os = "linux", target_os = "android")))]
34+
let aligned = false;
2535

26-
match exec(&buffer) {
36+
prepare_buffer(&mut buffer);
37+
match exec(&buffer, aligned) {
2738
Ok(()) => Ok(()),
2839
// On Windows, silently handle broken pipe since there's no SIGPIPE
2940
#[cfg(windows)]
@@ -100,10 +111,35 @@ fn prepare_buffer(buf: &mut Vec<u8>) {
100111
}
101112
}
102113

103-
pub fn exec(bytes: &[u8]) -> io::Result<()> {
114+
pub fn exec(bytes: &[u8], aligned: bool) -> io::Result<()> {
104115
let stdout = io::stdout();
116+
#[cfg(any(target_os = "linux", target_os = "android"))]
117+
{
118+
use uucore::pipes::{pipe, splice, tee};
119+
// don't catch any error at fast-path and fallback to write for proper message
120+
if let Ok((p_read, mut p_write)) = pipe()
121+
&& p_write.write_all(bytes).is_ok()
122+
{
123+
if aligned && tee(&p_read, &stdout, PAGE_SIZE).is_ok() {
124+
let _ = rustix::pipe::fcntl_setpipe_size(&stdout, MAX_ROOTLESS_PIPE_SIZE);
125+
while let Ok(1..) = tee(&p_read, &stdout, usize::MAX) {}
126+
} else if let Ok((broker_read, broker_write)) = pipe() {
127+
// tee() cannot control offset and write to non-pipe
128+
'hybrid: while let Ok(mut remain) = tee(&p_read, &broker_write, usize::MAX) {
129+
debug_assert!(remain == bytes.len(), "splice() should cleanup pipe");
130+
while remain > 0 {
131+
if let Ok(s) = splice(&broker_read, &stdout, remain) {
132+
remain -= s;
133+
} else {
134+
break 'hybrid;
135+
}
136+
}
137+
}
138+
}
139+
}
140+
}
141+
let _ = aligned; // used only on Linux
105142
let mut stdout = stdout.lock();
106-
107143
loop {
108144
stdout.write_all(bytes)?;
109145
}
@@ -114,6 +150,7 @@ mod tests {
114150
use super::*;
115151

116152
#[test]
153+
#[cfg(not(any(target_os = "linux", target_os = "android")))] // Linux uses different buffer size
117154
fn test_prepare_buffer() {
118155
let tests = [
119156
(150, 16350),

src/uucore/src/lib/features/pipes.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,15 @@ pub fn dev_null() -> Option<File> {
8787
None
8888
}
8989
}
90+
91+
// Less noisy wrapper around [`rustix::pipe::tee`]
92+
#[inline]
93+
#[cfg(any(target_os = "linux", target_os = "android"))]
94+
pub fn tee(source: &impl AsFd, target: &impl AsFd, len: usize) -> std::io::Result<usize> {
95+
Ok(rustix::pipe::tee(
96+
source,
97+
target,
98+
len,
99+
SpliceFlags::empty(),
100+
)?)
101+
}

tests/by-util/test_yes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fn test_long_input() {
7070
#[cfg(windows)]
7171
const TIMES: usize = 500;
7272
let arg = "abcdef".repeat(TIMES) + "\n";
73-
let expected_out = arg.repeat(30);
73+
let expected_out = arg.repeat(5);
7474
run(&[&arg[..arg.len() - 1]], expected_out.as_bytes());
7575
}
7676

0 commit comments

Comments
 (0)