aboutsummaryrefslogtreecommitdiff
path: root/pack-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-16 17:20:24 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-16 17:20:24 -0700
commit0fa6417c4911e8d252e562d3f58e737d0fdd0228 (patch)
treea285f947d9eb6306dcdf98b00e37d168c4606f70 /pack-objects.c
parent94cdb382583e7c87d949fb22754d795a1b956377 (diff)
parentc3b06a69ffc41b3ac3600628593dd0fdd3988607 (diff)
downloadgit-0fa6417c4911e8d252e562d3f58e737d0fdd0228.tar.gz
git-0fa6417c4911e8d252e562d3f58e737d0fdd0228.tar.xz
Merge branch 'np/pack'
* np/pack: improve depth heuristic for maximum delta size pack-object: slightly more efficient simple euristic for further free packing improvements
Diffstat (limited to 'pack-objects.c')
-rw-r--r--pack-objects.c27
1 files changed, 14 insertions, 13 deletions
diff --git a/pack-objects.c b/pack-objects.c
index 0dbda2cd9..77284cfdb 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -1036,10 +1036,13 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
if (src_entry->depth >= max_depth)
return 0;
- /* Now some size filtering euristics. */
+ /* Now some size filtering heuristics. */
size = trg_entry->size;
- max_size = size / 2 - 20;
- if (trg_entry->delta)
+ max_size = size/2 - 20;
+ max_size = max_size * (max_depth - src_entry->depth) / max_depth;
+ if (max_size == 0)
+ return 0;
+ if (trg_entry->delta && trg_entry->delta_size <= max_size)
max_size = trg_entry->delta_size-1;
src_size = src_entry->size;
sizediff = src_size < size ? size - src_size : 0;
@@ -1104,17 +1107,14 @@ static void find_deltas(struct object_entry **list, int window, int depth)
if (entry->size < 50)
continue;
- if (n->index)
- free_delta_index(n->index);
+ free_delta_index(n->index);
+ n->index = NULL;
free(n->data);
n->entry = entry;
n->data = read_sha1_file(entry->sha1, type, &size);
if (size != entry->size)
die("object %s inconsistent object length (%lu vs %lu)",
sha1_to_hex(entry->sha1), size, entry->size);
- n->index = create_delta_index(n->data, size);
- if (!n->index)
- die("out of memory");
j = window;
while (--j > 0) {
@@ -1128,15 +1128,17 @@ static void find_deltas(struct object_entry **list, int window, int depth)
if (try_delta(n, m, m->index, depth) < 0)
break;
}
-#if 0
/* if we made n a delta, and if n is already at max
* depth, leaving it in the window is pointless. we
* should evict it first.
- * ... in theory only; somehow this makes things worse.
*/
if (entry->delta && depth <= entry->depth)
continue;
-#endif
+
+ n->index = create_delta_index(n->data, size);
+ if (!n->index)
+ die("out of memory");
+
idx++;
if (idx >= window)
idx = 0;
@@ -1146,8 +1148,7 @@ static void find_deltas(struct object_entry **list, int window, int depth)
fputc('\n', stderr);
for (i = 0; i < window; ++i) {
- if (array[i].index)
- free_delta_index(array[i].index);
+ free_delta_index(array[i].index);
free(array[i].data);
}
free(array);