From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 16 Feb 2010 08:15:01 GMT
Subject: Re: [PATCH] fix threaded grep for machines with only one cpu
Message-ID: <alpine.DEB.1.00.1002160914140.20986@pacific.mpi-cbg.de>
In-Reply-To: <7vljetlx8r.fsf@alter.siamese.dyndns.org>

Hi,

On Mon, 15 Feb 2010, Junio C Hamano wrote:

> diff --git a/builtin-grep.c b/builtin-grep.c
> index 26d4deb..5c1545e 100644
> --- a/builtin-grep.c
> +++ b/builtin-grep.c
> @@ -81,8 +81,8 @@ 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 read_sha1_lock() do { if (use_threads) pthread_mutex_lock(&read_sha1_mutex); } while (0)
> +#define read_sha1_unlock() do { if (use_threads) pthread_mutex_unlock(&read_sha1_mutex); } while (0)

This is inconsistent. Just look at the code above and tell me why it is so 
different.

Ciao,
Dscho