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

Refactor parts of in_delta_base_cache/cache_or_unpack_entry

Browse Source 
The delta base cache lookup and test were shared.  Refactor them;
we'll need both parts again.  Also, we'll use the clearing routine
later.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Thomas Rast 2013-03-27 21:03:41 +01:00 committed by Junio C Hamano
parent 790d96c023
commit 84dd81c126
1 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sha1_file.c
View File

@ -1756,32 +1756,51 @@ static unsigned long pack_entry_hash(struct packed_git *p, off_t base_offset)
return hash % MAX_DELTA_CACHE; return hash % MAX_DELTA_CACHE;
} }
static int in_delta_base_cache(struct packed_git *p, off_t base_offset) static struct delta_base_cache_entry *
get_delta_base_cache_entry(struct packed_git *p, off_t base_offset)
{ {
unsigned long hash = pack_entry_hash(p, base_offset); unsigned long hash = pack_entry_hash(p, base_offset);
struct delta_base_cache_entry *ent = delta_base_cache + hash; return delta_base_cache + hash;
}
static int eq_delta_base_cache_entry(struct delta_base_cache_entry *ent,
struct packed_git *p, off_t base_offset)
{
return (ent->data && ent->p == p && ent->base_offset == base_offset); return (ent->data && ent->p == p && ent->base_offset == base_offset);
} }
static int in_delta_base_cache(struct packed_git *p, off_t base_offset)
{
struct delta_base_cache_entry *ent;
ent = get_delta_base_cache_entry(p, base_offset);
return eq_delta_base_cache_entry(ent, p, base_offset);
}
static void clear_delta_base_cache_entry(struct delta_base_cache_entry *ent)
{
ent->data = NULL;
ent->lru.next->prev = ent->lru.prev;
ent->lru.prev->next = ent->lru.next;
delta_base_cached -= ent->size;
}
static void *cache_or_unpack_entry(struct packed_git *p, off_t base_offset, static void *cache_or_unpack_entry(struct packed_git *p, off_t base_offset,
unsigned long *base_size, enum object_type *type, int keep_cache) unsigned long *base_size, enum object_type *type, int keep_cache)
{ {
struct delta_base_cache_entry *ent;
void *ret; void *ret;
unsigned long hash = pack_entry_hash(p, base_offset);
struct delta_base_cache_entry *ent = delta_base_cache + hash;
ret = ent->data; ent = get_delta_base_cache_entry(p, base_offset);
if (!ret || ent->p != p || ent->base_offset != base_offset)
if (!eq_delta_base_cache_entry(ent, p, base_offset))
return unpack_entry(p, base_offset, type, base_size); return unpack_entry(p, base_offset, type, base_size);
if (!keep_cache) { ret = ent->data;
ent->data = NULL;
ent->lru.next->prev = ent->lru.prev; if (!keep_cache)
ent->lru.prev->next = ent->lru.next; clear_delta_base_cache_entry(ent);
delta_base_cached -= ent->size; else
} else {
ret = xmemdupz(ent->data, ent->size); ret = xmemdupz(ent->data, ent->size);
}
*type = ent->type; *type = ent->type;
*base_size = ent->size; *base_size = ent->size;
return ret; return ret;