summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2017-05-25 20:05:23 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-26 12:59:05 +0900
commit9ec726a4120bb219530faf988198a704ec7dd1f1 (patch)
tree5af66775f7ba959eb926fc38a00a0e8021e36b3e /mergetools/p4merge
parentgrep: don't redundantly compile throwaway patterns under threading (diff)
downloadtgif-9ec726a4120bb219530faf988198a704ec7dd1f1.tar.xz
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>
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions