pack-objects: fix delta cache size accounting

Nicolas Pitre · gitster · commit b7a28f7827ba · 2007-12-08T03:38:35.000-08:00
The wrong value was substracted from delta_cache_size when replacing
a cached delta, as trg_entry-&gt;delta_size was used after the old size
had been replaced by the new size.

Noticed by Linus.

Signed-off-by: Nicolas Pitre &lt;nico@cam.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
@@ -1422,10 +1422,6 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
 		}
 	}
 
-	trg_entry->delta = src_entry;
-	trg_entry->delta_size = delta_size;
-	trg->depth = src->depth + 1;
-
 	/*
 	 * Handle memory allocation outside of the cache
 	 * accounting lock.  Compiler will optimize the strangeness
@@ -1439,14 +1435,18 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
 		trg_entry->delta_data = NULL;
 	}
 	if (delta_cacheable(src_size, trg_size, delta_size)) {
-		delta_cache_size += trg_entry->delta_size;
+		delta_cache_size += delta_size;
 		cache_unlock();
 		trg_entry->delta_data = xrealloc(delta_buf, delta_size);
 	} else {
 		cache_unlock();
 		free(delta_buf);
 	}
 
+	trg_entry->delta = src_entry;
+	trg_entry->delta_size = delta_size;
+	trg->depth = src->depth + 1;
+
 	return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1422,10 +1422,6 @@ static int try_delta(struct unpacked trg, struct unpacked src,`
`1422`	`1422`	`}`
`1423`	`1423`	`}`
`1424`	`1424`
`1425`		`- trg_entry->delta = src_entry;`
`1426`		`- trg_entry->delta_size = delta_size;`
`1427`		`- trg->depth = src->depth + 1;`
`1428`		`-`
`1429`	`1425`	`/*`
`1430`	`1426`	`* Handle memory allocation outside of the cache`
`1431`	`1427`	`* accounting lock. Compiler will optimize the strangeness`
`@@ -1439,14 +1435,18 @@ static int try_delta(struct unpacked trg, struct unpacked src,`
`1439`	`1435`	`trg_entry->delta_data = NULL;`
`1440`	`1436`	`}`
`1441`	`1437`	`if (delta_cacheable(src_size, trg_size, delta_size)) {`
`1442`		`- delta_cache_size += trg_entry->delta_size;`
	`1438`	`+ delta_cache_size += delta_size;`
`1443`	`1439`	`cache_unlock();`
`1444`	`1440`	`trg_entry->delta_data = xrealloc(delta_buf, delta_size);`
`1445`	`1441`	`} else {`
`1446`	`1442`	`cache_unlock();`
`1447`	`1443`	`free(delta_buf);`
`1448`	`1444`	`}`
`1449`	`1445`
	`1446`	`+ trg_entry->delta = src_entry;`
	`1447`	`+ trg_entry->delta_size = delta_size;`
	`1448`	`+ trg->depth = src->depth + 1;`
	`1449`	`+`
`1450`	`1450`	`return 1;`
`1451`	`1451`	`}`
`1452`	`1452`