rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-03-17 20:28:03 +02:00
Code Issues Releases Activity

Tweak the parallel directory iterator.

Browse Source 
This commit fixes two issues.

First, the iterator was executing the callback for every child of a
directory in a single thread. Therefore, if the walker was run over a
single directory, then no parallelism is used. We tweak the iterator
slightly so that we don't fall into this trap.

The second issue is a bit more subtle. In particular, we don't use the
blocking semantics of MsQueue because we *don't know when iteration
finishes*. This means that if there are a bunch of idle workers because
there is no work available to them, then they will spin and burn the
CPU. One case where this crops up is if you pipe the output of ripgrep
into `less` *and* the total number of files to search is fewer than the
number of threads ripgrep uses. We "fix" this with a very stupid
heuristic: when the queue yields no work, we sleep the thread for 1ms.
This still pegs the CPU, but not nearly as much as before.

If one really want to avoid this behavior when using ripgrep, then `-j1`
can be used to disable parallelism.

Fixes #258
This commit is contained in:
Andrew Gallant 2017-01-06 21:43:46 -05:00
parent b187c1a817
commit 95cea77625
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ignore/src/walk.rs
View File

@ -6,6 +6,7 @@ use std::path::{Path, PathBuf};
use std::sync::Arc;
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use std::thread;
use std::time::Duration;
use std::vec;
use crossbeam::sync::MsQueue;
@ -907,10 +908,9 @@ impl Worker {
/// skipped by the ignore matcher.
fn run(mut self) {
while let Some(mut work) = self.get_work() {
let depth = work.dent.depth();
// If this is an explicitly given path and is not a directory,
// then execute the caller's callback and move on.
if depth == 0 && !work.is_dir() {
// If the work is not a directory, then we can just execute the
// caller's callback immediately and move on.
if !work.is_dir() {
if (self.f)(Ok(work.dent)).is_quit() {
self.quit_now();
return;
@ -935,6 +935,7 @@ impl Worker {
continue;
}
};
let depth = work.dent.depth();
match (self.f)(Ok(work.dent)) {
WalkState::Continue => {}
WalkState::Skip => continue,
@ -958,9 +959,8 @@ impl Worker {
/// Runs the worker on a single entry from a directory iterator.
///
/// If the entry is a path that should be ignored, then this is a no-op.
/// Otherwise, if the entry is a directory, then it is pushed on to the
/// queue. If the entry isn't a directory, the caller's callback is
/// applied.
/// Otherwise, the entry is pushed on to the queue. (The actual execution
/// of the callback happens in `run`.)
///
/// If an error occurs while reading the entry, then it is sent to the
/// caller's callback.
@ -1002,17 +1002,13 @@ impl Worker {
}
}
let is_dir = dent.file_type().map_or(false, |ft| ft.is_dir());
if skip_path(ig, dent.path(), is_dir) {
WalkState::Continue
} else if !is_dir {
(self.f)(Ok(dent))
} else {
if !skip_path(ig, dent.path(), is_dir) {
self.queue.push(Message::Work(Work {
dent: dent,
ignore: ig.clone(),
}));
WalkState::Continue
}
WalkState::Continue
}
/// Returns the next directory to descend into.
@ -1060,8 +1056,6 @@ impl Worker {
}
// Otherwise, spin.
}
// If we're here, then we've aborted our quit attempt.
continue;
}
None => {
self.waiting(true);
@ -1070,8 +1064,16 @@ impl Worker {
for _ in 0..self.threads {
self.queue.push(Message::Quit);
}
} else {
// You're right to consider this suspicious, but it's
// a useful heuristic to permit producers to catch up
// to consumers without burning the CPU. It is also
// useful as a means to prevent burning the CPU if only
// one worker is left doing actual work. It's not
// perfect and it doesn't leave the CPU completely
// idle, but it's not clear what else we can do. :-/
thread::sleep(Duration::from_millis(1));
}
continue;
}
}
}