Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some minor improvements to the flushing code to try to make it
[rsync/rsync.git]
/
hashtable.c
diff --git
a/hashtable.c
b/hashtable.c
index
c5ba0f5
..
1775a0b
100644
(file)
--- a/
hashtable.c
+++ b/
hashtable.c
@@
-1,7
+1,7
@@
/*
* Routines to provide a memory-efficient hashtable.
*
/*
* Routines to provide a memory-efficient hashtable.
*
- * Copyright (C) 2007 Wayne Davison
+ * Copyright (C) 2007
-2008
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-41,7
+41,7
@@
struct hashtable *hashtable_create(int size, int key64)
tbl->size = size;
tbl->entries = 0;
tbl->node_size = node_size;
tbl->size = size;
tbl->entries = 0;
tbl->node_size = node_size;
- tbl->key64 = key64;
+ tbl->key64 =
(short)
key64;
return tbl;
}
return tbl;
}
@@
-104,7
+104,9
@@
void *hashtable_find(struct hashtable *tbl, int64 key, int allocate_if_missing)
a = b = c = 0xdeadbeef + (8 << 2);
#define rot(x,k) (((x)<<(k)) ^ ((x)>>(32-(k))))
a = b = c = 0xdeadbeef + (8 << 2);
#define rot(x,k) (((x)<<(k)) ^ ((x)>>(32-(k))))
+#if SIZEOF_INT64 >= 8
b += (uint32)(key >> 32);
b += (uint32)(key >> 32);
+#endif
a += (uint32)key;
c ^= b; c -= rot(b, 14);
a ^= c; a -= rot(c, 11);
a += (uint32)key;
c ^= b; c -= rot(b, 14);
a ^= c; a -= rot(c, 11);
@@
-140,7
+142,7
@@
void *hashtable_find(struct hashtable *tbl, int64 key, int allocate_if_missing)
if (key64)
((struct ht_int64_node*)node)->key = key;
else
if (key64)
((struct ht_int64_node*)node)->key = key;
else
- node->key = key;
+ node->key =
(int32)
key;
tbl->entries++;
return node;
}
tbl->entries++;
return node;
}