summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Leschuk <vleschuk@gmail.com>2015-12-15 18:31:39 +0300
committerJunio C Hamano <gitster@pobox.com>2015-12-15 10:43:30 -0800
commitb6b468b2bfaa8015568efad8e0a78b342e1ac640 (patch)
tree408970296d6d6a0c763d21c73331bf7b9957d6d8
parent37023ba381b6d251d7140a997b39b566dbc63c42 (diff)
downloadgit-b6b468b2bfaa8015568efad8e0a78b342e1ac640.tar.gz
grep: allow threading even on a single-core machine
Earlier we disabled threading when online_cpus() said "1", but on a filesystem with long latency (or in a cold cache situation), using multiple threads to drive I/O in parallel would improve performance even on a single-core machines. Signed-off-by: Victor Leschuk <vleschuk@accesssoftek.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/grep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c
index d04f4400d9..734d6ceaae 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -832,7 +832,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
}
#ifndef NO_PTHREADS
- if (list.nr || cached || online_cpus() == 1)
+ if (list.nr || cached)
use_threads = 0;
#else
use_threads = 0;