Merge pull request #5473 from yasuhiro-ohara-ntt/ospf6d-self-orig-maxage-fix

[mirror_frr.git] / lib / qobj.c

diff --git a/lib/qobj.c b/lib/qobj.c
index 4cf7fbca7b2850b3324b155f7d775589feeaee9a..1e48b541dc07db950c0c375773ae1e2d61ddd783 100644 (file)
--- a/lib/qobj.c
+++ b/lib/qobj.c
@@ -25,86 +25,91 @@
 #include "hash.h"
 #include "log.h"
 #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 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);
-  pthread_rwlock_unlock (&nodes_lock);
+       node->type = type;
+       pthread_rwlock_wrlock(&nodes_lock);
+       do {
+               node->nid = (uint64_t)random();
+               node->nid ^= (uint64_t)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);
-  pthread_rwlock_unlock (&nodes_lock);
+       pthread_rwlock_wrlock(&nodes_lock);
+       qobj_nodes_del(&nodes, node);
+       pthread_rwlock_unlock(&nodes_lock);
 }
 
 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);
-  pthread_rwlock_unlock (&nodes_lock);
-  return rv;
+       struct qobj_node dummy = {.nid = id}, *rv;
+       pthread_rwlock_rdlock(&nodes_lock);
+       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);
-
-  /* note: we explicitly hold the lock until after we have checked the type.
-   * if the caller holds a lock that for example prevents the deletion of
-   * route-maps, we can still race against a delete of something that isn't
-   * a route-map. */
-  if (!node || node->type != type)
-    rv = NULL;
-  else
-    rv = (char *)node - node->type->node_member_offset;
-
-  pthread_rwlock_unlock (&nodes_lock);
-  return rv;
+       struct qobj_node dummy = {.nid = id};
+       struct qobj_node *node;
+       void *rv;
+
+       pthread_rwlock_rdlock(&nodes_lock);
+       node = qobj_nodes_find(&nodes, &dummy);
+
+       /* note: we explicitly hold the lock until after we have checked the
+        * type.
+        * if the caller holds a lock that for example prevents the deletion of
+        * route-maps, we can still race against a delete of something that
+        * isn't
+        * a route-map. */
+       if (!node || node->type != type)
+               rv = NULL;
+       else
+               rv = (char *)node - node->type->node_member_offset;
+
+       pthread_rwlock_unlock(&nodes_lock);
+       return rv;
 }
 
-void qobj_init (void)
+void qobj_init(void)
 {
-  if (!nodes)
-    {
-      pthread_rwlock_init (&nodes_lock, NULL);
-      nodes = hash_create (qobj_key, qobj_cmp);
-    }
+       pthread_rwlock_init(&nodes_lock, NULL);
+       qobj_nodes_init(&nodes);
 }
 
-void qobj_finish (void)
+void qobj_finish(void)
 {
-  hash_clean (nodes, NULL);
-  hash_free (nodes);
-  nodes = NULL;
-  pthread_rwlock_destroy (&nodes_lock);
+       struct qobj_node *node;
+       while ((node = qobj_nodes_pop(&nodes)))
+               qobj_nodes_del(&nodes, node);
+       pthread_rwlock_destroy(&nodes_lock);
 }