diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-18 04:36:04 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-18 04:36:04 +0400 |
commit | fbb446dff620c0719fd77692a0d401203ef1e966 (patch) | |
tree | c95104990f0da56ad6c5cd1d5ca4fb1ac4f277e7 /source/blender/blenlib/intern | |
parent | 763bce4d64eeed978c6e84212da0f9c59ed32a4d (diff) |
add assert for hashes if an existing element is ever inserted into a ghash/edgehash.
the outliner does this intentionally, so add a flag to allow this situation optionally.
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/BLI_ghash.c | 37 | ||||
-rw-r--r-- | source/blender/blenlib/intern/edgehash.c | 15 |
2 files changed, 50 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index 14dfbcffebe..50d52a299a7 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -62,6 +62,27 @@ const unsigned int hashsizes[] = { /***/ +typedef struct Entry { + struct Entry *next; + + void *key, *val; +} Entry; + +typedef struct GHash { + GHashHashFP hashfp; + GHashCmpFP cmpfp; + + Entry **buckets; + struct BLI_mempool *entrypool; + unsigned int nbuckets; + unsigned int nentries; + unsigned short cursize, flag; +} GHash; + + +/* -------------------------------------------------------------------- */ +/* GHash API */ + GHash *BLI_ghash_new(GHashHashFP hashfp, GHashCmpFP cmpfp, const char *info) { GHash *gh = MEM_mallocN(sizeof(*gh), info); @@ -88,6 +109,8 @@ void BLI_ghash_insert(GHash *gh, void *key, void *val) unsigned int hash = gh->hashfp(key) % gh->nbuckets; Entry *e = (Entry *)BLI_mempool_alloc(gh->entrypool); + BLI_assert((gh->flag & GHASH_FLAG_ALLOW_DUPES) || (BLI_ghash_haskey(gh, key) == 0)); + e->next = gh->buckets[hash]; e->key = key; e->val = val; @@ -252,7 +275,19 @@ void BLI_ghash_free(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreef MEM_freeN(gh); } -/***/ +void BLI_ghash_flag_set(GHash *gh, unsigned short flag) +{ + gh->flag |= flag; +} + +void BLI_ghash_flag_clear(GHash *gh, unsigned short flag) +{ + gh->flag &= (unsigned short)~flag; +} + + +/* -------------------------------------------------------------------- */ +/* GHash Iterator API */ GHashIterator *BLI_ghashIterator_new(GHash *gh) { diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c index a3360921ee4..d3ce9bb4857 100644 --- a/source/blender/blenlib/intern/edgehash.c +++ b/source/blender/blenlib/intern/edgehash.c @@ -76,7 +76,8 @@ struct EdgeEntry { struct EdgeHash { EdgeEntry **buckets; BLI_mempool *epool; - unsigned int nbuckets, nentries, cursize; + unsigned int nbuckets, nentries; + unsigned short cursize, flag; }; /***/ @@ -100,6 +101,8 @@ void BLI_edgehash_insert(EdgeHash *eh, unsigned int v0, unsigned int v1, void *v unsigned int hash; EdgeEntry *e = BLI_mempool_alloc(eh->epool); + BLI_assert((eh->flag & EDGEHASH_FLAG_ALLOW_DUPES) || (BLI_edgehash_haskey(eh, v0, v1) == 0)); + /* this helps to track down errors with bad edge data */ BLI_assert(v0 != v1); @@ -199,6 +202,16 @@ void BLI_edgehash_free(EdgeHash *eh, EdgeHashFreeFP valfreefp) } +void BLI_edgehash_flag_set(EdgeHash *eh, unsigned short flag) +{ + eh->flag |= flag; +} + +void BLI_edgehash_flag_clear(EdgeHash *eh, unsigned short flag) +{ + eh->flag &= (unsigned short)~flag; +} + /***/ struct EdgeHashIterator { |