lib: use DECLARE_HASH for qobj hash

This changes the qobj node ID hash to use the new typed hash instead of
the old hash_* code.

Signed-off-by: David Lamparter <equinox@diac24.net>

2 files changed, 32 insertions, 21 deletions

diff --git a/lib/qobj.c b/lib/qobj.c
index 811645f3c3..3e3860a96a 100644
--- a/lib/qobj.c
+++ b/lib/qobj.c
@@ -27,21 +27,27 @@
 #include "qobj.h"
 #include "jhash.h"
 
-static pthread_rwlock_t nodes_lock;
-static struct hash *nodes = NULL;
-
-static unsigned int qobj_key(void *data)
+static uint32_t qobj_hash(const struct qobj_node *node)
 {
-	struct qobj_node *node = data;
-	return (unsigned int)node->nid;
+	return (uint32_t)node->nid;
 }
 
-static bool qobj_cmp(const void *a, const void *b)
+static int qobj_cmp(const struct qobj_node *na, const struct qobj_node *nb)
 {
-	const struct qobj_node *na = a, *nb = b;
-	return na->nid == nb->nid;
+	if (na->nid < nb->nid)
+		return -1;
+	if (na->nid > nb->nid)
+		return 1;
+	return 0;
 }
 
+DECLARE_HASH(qobj_nodes, struct qobj_node, nodehash,
+			qobj_cmp, qobj_hash)
+
+static pthread_rwlock_t nodes_lock;
+static struct qobj_nodes_head nodes = { };
+
+
 void qobj_reg(struct qobj_node *node, struct qobj_nodetype *type)
 {
 	node->type = type;
@@ -49,15 +55,15 @@ void qobj_reg(struct qobj_node *node, struct qobj_nodetype *type)
 	do {
 		node->nid = (uint64_t)random();
 		node->nid ^= (uint64_t)random() << 32;
-	} while (!node->nid
-		 || hash_get(nodes, node, hash_alloc_intern) != node);
+	} while (!node->nid || qobj_nodes_find(&nodes, node));
+	qobj_nodes_add(&nodes, node);
 	pthread_rwlock_unlock(&nodes_lock);
 }
 
 void qobj_unreg(struct qobj_node *node)
 {
 	pthread_rwlock_wrlock(&nodes_lock);
-	hash_release(nodes, node);
+	qobj_nodes_del(&nodes, node);
 	pthread_rwlock_unlock(&nodes_lock);
 }
 
@@ -65,7 +71,7 @@ struct qobj_node *qobj_get(uint64_t id)
 {
 	struct qobj_node dummy = {.nid = id}, *rv;
 	pthread_rwlock_rdlock(&nodes_lock);
-	rv = hash_lookup(nodes, &dummy);
+	rv = qobj_nodes_find(&nodes, &dummy);
 	pthread_rwlock_unlock(&nodes_lock);
 	return rv;
 }
@@ -77,7 +83,7 @@ void *qobj_get_typed(uint64_t id, struct qobj_nodetype *type)
 	void *rv;
 
 	pthread_rwlock_rdlock(&nodes_lock);
-	node = hash_lookup(nodes, &dummy);
+	node = qobj_nodes_find(&nodes, &dummy);
 
 	/* note: we explicitly hold the lock until after we have checked the
 	 * type.
@@ -96,16 +102,14 @@ void *qobj_get_typed(uint64_t id, struct qobj_nodetype *type)
 
 void qobj_init(void)
 {
-	if (!nodes) {
-		pthread_rwlock_init(&nodes_lock, NULL);
-		nodes = hash_create_size(16, qobj_key, qobj_cmp, "QOBJ Hash");
-	}
+	pthread_rwlock_init(&nodes_lock, NULL);
+	qobj_nodes_init(&nodes);
 }
 
 void qobj_finish(void)
 {
-	hash_clean(nodes, NULL);
-	hash_free(nodes);
-	nodes = NULL;
+	struct qobj_node *node;
+	while ((node = qobj_nodes_pop(&nodes)))
+		qobj_nodes_del(&nodes, node);
 	pthread_rwlock_destroy(&nodes_lock);
 }
diff --git a/lib/qobj.h b/lib/qobj.h
index d63988cbab..415eae02ef 100644
--- a/lib/qobj.h
+++ b/lib/qobj.h
@@ -21,6 +21,8 @@
 #include <stdlib.h>
 #include <stddef.h>
 
+#include "typesafe.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -69,6 +71,8 @@ struct qobj_nodetype_capnp {
 };
 #endif
 
+#include "typesafe.h"
+
 /* each different kind of object will have a global variable of this type,
  * which can be used by various other pieces to store type-related bits.
  * type equality can be tested as pointer equality. (cf. QOBJ_GET_TYPESAFE)
@@ -79,9 +83,12 @@ struct qobj_nodetype {
 	RESERVED_SPACE_STRUCT(qobj_nodetype_capnp, capnp, 256)
 };
 
+PREDECL_HASH(qobj_nodes)
+
 /* anchor to be embedded somewhere in the object's struct */
 struct qobj_node {
 	uint64_t nid;
+	struct qobj_nodes_item nodehash;
 	struct qobj_nodetype *type;
 };