global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-01 12:30:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] fix threaded grep for machines with only one cpu

Browse Source 
In case the machine has only one cpu the mutex initialization was
skipped.

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Heiko Voigt
2010-02-15 22:36:28 +01:00
committed by Johannes Schindelin
parent ebbe65cb21
commit 2539a7bdb8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
builtin-grep.c
View File

@@ -220,12 +220,6 @@ static void start_threads(struct grep_opt *opt)
{
int i;
pthread_mutex_init(&grep_mutex, NULL);
pthread_mutex_init(&read_sha1_mutex, NULL);
pthread_cond_init(&cond_add, NULL);
pthread_cond_init(&cond_write, NULL);
pthread_cond_init(&cond_result, NULL);
for (i = 0; i < ARRAY_SIZE(todo); i++) {
strbuf_init(&todo[i].out, 0);
}
@@ -880,6 +874,12 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
if (online_cpus() == 1 || !grep_threads_ok(&opt))
use_threads = 0;
pthread_mutex_init(&grep_mutex, NULL);
pthread_mutex_init(&read_sha1_mutex, NULL);
pthread_cond_init(&cond_add, NULL);
pthread_cond_init(&cond_write, NULL);
pthread_cond_init(&cond_result, NULL);
if (use_threads)
start_threads(&opt);
#else