grep: skip pthreads overhead when using one thread

Skip the administrative overhead of using pthreads when only using one thread. Instead take the non-threaded path which would be taken under NO_PTHREADS. The threading support was initially added in commit 5b594f457a ("Threaded grep", 2010-01-25) with a hardcoded compile-time number of 8 threads. Later the number of threads was made configurable in commit 89f09dd34e ("grep: add --threads=<num> option and grep.threads configuration", 2015-12-15). That change did not add any special handling for --threads=1. Now we take a slightly faster path by skipping thread handling entirely when 1 thread is requested. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed May 25, 2017 at 20:05 UTC 9ec726a4120bb219530faf988198a704ec7dd1f1
1 file changed +2
builtin/grep.c
+2
@@ -1238,6 +1238,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
1238 num_threads = GREP_NUM_THREADS_DEFAULT;
1239 else if (num_threads < 0)
1240 die(_("invalid number of threads specified (%d)"), num_threads);
1241 + if (num_threads == 1)
1242 + num_threads = 0;
1243 #else
1244 if (num_threads)
1245 warning(_("no threads support, ignoring --threads"));