Merge pull request #10767 from donaldsharp/some_fixes

[mirror_frr.git] / lib / qobj.c

diff --git a/lib/qobj.c b/lib/qobj.c
index c3f1a27c8213cfc1bbbe400e782b275d5f34c9bd..c6cb36c058b3b052d46938303947069a4eb4cfb2 100644 (file)
--- a/lib/qobj.c
+++ b/lib/qobj.c
@@ -26,38 +26,45 @@
 #include "log.h"
 #include "qobj.h"
 #include "jhash.h"
+#include "network.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 int 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;
 }
 
-void qobj_reg(struct qobj_node *node, struct qobj_nodetype *type)
+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, const struct qobj_nodetype *type)
 {
        node->type = type;
        pthread_rwlock_wrlock(&nodes_lock);
        do {
-               node->nid = (uint64_t)random();
-               node->nid ^= (uint64_t)random() << 32;
-       } while (!node->nid
-                || hash_get(nodes, node, hash_alloc_intern) != node);
+               node->nid = (uint64_t)frr_weak_random();
+               node->nid ^= (uint64_t)frr_weak_random() << 32;
+       } 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,19 +72,19 @@ 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;
 }
 
-void *qobj_get_typed(uint64_t id, struct qobj_nodetype *type)
+void *qobj_get_typed(uint64_t id, const struct qobj_nodetype *type)
 {
        struct qobj_node dummy = {.nid = id};
        struct qobj_node *node;
        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 +103,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);
 }