diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-09 09:00:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 09:00:45 -0700 |
| commit | c592023aed989c1fe98d6033c01b89d5b86dd8b4 (patch) | |
| tree | 1d18ab2f43de73d62dc8d41760bd66e53bb877b1 | |
| parent | d02d7ac303b1a22c7de4a6c3a00074d38b498134 (diff) | |
| parent | c0f86547c522906da7538c0d2b7b0de608499c23 (diff) | |
| download | git-c592023aed989c1fe98d6033c01b89d5b86dd8b4.tar.gz | |
Merge branch 'rj/platform-pread-may-be-thread-unsafe'
On Cygwin, the platform pread(3) is not thread safe, just like our
own compat/ emulation, and cannot be used in the index-pack program.
* rj/platform-pread-may-be-thread-unsafe:
index-pack: Disable threading on cygwin
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | builtin/index-pack.c | 4 |
2 files changed, 10 insertions, 2 deletions
@@ -158,6 +158,9 @@ all:: # Define NO_PREAD if you have a problem with pread() system call (e.g. # cygwin1.dll before v1.5.22). # +# Define NO_THREAD_SAFE_PREAD if your pread() implementation is not +# thread-safe. (e.g. compat/pread.c or cygwin) +# # Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is # generally faster on your platform than accessing the working directory. # @@ -1059,6 +1062,7 @@ ifeq ($(uname_O),Cygwin) NO_IPV6 = YesPlease OLD_ICONV = UnfortunatelyYes endif + NO_THREAD_SAFE_PREAD = YesPlease NEEDS_LIBICONV = YesPlease NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes NO_TRUSTABLE_FILEMODE = UnfortunatelyYes @@ -1668,6 +1672,10 @@ endif ifdef NO_PREAD COMPAT_CFLAGS += -DNO_PREAD COMPAT_OBJS += compat/pread.o + NO_THREAD_SAFE_PREAD = YesPlease +endif +ifdef NO_THREAD_SAFE_PREAD + BASIC_CFLAGS += -DNO_THREAD_SAFE_PREAD endif ifdef NO_FAST_WORKING_DIRECTORY BASIC_CFLAGS += -DNO_FAST_WORKING_DIRECTORY diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 8b5c1eb33e..5a0372ab08 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -40,8 +40,8 @@ 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. */ +#if !defined(NO_PTHREADS) && defined(NO_THREAD_SAFE_PREAD) +/* pread() emulation is not thread-safe. Disable threading. */ #define NO_PTHREADS #endif |