htable: add allocator hooks.

[ccan] / ccan / htable / htable.c

diff --git a/ccan/htable/htable.c b/ccan/htable/htable.c
index e1d13699ea85811fe2f61adbb1ce4eca942406c8..e6dc4fd817f886fa2676d0cefd9774f0fd9a690a 100644 (file)
--- a/ccan/htable/htable.c
+++ b/ccan/htable/htable.c
@@ -2,6 +2,7 @@
 #include <ccan/htable/htable.h>
 #include <ccan/compiler/compiler.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <assert.h>
@@ -10,6 +11,30 @@
 /* We use 0x1 as deleted marker. */
 #define HTABLE_DELETED (0x1)
 
+static void *htable_default_alloc(struct htable *ht, size_t len)
+{
+       return calloc(len, 1);
+}
+
+static void htable_default_free(struct htable *ht, void *p)
+{
+       free(p);
+}
+
+static void *(*htable_alloc)(struct htable *, size_t) = htable_default_alloc;
+static void (*htable_free)(struct htable *, void *) = htable_default_free;
+
+void htable_set_allocator(void *(*alloc)(struct htable *, size_t len),
+                         void (*free)(struct htable *, void *p))
+{
+       if (!alloc)
+               alloc = htable_default_alloc;
+       if (!free)
+               free = htable_default_free;
+       htable_alloc = alloc;
+       htable_free = free;
+}
+
 /* We clear out the bits which are always the same, and put metadata there. */
 static inline uintptr_t get_extra_ptr_bits(const struct htable *ht,
                                           uintptr_t e)
@@ -72,25 +97,26 @@ bool htable_init_sized(struct htable *ht,
                        break;
        }
 
-       ht->table = calloc(1 << ht->bits, sizeof(size_t));
+       ht->table = htable_alloc(ht, sizeof(size_t) << ht->bits);
        if (!ht->table) {
                ht->table = &ht->perfect_bit;
                return false;
        }
        htable_adjust_capacity(ht);
+       (void)htable_debug(ht, HTABLE_LOC);
        return true;
 }
        
 void htable_clear(struct htable *ht)
 {
        if (ht->table != &ht->perfect_bit)
-               free((void *)ht->table);
+               htable_free(ht, (void *)ht->table);
        htable_init(ht, ht->rehash, ht->priv);
 }
 
-bool htable_copy(struct htable *dst, const struct htable *src)
+bool htable_copy_(struct htable *dst, const struct htable *src)
 {
-       uintptr_t *htable = malloc(sizeof(size_t) << src->bits);
+       uintptr_t *htable = htable_alloc(dst, sizeof(size_t) << src->bits);
 
        if (!htable)
                return false;
@@ -122,21 +148,21 @@ static void *htable_val(const struct htable *ht,
        return NULL;
 }
 
-void *htable_firstval(const struct htable *ht,
-                     struct htable_iter *i, size_t hash)
+void *htable_firstval_(const struct htable *ht,
+                      struct htable_iter *i, size_t hash)
 {
        i->off = hash_bucket(ht, hash);
        return htable_val(ht, i, hash, ht->perfect_bit);
 }
 
-void *htable_nextval(const struct htable *ht,
-                    struct htable_iter *i, size_t hash)
+void *htable_nextval_(const struct htable *ht,
+                     struct htable_iter *i, size_t hash)
 {
        i->off = (i->off + 1) & ((1 << ht->bits)-1);
        return htable_val(ht, i, hash, 0);
 }
 
-void *htable_first(const struct htable *ht, struct htable_iter *i)
+void *htable_first_(const struct htable *ht, struct htable_iter *i)
 {
        for (i->off = 0; i->off < (size_t)1 << ht->bits; i->off++) {
                if (entry_is_valid(ht->table[i->off]))
@@ -145,7 +171,7 @@ void *htable_first(const struct htable *ht, struct htable_iter *i)
        return NULL;
 }
 
-void *htable_next(const struct htable *ht, struct htable_iter *i)
+void *htable_next_(const struct htable *ht, struct htable_iter *i)
 {
        for (i->off++; i->off < (size_t)1 << ht->bits; i->off++) {
                if (entry_is_valid(ht->table[i->off]))
@@ -154,7 +180,7 @@ void *htable_next(const struct htable *ht, struct htable_iter *i)
        return NULL;
 }
 
-void *htable_prev(const struct htable *ht, struct htable_iter *i)
+void *htable_prev_(const struct htable *ht, struct htable_iter *i)
 {
        for (;;) {
                if (!i->off)
@@ -187,7 +213,7 @@ static COLD bool double_table(struct htable *ht)
        uintptr_t *oldtable, e;
 
        oldtable = ht->table;
-       ht->table = calloc(1 << (ht->bits+1), sizeof(size_t));
+       ht->table = htable_alloc(ht, sizeof(size_t) << (ht->bits+1));
        if (!ht->table) {
                ht->table = oldtable;
                return false;
@@ -212,9 +238,11 @@ static COLD bool double_table(struct htable *ht)
                                ht_add(ht, p, ht->rehash(p, ht->priv));
                        }
                }
-               free(oldtable);
+               htable_free(ht, oldtable);
        }
        ht->deleted = 0;
+
+       (void)htable_debug(ht, HTABLE_LOC);
        return true;
 }
 
@@ -240,6 +268,7 @@ static COLD void rehash_table(struct htable *ht)
                }
        }
        ht->deleted = 0;
