undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pack-objects: only throw away data during memory pressure

Browse Source 
If pack-objects hit the memory limit, it deletes objects from the delta
window.

This patch make it only delete the data, which is recomputed, if needed again.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Acked-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin Koegler 2008-02-11 08:26:25 +01:00 committed by Junio C Hamano
parent 5a95b85566
commit 9c2174350c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin-pack-objects.c
View File

@ -1464,7 +1464,7 @@ static unsigned int check_delta_limit(struct object_entry *me, unsigned int n)
return m; return m;
} }
static unsigned long free_unpacked(struct unpacked *n) static unsigned long free_unpacked_data(struct unpacked *n)
{ {
unsigned long freed_mem = sizeof_delta_index(n->index); unsigned long freed_mem = sizeof_delta_index(n->index);
free_delta_index(n->index); free_delta_index(n->index);
@ -1474,6 +1474,12 @@ static unsigned long free_unpacked(struct unpacked *n)
free(n->data); free(n->data);
n->data = NULL; n->data = NULL;
} }
return freed_mem;
}
static unsigned long free_unpacked(struct unpacked *n)
{
unsigned long freed_mem = free_unpacked_data(n);
n->entry = NULL; n->entry = NULL;
n->depth = 0; n->depth = 0;
return freed_mem; return freed_mem;
@ -1514,7 +1520,7 @@ static void find_deltas(struct object_entry **list, unsigned *list_size,
mem_usage > window_memory_limit && mem_usage > window_memory_limit &&
count > 1) { count > 1) {
uint32_t tail = (idx + window - count) % window; uint32_t tail = (idx + window - count) % window;
mem_usage -= free_unpacked(array + tail); mem_usage -= free_unpacked_data(array + tail);
count--; count--;
} }
@ -1547,6 +1553,9 @@ static void find_deltas(struct object_entry **list, unsigned *list_size,
if (!m->entry) if (!m->entry)
break; break;
ret = try_delta(n, m, max_depth, &mem_usage); ret = try_delta(n, m, max_depth, &mem_usage);
if (window_memory_limit &&
mem_usage > window_memory_limit)
mem_usage -= free_unpacked_data(m);
if (ret < 0) if (ret < 0)
break; break;
else if (ret > 0) else if (ret > 0)