autodetect number of CPUs by default when using threads

... and display the actual number of threads used when locally
repacking.  A remote server still won't tell you how many threads it
uses during a fetch though.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index cedef52fd3d62a3dd2e439a46579362b22c69642..619e597d5ca45c804e9a452fb007cceae2ca6df3 100644 (file)
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -78,7 +78,7 @@ static int progress = 1;
 static int window = 10;
 static uint32_t pack_size_limit, pack_size_limit_cfg;
 static int depth = 50;
 static int window = 10;
 static uint32_t pack_size_limit, pack_size_limit_cfg;
 static int depth = 50;

-static int delta_search_threads = 1;
+static int delta_search_threads;

 static int pack_to_stdout;
 static int num_preferred_base;
 static struct progress *progress_state;
 static int pack_to_stdout;
 static int num_preferred_base;
 static struct progress *progress_state;


@@ -1612,6 +1612,9 @@ static void ll_find_deltas(struct object_entry **list, unsigned list_size,
                find_deltas(list, &list_size, window, depth, processed);
                return;
        }
                find_deltas(list, &list_size, window, depth, processed);
                return;
        }

+       if (progress > pack_to_stdout)
+               fprintf(stderr, "Delta compression using %d threads.\n",
+                               delta_search_threads);

 
        /* Partition the work amongst work threads. */
        for (i = 0; i < delta_search_threads; i++) {
 
        /* Partition the work amongst work threads. */
        for (i = 0; i < delta_search_threads; i++) {