From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Thu, 25 May 2017 19:45:35 +0000 (+0000)
Subject: grep: assert that threading is enabled when calling grep_{lock,unlock}
X-Git-Tag: v2.14.0-rc0~124^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8df4c2953f228020438eb53a7d54470c922ce9cc?ds=inline;hp=8df4c2953f228020438eb53a7d54470c922ce9cc

grep: assert that threading is enabled when calling grep_{lock,unlock}

Change the grep_{lock,unlock} functions to assert that num_threads is
true, instead of only locking & unlocking the pthread mutex lock when
it is.

These functions are never called when num_threads isn't true, this
logic has gone through multiple iterations since the initial
introduction of grep threading in commit 5b594f457a ("Threaded grep",
2010-01-25), but ever since then they'd only be called if num_threads
was true, so this check made the code confusing to read.

Replace the check with an assertion, so that it's clear to the reader
that this code path is never taken unless we're spawning threads.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---