development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'np/lookup-object-hashing'

Browse source 
Micro optimize hash function used in the object hash table.

* np/lookup-object-hashing:
  lookup_object: remove hashtable_index() and optimize hash_obj()
This commit is contained in:
Junio C Hamano 2013-09-20 12:30:49 -07:00
parent 08092082b7 9f36c9b7f7
commit 3fb9d685db
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
object.c
View file

@ -43,16 +43,17 @@ int type_from_string(const char *str)
die("invalid object type \"%s\"", str);
}
static unsigned int hash_obj(struct object *obj, unsigned int n)
static unsigned int hash_obj(const unsigned char *sha1, unsigned int n)
{
unsigned int hash;
memcpy(&hash, obj->sha1, sizeof(unsigned int));
return hash % n;
memcpy(&hash, sha1, sizeof(unsigned int));
/* Assumes power-of-2 hash sizes in grow_object_hash */
return hash & (n - 1);
}
static void insert_obj_hash(struct object *obj, struct object **hash, unsigned int size)
{
unsigned int j = hash_obj(obj, size);
unsigned int j = hash_obj(obj->sha1, size);
while (hash[j]) {
j++;
@ -62,13 +63,6 @@ static void insert_obj_hash(struct object *obj, struct object **hash, unsigned i
hash[j] = obj;
}
static unsigned int hashtable_index(const unsigned char *sha1)
{
unsigned int i;
memcpy(&i, sha1, sizeof(unsigned int));
return i % obj_hash_size;
}
struct object *lookup_object(const unsigned char *sha1)
{
unsigned int i, first;
@ -77,7 +71,7 @@ struct object *lookup_object(const unsigned char *sha1)
if (!obj_hash)
return NULL;
first = i = hashtable_index(sha1);
first = i = hash_obj(sha1, obj_hash_size);
while ((obj = obj_hash[i]) != NULL) {
if (!hashcmp(sha1, obj->sha1))
break;
@ -101,6 +95,10 @@ struct object *lookup_object(const unsigned char *sha1)
static void grow_object_hash(void)
{
int i;
/*
* Note that this size must always be power-of-2 to match hash_obj
* above.
*/
int new_hash_size = obj_hash_size < 32 ? 32 : 2 * obj_hash_size;
struct object **new_hash;