Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid quadratic complexity when splitting output into lines #9586

Merged
merged 2 commits into from
Jun 18, 2021
Merged

Avoid quadratic complexity when splitting output into lines #9586

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f60fca
Simplify line splitting code in `exec_with_streaming` NFC
tmiasko Jun 17, 2021
8df771f
Avoid quadratic complexity when splitting output into lines
tmiasko Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 33 additions & 26 deletions crates/cargo-util/src/process_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,47 +243,54 @@ impl ProcessBuilder {
.stdin(Stdio::null());

let mut callback_error = None;
let mut stdout_pos = 0;
let mut stderr_pos = 0;
let status = (|| {
let mut child = cmd.spawn()?;
let out = child.stdout.take().unwrap();
let err = child.stderr.take().unwrap();
read2(out, err, &mut |is_out, data, eof| {
let pos = if is_out {
&mut stdout_pos
} else {
&mut stderr_pos
};
let idx = if eof {
data.len()
} else {
match data.iter().rposition(|b| *b == b'\n') {
Some(i) => i + 1,
None => return,
match data[*pos..].iter().rposition(|b| *b == b'\n') {
Some(i) => *pos + i + 1,
None => {
*pos = data.len();
return;
}
}
};
{
// scope for new_lines
let new_lines = if capture_output {
let dst = if is_out { &mut stdout } else { &mut stderr };
let start = dst.len();
let data = data.drain(..idx);
dst.extend(data);
&dst[start..]

let new_lines = &data[..idx];

for line in String::from_utf8_lossy(new_lines).lines() {
if callback_error.is_some() {
break;
}
let callback_result = if is_out {
on_stdout_line(line)
} else {
&data[..idx]
on_stderr_line(line)
};
for line in String::from_utf8_lossy(new_lines).lines() {
if callback_error.is_some() {
break;
}
let callback_result = if is_out {
on_stdout_line(line)
} else {
on_stderr_line(line)
};
if let Err(e) = callback_result {
callback_error = Some(e);
}
if let Err(e) = callback_result {
callback_error = Some(e);
tmiasko marked this conversation as resolved.
Show resolved Hide resolved
break;
}
}
if !capture_output {
data.drain(..idx);

if capture_output {
let dst = if is_out { &mut stdout } else { &mut stderr };
dst.extend(new_lines);
}

data.drain(..idx);
*pos = 0;
})?;
child.wait()
})()
Expand Down