summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2011-10-25 17:25:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-26 18:35:49 (GMT)
commitcdf055376907cfa7837e576db219a1a7617df276 (patch)
treef291f0375ac9100c9fa34f16d0ff0bbce146684b
parentf384a2edd62dfc4af0f051dc8248506cebb265f9 (diff)
downloadgit-cdf055376907cfa7837e576db219a1a7617df276.zip
git-cdf055376907cfa7837e576db219a1a7617df276.tar.gz
git-cdf055376907cfa7837e576db219a1a7617df276.tar.bz2
git grep: be careful to use mutexes only when they are initialized
Rather nasty things happen when a mutex is not initialized but locked nevertheless. Now, when we're not running in a threaded manner, the mutex is not initialized, which is correct. But then we went and used the mutex anyway, which -- at least on Windows -- leads to a hard crash (ordinarily it would be called a segmentation fault, but in Windows speak it is an access violation). This problem was identified by our faithful tests when run in the msysGit environment. To avoid having to wrap the line due to the 80 column limit, we use the name "WHEN_THREADED" instead of "IF_USE_THREADS" because it is one character shorter. Which is all we need in this case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/grep.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/builtin/grep.c b/builtin/grep.c
index 7d0779f..88b0c80 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -77,10 +77,11 @@ static pthread_mutex_t grep_mutex;
/* Used to serialize calls to read_sha1_file. */
static pthread_mutex_t read_sha1_mutex;
-#define grep_lock() pthread_mutex_lock(&grep_mutex)
-#define grep_unlock() pthread_mutex_unlock(&grep_mutex)
-#define read_sha1_lock() pthread_mutex_lock(&read_sha1_mutex)
-#define read_sha1_unlock() pthread_mutex_unlock(&read_sha1_mutex)
+#define WHEN_THREADED(x) do { if (use_threads) (x); } while (0)
+#define grep_lock() WHEN_THREADED(pthread_mutex_lock(&grep_mutex))
+#define grep_unlock() WHEN_THREADED(pthread_mutex_unlock(&grep_mutex))
+#define read_sha1_lock() WHEN_THREADED(pthread_mutex_lock(&read_sha1_mutex))
+#define read_sha1_unlock() WHEN_THREADED(pthread_mutex_unlock(&read_sha1_mutex))
/* Signalled when a new work_item is added to todo. */
static pthread_cond_t cond_add;