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>
Junio C Hamano committed
Oct 13, 2014 at 12:46 UTC
0c45d258ec35c1ef51523dd45e4518bd8a09258c
2 files changed
+8
-2
builtin/pack-objects.c
+4
-2
@@ -1972,8 +1972,6 @@ static void ll_find_deltas(struct object_entry **list, unsigned list_size,
1972
1973
init_threaded_search();
1974
1975
- if (!delta_search_threads) /* --threads=0 means autodetect */
1976
- delta_search_threads = online_cpus();
1975
if (delta_search_threads <= 1) {
1976
find_deltas(list, &list_size, window, depth, processed);
1977
cleanup_threaded_search();
@@ -2685,6 +2683,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
2683
pack_compression_level = Z_DEFAULT_COMPRESSION;
2684
else if (pack_compression_level < 0 || pack_compression_level > Z_BEST_COMPRESSION)
2685
die("bad pack compression level %d", pack_compression_level);
2686
+
2687
+ if (!delta_search_threads) /* --threads=0 means autodetect */
2688
+ delta_search_threads = online_cpus();
2689
+
2690
#ifdef NO_PTHREADS
2691
if (delta_search_threads != 1)
2692
warning("no threads support, ignoring --threads");
thread-utils.h
+4
@@ -7,5 +7,9 @@
7
extern int online_cpus(void);
8
extern int init_recursive_mutex(pthread_mutex_t*);
9
10
+#else
11
+
12
+#define online_cpus() 1
13
+
14
#endif
15
#endif /* THREAD_COMPAT_H */