From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun, 6 May 2012 12:31:56 +0000 (+0700)
Subject: index-pack: disable threading if NO_PREAD is defined
X-Git-Tag: v1.7.11-rc0~31^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b038a61;p=git.git

index-pack: disable threading if NO_PREAD is defined

NO_PREAD simulates pread() as a sequence of seek, read, seek in
compat/pread.c. The simulation is not thread-safe because another
thread could move the file offset away in the middle of pread
operation. Do not allow threading in that case.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index d4685c50d..807ee56f7 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -39,6 +39,11 @@ struct base_data {
 	int ofs_first, ofs_last;
 };
 
+#if !defined(NO_PTHREADS) && defined(NO_PREAD)
+/* NO_PREAD uses compat/pread.c, which is not thread-safe. Disable threading. */
+#define NO_PTHREADS
+#endif
+
 struct thread_local {
 #ifndef NO_PTHREADS
 	pthread_t thread;