diff options
| author | 2016-05-12 02:32:55 +0200 | |
|---|---|---|
| committer | 2016-05-12 02:32:55 +0200 | |
| commit | 2af7318239c59555869d018bc355fe0e21d900c6 (patch) | |
| tree | 3b366f10c04d305c9bd72e31e28ca62596ba07dd /src/hashtable.c | |
| parent | 6ab7e301f1854fd18891ddfeaa64e7485be990ba (diff) | |
| download | libplist-2af7318239c59555869d018bc355fe0e21d900c6.tar.gz libplist-2af7318239c59555869d018bc355fe0e21d900c6.tar.bz2 | |
bplist: Speed up plist_to_bin conversion for large plists
Using a better hashing algorithm and a larger hash table the conversion
is A LOT faster when processing large plists. Thanks to Xiao Deng for
reporting this issue and suggesting a fix.
Diffstat (limited to 'src/hashtable.c')
| -rw-r--r-- | src/hashtable.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/hashtable.c b/src/hashtable.c index 08ff934..3568f3c 100644 --- a/src/hashtable.c +++ b/src/hashtable.c | |||
| @@ -24,7 +24,7 @@ hashtable_t* hash_table_new(hash_func_t hash_func, compare_func_t compare_func) | |||
| 24 | { | 24 | { |
| 25 | hashtable_t* ht = (hashtable_t*)malloc(sizeof(hashtable_t)); | 25 | hashtable_t* ht = (hashtable_t*)malloc(sizeof(hashtable_t)); |
| 26 | int i; | 26 | int i; |
| 27 | for (i = 0; i < 256; i++) { | 27 | for (i = 0; i < 4096; i++) { |
| 28 | ht->entries[i] = NULL; | 28 | ht->entries[i] = NULL; |
| 29 | } | 29 | } |
| 30 | ht->count = 0; | 30 | ht->count = 0; |
| @@ -38,7 +38,7 @@ void hash_table_destroy(hashtable_t *ht) | |||
| 38 | if (!ht) return; | 38 | if (!ht) return; |
| 39 | 39 | ||
| 40 | int i = 0; | 40 | int i = 0; |
| 41 | for (i = 0; i < 256; i++) { | 41 | for (i = 0; i < 4096; i++) { |
| 42 | if (ht->entries[i]) { | 42 | if (ht->entries[i]) { |
| 43 | hashentry_t* e = ht->entries[i]; | 43 | hashentry_t* e = ht->entries[i]; |
| 44 | while (e) { | 44 | while (e) { |
| @@ -58,7 +58,7 @@ void hash_table_insert(hashtable_t* ht, void *key, void *value) | |||
| 58 | 58 | ||
| 59 | unsigned int hash = ht->hash_func(key); | 59 | unsigned int hash = ht->hash_func(key); |
| 60 | 60 | ||
| 61 | int idx0 = hash & 0xFF; | 61 | int idx0 = hash & 0xFFF; |
| 62 | 62 | ||
| 63 | // get the idx0 list | 63 | // get the idx0 list |
| 64 | hashentry_t* e = ht->entries[idx0]; | 64 | hashentry_t* e = ht->entries[idx0]; |
| @@ -93,7 +93,7 @@ void* hash_table_lookup(hashtable_t* ht, void *key) | |||
| 93 | if (!ht || !key) return NULL; | 93 | if (!ht || !key) return NULL; |
| 94 | unsigned int hash = ht->hash_func(key); | 94 | unsigned int hash = ht->hash_func(key); |
| 95 | 95 | ||
| 96 | int idx0 = hash & 0xFF; | 96 | int idx0 = hash & 0xFFF; |
| 97 | 97 | ||
| 98 | hashentry_t* e = ht->entries[idx0]; | 98 | hashentry_t* e = ht->entries[idx0]; |
| 99 | while (e) { | 99 | while (e) { |
