path: root/grep.h
diff options
authorMatheus Tavares <>2020-01-16 02:39:54 (GMT)
committerJunio C Hamano <>2020-01-17 21:52:14 (GMT)
commit1d1729caebd41b340dd8dd61057f613da4df526c (patch)
treece20d1ca66674bbca7ce8165172598a06a28d0ce /grep.h
parent31877c9aec21e0824fd4fcf415069cf8dfae4b72 (diff)
grep: replace grep_read_mutex by internal obj read lock
git-grep uses 'grep_read_mutex' to protect its calls to object reading operations. But these have their own internal lock now, which ensures a better performance (allowing parallel access to more regions). So, let's remove the former and, instead, activate the latter with enable_obj_read_lock(). Sections that are currently protected by 'grep_read_mutex' but are not internally protected by the object reading lock should be surrounded by obj_read_lock() and obj_read_unlock(). These guarantee mutual exclusion with object reading operations, keeping the current behavior and avoiding race conditions. Namely, these places are: In grep.c: - fill_textconv() at fill_textconv_grep(). - userdiff_get_textconv() at grep_source_1(). In builtin/grep.c: - parse_object_or_die() and the submodule functions at grep_submodule(). - deref_tag() and gitmodules_config_oid() at grep_objects(). If these functions become thread-safe, in the future, we might remove the locking and probably get some speedup. Note that some of the submodule functions will already be thread-safe (or close to being thread-safe) with the internal object reading lock. However, as some of them will require additional modifications to be removed from the critical section, this will be done in its own patch. Signed-off-by: Matheus Tavares <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'grep.h')
1 files changed, 0 insertions, 13 deletions
diff --git a/grep.h b/grep.h
index 811fd27..9115db8 100644
--- a/grep.h
+++ b/grep.h
@@ -220,18 +220,5 @@ int grep_threads_ok(const struct grep_opt *opt);
extern int grep_use_locks;
extern pthread_mutex_t grep_attr_mutex;
-extern pthread_mutex_t grep_read_mutex;
-static inline void grep_read_lock(void)
- if (grep_use_locks)
- pthread_mutex_lock(&grep_read_mutex);
-static inline void grep_read_unlock(void)
- if (grep_use_locks)
- pthread_mutex_unlock(&grep_read_mutex);