diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-13 12:46:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-13 12:53:46 -0700 |
| commit | 0c45d258ec35c1ef51523dd45e4518bd8a09258c (patch) | |
| tree | 94bed687c742ce2c3b95ac6f09be982ff4b7fe40 | |
| parent | e0e21283b60da5d5d9d5f95f9f2a73189fa978f1 (diff) | |
| download | git-0c45d258ec35c1ef51523dd45e4518bd8a09258c.tar.gz git-0c45d258ec35c1ef51523dd45e4518bd8a09258c.tar.xz | |
pack-objects: set number of threads before checking and warning
Under NO_PTHREADS build, we warn when delta_search_threads is not
set to 1, because that is the only sensible value on a single
threaded build.
However, the auto detection that kicks in when that variable is set
to 0 (e.g. there is no configuration variable or command line option,
or an explicit --threads=0 is given from the command line to override
the pack.threads configuration to force auto-detection) was not done
before the condition to issue this warning was tested.
Move the auto-detection code and place it at an appropriate spot.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/pack-objects.c | 6 | ||||
| -rw-r--r-- | thread-utils.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index d39193453..a71523706 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1972,8 +1972,6 @@ static void ll_find_deltas(struct object_entry **list, unsigned list_size, init_threaded_search(); - if (!delta_search_threads) /* --threads=0 means autodetect */ - delta_search_threads = online_cpus(); if (delta_search_threads <= 1) { find_deltas(list, &list_size, window, depth, processed); cleanup_threaded_search(); @@ -2685,6 +2683,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) pack_compression_level = Z_DEFAULT_COMPRESSION; else if (pack_compression_level < 0 || pack_compression_level > Z_BEST_COMPRESSION) die("bad pack compression level %d", pack_compression_level); + + if (!delta_search_threads) /* --threads=0 means autodetect */ + delta_search_threads = online_cpus(); + #ifdef NO_PTHREADS if (delta_search_threads != 1) warning("no threads support, ignoring --threads"); diff --git a/thread-utils.h b/thread-utils.h index 6fb98c333..d9a769d19 100644 --- a/thread-utils.h +++ b/thread-utils.h @@ -7,5 +7,9 @@ extern int online_cpus(void); extern int init_recursive_mutex(pthread_mutex_t*); +#else + +#define online_cpus() 1 + #endif #endif /* THREAD_COMPAT_H */ |