kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'np/auto-thread' 

* np/auto-thread:
  Force t5302 to use a single thread
  pack-objects: don't use too many threads with few objects
  autodetect number of CPUs by default when using threads
maint
Junio C Hamano 2008-12-29 01:21:33 -08:00
parent 373654ee0f 1415be8f0f
commit 78d4096d57
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin-pack-objects.c
View File

@ -78,7 +78,7 @@ static int progress = 1;
static int window = 10; static int window = 10;
static uint32_t pack_size_limit, pack_size_limit_cfg; static uint32_t pack_size_limit, pack_size_limit_cfg;
static int depth = 50; static int depth = 50;
static int delta_search_threads = 1; static int delta_search_threads;
static int pack_to_stdout; static int pack_to_stdout;
static int num_preferred_base; static int num_preferred_base;
static struct progress *progress_state; static struct progress *progress_state;
@ -1612,11 +1612,18 @@ static void ll_find_deltas(struct object_entry **list, unsigned list_size,
find_deltas(list, &list_size, window, depth, processed); find_deltas(list, &list_size, window, depth, processed);
return; return;
} }
if (progress > pack_to_stdout)
fprintf(stderr, "Delta compression using %d threads.\n",
delta_search_threads);


/* Partition the work amongst work threads. */ /* Partition the work amongst work threads. */
for (i = 0; i < delta_search_threads; i++) { for (i = 0; i < delta_search_threads; i++) {
unsigned sub_size = list_size / (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].window = window;
p[i].depth = depth; p[i].depth = depth;
p[i].processed = processed; p[i].processed = processed;

1
t/t5302-pack-index.sh
View File

@ -10,6 +10,7 @@ test_expect_success \
'setup' \ 'setup' \
'rm -rf .git 'rm -rf .git
git init && git init &&
git config pack.threads 1 &&
i=1 && i=1 &&
while test $i -le 100 while test $i -le 100
do do