From bf874896240cb00b22cd4f6cbcc143b17cc7fe0e Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Sat, 13 Dec 2008 15:06:40 -0500 Subject: [PATCH] pack-objects: don't use too many threads with few objects If there are few objects to deltify, they might be split amongst threads so that there is simply no other objects left to delta against within the same thread. Let's use the same 2*window treshold as used for the final load balancing to allow extra threads to be created. This fixes the benign t5300 test failure. Signed-off-by: Nicolas Pitre Tested-by: Jeff King Signed-off-by: Junio C Hamano --- builtin-pack-objects.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 619e597d5..e8515348b 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -1620,6 +1620,10 @@ static void ll_find_deltas(struct object_entry **list, unsigned list_size, for (i = 0; i < delta_search_threads; i++) { unsigned sub_size = list_size / (delta_search_threads - i); + /* don't use too small segments or no deltas will be found */ + if (sub_size < 2*window && i+1 < delta_search_threads) + sub_size = 0; + p[i].window = window; p[i].depth = depth; p[i].processed = processed; -- 2.26.2