alema
/
ugui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more performant generic hash map

Browse Source
master
Alessandro Mauri 2 years ago
parent 6503897ece
commit 83a4d3b715
3 changed files with 44 additions and 54 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      text_rendering/font.c
  2. 10
      text_rendering/generic_cache.h
  3. 86
      text_rendering/generic_hash.h

2
text_rendering/font.c
Unescape View File

@ -19,7 +19,7 @@ static unsigned int hash(unsigned int code)
return (uint32_t)((uint64_t)(code*2654435761)>>32); return (uint32_t)((uint64_t)(code*2654435761)>>32);
} }
#include "generic_cache.h" #include "generic_cache.h"
CACHE_DECL(cache, struct font_glyph, hash, hash_cp_u32) CACHE_DECL(cache, struct font_glyph, hash, hash_cmp_u32)
#define UTF8(c) (c&0x80) #define UTF8(c) (c&0x80)

10
text_rendering/generic_cache.h
Unescape View File

@ -12,7 +12,7 @@
#define CACHE_BTEST(b, x) (b[(x)>>6]&((uint64_t)1<<((x)%64))) #define CACHE_BTEST(b, x) (b[(x)>>6]&((uint64_t)1<<((x)%64)))
// FIXME: this cache implementation is not really generic since it expects an unsigned // FIXME: this cache implementation is not really generic since it expects an unsigned
// as the code and not a generic type // as the code and not a generic type
#define CACHE_SET(c, x) \ #define CACHE_SET(c, x) \
{ \ { \
@ -22,8 +22,8 @@
} }
#define CACHE_DECL(cachename, type, hashfn, comparefn) \ #define CACHE_DECL(cachename, type, hashfn, cmpfn) \
HASH_DECL(cachename##table, unsigned int, void *) \ HASH_DECL(cachename##table, unsigned int, void *, hashfn, cmpfn) \
struct cachename { \ struct cachename { \
struct cachename##table_ref *table; \ struct cachename##table_ref *table; \
type *array; \ type *array; \
@ -34,9 +34,7 @@ struct cachename { \
\ \
struct cachename cachename##_init(void) \ struct cachename cachename##_init(void) \
{ \ { \
struct cachename##table_ref *t = cachename##table_create( \ struct cachename##table_ref *t = cachename##table_create(CACHE_SIZE); \
CACHE_SIZE, hashfn, comparefn \
); \
type *a = malloc(sizeof(type)*CACHE_SIZE); \ type *a = malloc(sizeof(type)*CACHE_SIZE); \
uint64_t *b = malloc(sizeof(uint64_t)*CACHE_BSIZE); \ uint64_t *b = malloc(sizeof(uint64_t)*CACHE_BSIZE); \
CACHE_BRESET(b); \ CACHE_BRESET(b); \

86
text_rendering/generic_hash.h
Unescape View File

@ -14,21 +14,21 @@
/* Ready-made compares */ /* Ready-made compares */
static int hash_cp_u32(unsigned int a, unsigned int b) { return a == b; } static inline int hash_cmp_u32(unsigned int a, unsigned int b) { return a == b; }
static int hash_cp_u64(unsigned long long int a, unsigned long long int b) { return a == b; } static inline int hash_cmp_u64(unsigned long long int a, unsigned long long int b) { return a == b; }
static int hash_cp_str(const char *a, const char *b) { return strcmp(a, b) == 0; } static inline int hash_cmp_str(const char *a, const char *b) { return strcmp(a, b) == 0; }
/* Ready-made hashes */ /* Ready-made hashes */
static unsigned int hash_u64(unsigned long long int c) static inline unsigned int hash_u64(unsigned long long int c)
{ {
return (unsigned long long int)((unsigned long long int)(c*HASH_RATIO64)>>32); return (unsigned long long int)((unsigned long long int)(c*HASH_RATIO64)>>32);
} }
static unsigned int hash_u32(unsigned int c) static inline unsigned int hash_u32(unsigned int c)
{ {
return (unsigned int)((unsigned long long int)(c*HASH_RATIO32)>>32); return (unsigned int)((unsigned long long int)(c*HASH_RATIO32)>>32);
} }
static unsigned int hash_str(const char *s) static inline unsigned int hash_str(const char *s)
{ {
unsigned int h = HASH_STRSALT; unsigned int h = HASH_STRSALT;
const unsigned char *v = (const unsigned char *)(s); const unsigned char *v = (const unsigned char *)(s);
@ -44,7 +44,7 @@ static unsigned int hash_str(const char *s)
} }
#define HASH_DECL(hashname, codetype, datatype) \ #define HASH_DECL(hashname, codetype, datatype, hashfn, cmpfn) \
struct hashname##_entry { \ struct hashname##_entry { \
codetype code; \ codetype code; \
datatype data; \ datatype data; \
@ -52,77 +52,69 @@ struct hashname##_entry { \
\ \
struct hashname##_ref { \ struct hashname##_ref { \
unsigned int items, size; \ unsigned int items, size; \
/* Function pointer to hash function */ \
unsigned int (*hash)(codetype); \
/* Compare codetype function, return true if equal */ \
int (*compare)(codetype, codetype); \
struct hashname##_entry bucket[]; \ struct hashname##_entry bucket[]; \
}; \ }; \
\ \
\ \
struct hashname##_ref * hashname##_create(unsigned int size, unsigned int (*hash)(codetype), int (*compare)(codetype, codetype)) \ struct hashname##_ref * hashname##_create(unsigned int size) \
{ \ { \
if (!size || size > HASH_MAXSIZE) \ if (!size || size > HASH_MAXSIZE) \
return NULL; \ return NULL; \
if (!hash || !compare) \
return NULL; \
/* round to the greater power of two */ \ /* round to the greater power of two */ \
/* FIXME: check for intger overflow here */ \ /* FIXME: check for intger overflow here */ \
size = 1<<__builtin_clz(size); \ size = 1<<__builtin_clz(size); \
/* FIXME: check for intger overflow here */ \ /* FIXME: check for intger overflow here */ \
struct hashname##_ref *h = malloc(sizeof(struct hashname##_ref)+sizeof(struct hashname##_entry)*size); \ struct hashname##_ref *ht = malloc(sizeof(struct hashname##_ref)+sizeof(struct hashname##_entry)*size); \
if (h) { \ if (ht) { \
h->items = 0; \ ht->items = 0; \
h->size = size; \ ht->size = size; \
h->hash = hash; \ memset(ht->bucket, 0, sizeof(struct hashname##_entry)*size); \
h->compare = compare; \
memset(h->bucket, 0, sizeof(struct hashname##_entry)*size); \
} \ } \
return h; \ return ht; \
} \ } \
\ \
\ \
void hashname##_destroy(struct hashname##_ref *hm) \ void hashname##_destroy(struct hashname##_ref *ht) \
{ \ { \
if (hm) \ if (ht) \
free(hm); \ free(ht); \
} \ } \
\ \
\ \
static struct hashname##_entry * hashname##lookup(struct hashname##_ref *hm, codetype code) \ static struct hashname##_entry * hashname##lookup(struct hashname##_ref *ht, codetype code) \
{ \ { \
if (!hm) \ if (!ht) \
return NULL; \ return NULL; \
/* fast modulo operation for power-of-2 size */ \ /* fast modulo operation for power-of-2 size */ \
unsigned int mask = hm->size - 1; \ unsigned int mask = ht->size - 1; \
unsigned int i = hm->hash(code); \ unsigned int i = hashfn(code); \
for (unsigned int j = 1; ; i += j++) { \ for (unsigned int j = 1; ; i += j++) { \
if (!hm->bucket[i&mask].code || hm->compare(hm->bucket[i].code, code)) \ if (!ht->bucket[i&mask].code || cmpfn(ht->bucket[i].code, code)) \
return &(hm->bucket[i&mask]); \ return &(ht->bucket[i&mask]); \
} \ } \
return NULL; \ return NULL; \
} \ } \
\ \
\ \
/* Find and return the element by code */ \ /* Find and return the element by code */ \
struct hashname##_entry * hashname##_search(struct hashname##_ref *hm, codetype code) \ struct hashname##_entry * hashname##_search(struct hashname##_ref *ht, codetype code) \
{ \ { \
if (!hm) \ if (!ht) \
return NULL; \ return NULL; \
struct hashname##_entry *r = hashname##lookup(hm, code); \ struct hashname##_entry *r = hashname##lookup(ht, code); \
if (r && hm->compare(r->code, code)) \ if (r && cmpfn(r->code, code)) \
return r; \ return r; \
return NULL; \ return NULL; \
} \ } \
\ \
\ \
/* FIXME: this simply overrides the found item */ \ /* FIXME: this simply overrides the found item */ \
struct hashname##_entry * hashname##_insert(struct hashname##_ref *hm, struct hashname##_entry *entry) \ struct hashname##_entry * hashname##_insert(struct hashname##_ref *ht, struct hashname##_entry *entry) \
{ \ { \
struct hashname##_entry *r = hashname##lookup(hm, entry->code); \ struct hashname##_entry *r = hashname##lookup(ht, entry->code); \
if (r) { \ if (r) { \
if (!r->code) \ if (!r->code) \
hm->items++; \ ht->items++; \
*r = *entry; \ *r = *entry; \
} \ } \
return r; \ return r; \
@ -130,23 +122,23 @@ struct hashname##_entry * hashname##_insert(struct hashname##_ref *hm, struct ha
\ \
\ \
/* returns the number of removed items */ \ /* returns the number of removed items */ \
int hashname##_remove(struct hashname##_ref *hm, codetype code) \ int hashname##_remove(struct hashname##_ref *ht, codetype code) \
{ \ { \
if (!hm) \ if (!ht) \
return -1; \ return -1; \
unsigned int mask = hm->size - 1; \ unsigned int mask = ht->size - 1; \
unsigned int s = hm->hash(code)&mask, inc = 0; \ unsigned int s = hashfn(code)&mask, inc = 0; \
struct hashname##_entry *r; \ struct hashname##_entry *r; \
/* Flag for removal */ \ /* Flag for removal */ \
while (hm->items > 0 && (r = hashname##lookup(hm, code)) && r->code) { \ while (ht->items > 0 && (r = hashname##lookup(ht, code)) && r->code) { \
/* FIXME: this cast may not work */ \ /* FIXME: this cast may not work */ \
r->code = (codetype)(-1); \ r->code = (codetype)(-1); \
hm->items--; \ ht->items--; \
} \ } \
/* Remove */ \ /* Remove */ \
for (unsigned int i = s; i < hm->items; i++) { \ for (unsigned int i = s; i < ht->items; i++) { \
if (hm->bucket[i].code == (codetype)(-1)) { \ if (ht->bucket[i].code == (codetype)(-1)) { \
hm->bucket[i] = (struct hashname##_entry){0}; \ ht->bucket[i] = (struct hashname##_entry){0}; \
inc++; \ inc++; \
} \ } \
} \ } \

Write Preview
Loading…
Cancel
Save