+       (void)htable_debug(ht, HTABLE_LOC);
 }
 
 /* We stole some bits, now we need to put them back... */
@@ -261,6 +290,7 @@ static COLD void update_common(struct htable *ht, const void *p)
                ht->common_mask = ~((uintptr_t)1 << i);
                ht->common_bits = ((uintptr_t)p & ht->common_mask);
                ht->perfect_bit = 1;
+               (void)htable_debug(ht, HTABLE_LOC);
                return;
        }
 
@@ -283,9 +313,10 @@ static COLD void update_common(struct htable *ht, const void *p)
        ht->common_mask &= ~maskdiff;
        ht->common_bits &= ~maskdiff;
        ht->perfect_bit &= ~maskdiff;
+       (void)htable_debug(ht, HTABLE_LOC);
 }
 
-bool htable_add(struct htable *ht, size_t hash, const void *p)
+bool htable_add_(struct htable *ht, size_t hash, const void *p)
 {
        if (ht->elems+1 > ht->max && !double_table(ht))
                return false;
@@ -300,7 +331,7 @@ bool htable_add(struct htable *ht, size_t hash, const void *p)
        return true;
 }
 
-bool htable_del(struct htable *ht, size_t h, const void *p)
+bool htable_del_(struct htable *ht, size_t h, const void *p)
 {
        struct htable_iter i;
        void *c;
@@ -314,7 +345,7 @@ bool htable_del(struct htable *ht, size_t h, const void *p)
        return false;
 }
 
-void htable_delval(struct htable *ht, struct htable_iter *i)
+void htable_delval_(struct htable *ht, struct htable_iter *i)
 {
        assert(i->off < (size_t)1 << ht->bits);
        assert(entry_is_valid(ht->table[i->off]));
@@ -323,3 +354,53 @@ void htable_delval(struct htable *ht, struct htable_iter *i)
        ht->table[i->off] = HTABLE_DELETED;
        ht->deleted++;
 }
+
+struct htable *htable_check(const struct htable *ht, const char *abortstr)
+{
+       void *p;
+       struct htable_iter i;
+       size_t n = 0;
+
+       /* Use non-DEBUG versions here, to avoid infinite recursion with
+        * CCAN_HTABLE_DEBUG! */
+       for (p = htable_first_(ht, &i); p; p = htable_next_(ht, &i)) {
+               struct htable_iter i2;
+               void *c;
+               size_t h = ht->rehash(p, ht->priv);
+               bool found = false;
+
+               n++;
+
+               /* Open-code htable_get to avoid CCAN_HTABLE_DEBUG */
+               for (c = htable_firstval_(ht, &i2, h);
+                    c;
+                    c = htable_nextval_(ht, &i2, h)) {
+                       if (c == p) {
+                               found = true;
+                               break;
+                       }
+               }
+
+               if (!found) {
+                       if (abortstr) {
+                               fprintf(stderr,
+                                       "%s: element %p in position %zu"
+                                       " cannot find itself\n",
+                                       abortstr, p, i.off);
+                               abort();
+                       }
+                       return NULL;
+               }
+       }
+       if (n != ht->elems) {
+               if (abortstr) {
+                       fprintf(stderr,
+                               "%s: found %zu elems, expected %zu\n",
+                               abortstr, n, ht->elems);
+                       abort();
+               }
+               return NULL;
+       }
+
+       return (struct htable *)ht;
+}