mirror of
https://github.com/git/git.git
synced 2024-11-24 18:33:43 +08:00
clean up the delta base cache size a bit
Currently there are 3 different ways to deal with the cache size. Let's stick to only one. The compiler is smart enough to produce the exact same code in those cases anyway. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
ceb8442af7
commit
3358004a00
@ -1369,7 +1369,7 @@ static unsigned long pack_entry_hash(struct packed_git *p, off_t base_offset)
|
||||
|
||||
hash = (unsigned long)p + (unsigned long)base_offset;
|
||||
hash += (hash >> 8) + (hash >> 16);
|
||||
return hash & 0xff;
|
||||
return hash % MAX_DELTA_CACHE;
|
||||
}
|
||||
|
||||
static void *cache_or_unpack_entry(struct packed_git *p, off_t base_offset,
|
||||
@ -1417,13 +1417,13 @@ static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
|
||||
release_delta_base_cache(ent);
|
||||
delta_base_cached += base_size;
|
||||
for (i = 0; delta_base_cached > delta_base_cache_limit
|
||||
&& i < ARRAY_SIZE(delta_base_cache); i++) {
|
||||
&& i < MAX_DELTA_CACHE ; i++) {
|
||||
struct delta_base_cache_entry *f = delta_base_cache + i;
|
||||
if (f->type == OBJ_BLOB)
|
||||
release_delta_base_cache(f);
|
||||
}
|
||||
for (i = 0; delta_base_cached > delta_base_cache_limit
|
||||
&& i < ARRAY_SIZE(delta_base_cache); i++)
|
||||
&& i < MAX_DELTA_CACHE ; i++)
|
||||
release_delta_base_cache(delta_base_cache + i);
|
||||
|
||||
ent->p = p;
|
||||
|
Loading…
Reference in New Issue
Block a user