@matheusbsbs / matheus-bagliano / commits / 4e8da19581
Fork 0

simple euristic for further free packing improvements

Given that the early eviction of objects with maximum delta depth may exhibit bad packing on its own, why not considering a bias against deep base objects in try_delta() to mitigate that bad behavior. This patch adjust the MAX_size allowed for a delta based on the depth of the base object as well as enabling the early eviction of max depth objects from the object window. When used separately, those two things produce slightly better and much worse results respectively. But their combined effect is a surprising significant packing improvement. With this really simple patch the GIT repo gets nearly 15% smaller, and the Linux kernel repo about 5% smaller, with no significantly measurable CPU usage difference. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Nicolas Pitre committed May 15, 2006 at 11:40 UTC 4e8da1958111796d55ad63b229ebd3ae6c54bf87
1 file changed +2 -5
pack-objects.c
+2 -5
@@ -1039,8 +1039,8 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
1039
1040 /* Now some size filtering euristics. */
1041 size = trg_entry->size;
1042 - max_size = size / 2 - 20;
1043 - if (trg_entry->delta)
1042 + max_size = (size/2 - 20) / (src_entry->depth + 1);
1043 + if (trg_entry->delta && trg_entry->delta_size <= max_size)
1044 max_size = trg_entry->delta_size-1;
1045 src_size = src_entry->size;
1046 sizediff = src_size < size ? size - src_size : 0;
@@ -1129,15 +1129,12 @@ static void find_deltas(struct object_entry **list, int window, int depth)
1129 if (try_delta(n, m, m->index, depth) < 0)
1130 break;
1131 }
1132 -#if 0
1132 /* if we made n a delta, and if n is already at max
1133 * depth, leaving it in the window is pointless. we
1134 * should evict it first.
1136 - * ... in theory only; somehow this makes things worse.
1135 */
1136 if (entry->delta && depth <= entry->depth)
1137 continue;
1140 -#endif
1138 idx++;
1139 if (idx >= window)
1140 idx = 0;