X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Fhashtable.c;h=ac765808f9e804b80db20998b3892ba72d130085;hb=3afa94aeca5a0daae40fd7b6cc96b7e4c150c7d8;hp=f449fab8bd6dabab89302b86c9222d0569fc5cf6;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;p=lttng-tools.git

diff --git a/src/common/hashtable/hashtable.c b/src/common/hashtable/hashtable.c
index f449fab8b..ac765808f 100644
--- a/src/common/hashtable/hashtable.c
+++ b/src/common/hashtable/hashtable.c
@@ -6,7 +6,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <string.h>
 #include <urcu.h>
 #include <urcu/compiler.h>
@@ -76,10 +75,27 @@ static int match_two_u64(struct cds_lfht_node *node, const void *key)
 	return hash_match_key_two_u64((void *) &match_node->key, (void *) key);
 }
 
+static inline
+const char *lttng_ht_type_str(enum lttng_ht_type type)
+{
+	switch (type) {
+	case LTTNG_HT_TYPE_STRING:
+		return "STRING";
+	case LTTNG_HT_TYPE_ULONG:
+		return "ULONG";
+	case LTTNG_HT_TYPE_U64:
+		return "U64";
+	case LTTNG_HT_TYPE_TWO_U64:
+		return "TWO_U64";
+	default:
+		ERR("Unknown lttng hashtable type %d", type);
+		abort();
+	}
+}
+
 /*
  * Return an allocated lttng hashtable.
  */
-LTTNG_HIDDEN
 struct lttng_ht *lttng_ht_new(unsigned long size, int type)
 {
 	struct lttng_ht *ht;
@@ -107,7 +123,7 @@ struct lttng_ht *lttng_ht_new(unsigned long size, int type)
 	 * There is already an assert in the RCU hashtable code so if the ht is
 	 * NULL here there is a *huge* problem.
 	 */
-	assert(ht->ht);
+	LTTNG_ASSERT(ht->ht);
 
 	switch (type) {
 	case LTTNG_HT_TYPE_STRING:
@@ -132,7 +148,8 @@ struct lttng_ht *lttng_ht_new(unsigned long size, int type)
 		goto error;
 	}
 
-	DBG3("Created hashtable size %lu at %p of type %d", size, ht->ht, type);
+	DBG3("Created hashtable size %lu at %p of type %s", size, ht->ht,
+			lttng_ht_type_str(type));
 
 	return ht;
 
@@ -143,23 +160,21 @@ error:
 /*
  * Free a lttng hashtable.
  */
-LTTNG_HIDDEN
 void lttng_ht_destroy(struct lttng_ht *ht)
 {
 	int ret;
 
 	ret = cds_lfht_destroy(ht->ht, NULL);
-	assert(!ret);
+	LTTNG_ASSERT(!ret);
 	free(ht);
 }
 
 /*
  * Init lttng ht node string.
  */
-LTTNG_HIDDEN
 void lttng_ht_node_init_str(struct lttng_ht_node_str *node, char *key)
 {
-	assert(node);
+	LTTNG_ASSERT(node);
 
 	node->key = key;
 	cds_lfht_node_init(&node->node);
@@ -168,11 +183,10 @@ void lttng_ht_node_init_str(struct lttng_ht_node_str *node, char *key)
 /*
  * Init lttng ht node unsigned long.
  */
-LTTNG_HIDDEN
 void lttng_ht_node_init_ulong(struct lttng_ht_node_ulong *node,
 		unsigned long key)
 {
-	assert(node);
+	LTTNG_ASSERT(node);
 
 	node->key = key;
 	cds_lfht_node_init(&node->node);
@@ -181,11 +195,10 @@ void lttng_ht_node_init_ulong(struct lttng_ht_node_ulong *node,
 /*
  * Init lttng ht node uint64_t.
  */
-LTTNG_HIDDEN
 void lttng_ht_node_init_u64(struct lttng_ht_node_u64 *node,
 		uint64_t key)
 {
-	assert(node);
+	LTTNG_ASSERT(node);
 
 	node->key = key;
 	cds_lfht_node_init(&node->node);
@@ -194,11 +207,10 @@ void lttng_ht_node_init_u64(struct lttng_ht_node_u64 *node,
 /*
  * Init lttng ht node with two uint64_t.
  */
-LTTNG_HIDDEN
 void lttng_ht_node_init_two_u64(struct lttng_ht_node_two_u64 *node,
 		uint64_t key1, uint64_t key2)
 {
-	assert(node);
+	LTTNG_ASSERT(node);
 
 	node->key.key1 = key1;
 	node->key.key2 = key2;
@@ -208,52 +220,47 @@ void lttng_ht_node_init_two_u64(struct lttng_ht_node_two_u64 *node,
 /*
  * Free lttng ht node string.
  */
-LTTNG_HIDDEN
 void lttng_ht_node_free_str(struct lttng_ht_node_str *node)
 {
-	assert(node);
+	LTTNG_ASSERT(node);
 	free(node);
 }
 
 /*
  * Free lttng ht node unsigned long.
  */
-LTTNG_HIDDEN
 void lttng_ht_node_free_ulong(struct lttng_ht_node_ulong *node)
 {
-	assert(node);
+	LTTNG_ASSERT(node);
 	free(node);
 }
 
 /*
  * Free lttng ht node uint64_t.
  */
-LTTNG_HIDDEN
 void lttng_ht_node_free_u64(struct lttng_ht_node_u64 *node)
 {
-	assert(node);
+	LTTNG_ASSERT(node);
 	free(node);
 }
 
 /*
  * Free lttng ht node two uint64_t.
  */
-LTTNG_HIDDEN
 void lttng_ht_node_free_two_u64(struct lttng_ht_node_two_u64 *node)
 {
-	assert(node);
+	LTTNG_ASSERT(node);
 	free(node);
 }
 
 /*
  * Lookup function in hashtable.
  */
-LTTNG_HIDDEN
 void lttng_ht_lookup(struct lttng_ht *ht, const void *key,
 		struct lttng_ht_iter *iter)
 {
-	assert(ht);
-	assert(ht->ht);
+	LTTNG_ASSERT(ht);
+	LTTNG_ASSERT(ht->ht);
 
 	cds_lfht_lookup(ht->ht, ht->hash_fct(key, lttng_ht_seed),
 			ht->match_fct, key, &iter->iter);
@@ -262,33 +269,31 @@ void lttng_ht_lookup(struct lttng_ht *ht, const void *key,
 /*
  * Add unique string node to hashtable.
  */
-LTTNG_HIDDEN
 void lttng_ht_add_unique_str(struct lttng_ht *ht,
 		struct lttng_ht_node_str *node)
 {
 	struct cds_lfht_node *node_ptr;
-	assert(ht);
-	assert(ht->ht);
-	assert(node);
+	LTTNG_ASSERT(ht);
+	LTTNG_ASSERT(ht->ht);
+	LTTNG_ASSERT(node);
 
 	/* RCU read lock protects from ABA. */
 	rcu_read_lock();
 	node_ptr = cds_lfht_add_unique(ht->ht, ht->hash_fct(node->key, lttng_ht_seed),
 			ht->match_fct, node->key, &node->node);
 	rcu_read_unlock();
-	assert(node_ptr == &node->node);
+	LTTNG_ASSERT(node_ptr == &node->node);
 }
 
 /*
  * Add string node to hashtable.
  */
-LTTNG_HIDDEN
 void lttng_ht_add_str(struct lttng_ht *ht,
 		struct lttng_ht_node_str *node)
 {
-	assert(ht);
-	assert(ht->ht);
-	assert(node);
+	LTTNG_ASSERT(ht);
+	LTTNG_ASSERT(ht->ht);
+	LTTNG_ASSERT(node);
 
 	/* RCU read lock protects from ABA. */
 	rcu_read_lock();
@@ -300,12 +305,11 @@ void lttng_ht_add_str(struct lttng_ht *ht,
 /*
  * Add unsigned long node to hashtable.
  */
-LTTNG_HIDDEN
 void lttng_ht_add_ulong(struct lttng_ht *ht, struct lttng_ht_node_ulong *node)
 {
-	assert(ht);
-	assert(ht->ht);
-	assert(node);
+	LTTNG_ASSERT(ht);
+	LTTNG_ASSERT(ht->ht);
+	LTTNG_ASSERT(node);
 
 	/* RCU read lock protects from ABA. */
 	rcu_read_lock();
@@ -317,12 +321,11 @@ void lttng_ht_add_ulong(struct lttng_ht *ht, struct lttng_ht_node_ulong *node)
 /*
  * Add uint64_t node to hashtable.
  */
-LTTNG_HIDDEN
 void lttng_ht_add_u64(struct lttng_ht *ht, struct lttng_ht_node_u64 *node)
 {
-	assert(ht);
-	assert(ht->ht);
-	assert(node);
+	LTTNG_ASSERT(ht);
+	LTTNG_ASSERT(ht->ht);
+	LTTNG_ASSERT(node);
 
 	/* RCU read lock protects from ABA. */
 	rcu_read_lock();
@@ -334,14 +337,13 @@ void lttng_ht_add_u64(struct lttng_ht *ht, struct lttng_ht_node_u64 *node)
 /*
  * Add unique unsigned long node to hashtable.
  */
-LTTNG_HIDDEN
 void lttng_ht_add_unique_ulong(struct lttng_ht *ht,
 		struct lttng_ht_node_ulong *node)
 {
 	struct cds_lfht_node *node_ptr;
-	assert(ht);
-	assert(ht->ht);
-	assert(node);
+	LTTNG_ASSERT(ht);
+	LTTNG_ASSERT(ht->ht);
+	LTTNG_ASSERT(node);
 
 	/* RCU read lock protects from ABA. */
 	rcu_read_lock();
@@ -349,20 +351,19 @@ void lttng_ht_add_unique_ulong(struct lttng_ht *ht,
 			ht->hash_fct((void *) node->key, lttng_ht_seed), ht->match_fct,
 			(void *) node->key, &node->node);
 	rcu_read_unlock();
-	assert(node_ptr == &node->node);
+	LTTNG_ASSERT(node_ptr == &node->node);
 }
 
 /*
  * Add unique uint64_t node to hashtable.
  */
-LTTNG_HIDDEN
 void lttng_ht_add_unique_u64(struct lttng_ht *ht,
 		struct lttng_ht_node_u64 *node)
 {
 	struct cds_lfht_node *node_ptr;
-	assert(ht);
-	assert(ht->ht);
-	assert(node);
+	LTTNG_ASSERT(ht);
+	LTTNG_ASSERT(ht->ht);
+	LTTNG_ASSERT(node);
 
 	/* RCU read lock protects from ABA. */
 	rcu_read_lock();
@@ -370,20 +371,19 @@ void lttng_ht_add_unique_u64(struct lttng_ht *ht,
 			ht->hash_fct(&node->key, lttng_ht_seed), ht->match_fct,
 			&node->key, &node->node);
 	rcu_read_unlock();
-	assert(node_ptr == &node->node);
+	LTTNG_ASSERT(node_ptr == &node->node);
 }
 
 /*
  * Add unique two uint64_t node to hashtable.
  */
-LTTNG_HIDDEN
 void lttng_ht_add_unique_two_u64(struct lttng_ht *ht,
 		struct lttng_ht_node_two_u64 *node)
 {
 	struct cds_lfht_node *node_ptr;
-	assert(ht);
-	assert(ht->ht);
-	assert(node);
+	LTTNG_ASSERT(ht);
+	LTTNG_ASSERT(ht->ht);
+	LTTNG_ASSERT(node);
 
 	/* RCU read lock protects from ABA. */
 	rcu_read_lock();
@@ -391,20 +391,19 @@ void lttng_ht_add_unique_two_u64(struct lttng_ht *ht,
 			ht->hash_fct((void *) &node->key, lttng_ht_seed), ht->match_fct,
 			(void *) &node->key, &node->node);
 	rcu_read_unlock();
-	assert(node_ptr == &node->node);
+	LTTNG_ASSERT(node_ptr == &node->node);
 }
 
 /*
  * Add replace unsigned long node to hashtable.
  */
-LTTNG_HIDDEN
 struct lttng_ht_node_ulong *lttng_ht_add_replace_ulong(struct lttng_ht *ht,
 		struct lttng_ht_node_ulong *node)
 {
 	struct cds_lfht_node *node_ptr;
-	assert(ht);
-	assert(ht->ht);
-	assert(node);
+	LTTNG_ASSERT(ht);
+	LTTNG_ASSERT(ht->ht);
+	LTTNG_ASSERT(node);
 
 	/* RCU read lock protects from ABA. */
 	rcu_read_lock();
@@ -417,20 +416,19 @@ struct lttng_ht_node_ulong *lttng_ht_add_replace_ulong(struct lttng_ht *ht,
 	} else {
 		return caa_container_of(node_ptr, struct lttng_ht_node_ulong, node);
 	}
-	assert(node_ptr == &node->node);
+	LTTNG_ASSERT(node_ptr == &node->node);
 }
 
 /*
  * Add replace unsigned long node to hashtable.
  */
-LTTNG_HIDDEN
 struct lttng_ht_node_u64 *lttng_ht_add_replace_u64(struct lttng_ht *ht,
 		struct lttng_ht_node_u64 *node)
 {
 	struct cds_lfht_node *node_ptr;
-	assert(ht);
-	assert(ht->ht);
-	assert(node);
+	LTTNG_ASSERT(ht);
+	LTTNG_ASSERT(ht->ht);
+	LTTNG_ASSERT(node);
 
 	/* RCU read lock protects from ABA. */
 	rcu_read_lock();
@@ -443,20 +441,19 @@ struct lttng_ht_node_u64 *lttng_ht_add_replace_u64(struct lttng_ht *ht,
 	} else {
 		return caa_container_of(node_ptr, struct lttng_ht_node_u64, node);
 	}
-	assert(node_ptr == &node->node);
+	LTTNG_ASSERT(node_ptr == &node->node);
 }
 
 /*
  * Delete node from hashtable.
  */
-LTTNG_HIDDEN
 int lttng_ht_del(struct lttng_ht *ht, struct lttng_ht_iter *iter)
 {
 	int ret;
 
-	assert(ht);
-	assert(ht->ht);
-	assert(iter);
+	LTTNG_ASSERT(ht);
+	LTTNG_ASSERT(ht->ht);
+	LTTNG_ASSERT(iter);
 
 	/* RCU read lock protects from ABA. */
 	rcu_read_lock();
@@ -468,12 +465,11 @@ int lttng_ht_del(struct lttng_ht *ht, struct lttng_ht_iter *iter)
 /*
  * Get first node in the hashtable.
  */
-LTTNG_HIDDEN
 void lttng_ht_get_first(struct lttng_ht *ht, struct lttng_ht_iter *iter)
 {
-	assert(ht);
-	assert(ht->ht);
-	assert(iter);
+	LTTNG_ASSERT(ht);
+	LTTNG_ASSERT(ht->ht);
+	LTTNG_ASSERT(iter);
 
 	cds_lfht_first(ht->ht, &iter->iter);
 }
@@ -481,12 +477,11 @@ void lttng_ht_get_first(struct lttng_ht *ht, struct lttng_ht_iter *iter)
 /*
  * Get next node in the hashtable.
  */
-LTTNG_HIDDEN
 void lttng_ht_get_next(struct lttng_ht *ht, struct lttng_ht_iter *iter)
 {
-	assert(ht);
-	assert(ht->ht);
-	assert(iter);
+	LTTNG_ASSERT(ht);
+	LTTNG_ASSERT(ht->ht);
+	LTTNG_ASSERT(iter);
 
 	cds_lfht_next(ht->ht, &iter->iter);
 }
@@ -494,14 +489,13 @@ void lttng_ht_get_next(struct lttng_ht *ht, struct lttng_ht_iter *iter)
 /*
  * Return the number of nodes in the hashtable.
  */
-LTTNG_HIDDEN
 unsigned long lttng_ht_get_count(struct lttng_ht *ht)
 {
 	long scb, sca;
 	unsigned long count;
 
-	assert(ht);
-	assert(ht->ht);
+	LTTNG_ASSERT(ht);
+	LTTNG_ASSERT(ht->ht);
 
 	/* RCU read lock protects from ABA and allows RCU traversal. */
 	rcu_read_lock();
@@ -514,13 +508,12 @@ unsigned long lttng_ht_get_count(struct lttng_ht *ht)
 /*
  * Return lttng ht string node from iterator.
  */
-LTTNG_HIDDEN
 struct lttng_ht_node_str *lttng_ht_iter_get_node_str(
 		struct lttng_ht_iter *iter)
 {
 	struct cds_lfht_node *node;
 
-	assert(iter);
+	LTTNG_ASSERT(iter);
 	node = cds_lfht_iter_get_node(&iter->iter);
 	if (!node) {
 		return NULL;
@@ -531,13 +524,12 @@ struct lttng_ht_node_str *lttng_ht_iter_get_node_str(
 /*
  * Return lttng ht unsigned long node from iterator.
  */
-LTTNG_HIDDEN
 struct lttng_ht_node_ulong *lttng_ht_iter_get_node_ulong(
 		struct lttng_ht_iter *iter)
 {
 	struct cds_lfht_node *node;
 
-	assert(iter);
+	LTTNG_ASSERT(iter);
 	node = cds_lfht_iter_get_node(&iter->iter);
 	if (!node) {
 		return NULL;
@@ -548,13 +540,12 @@ struct lttng_ht_node_ulong *lttng_ht_iter_get_node_ulong(
 /*
  * Return lttng ht unsigned long node from iterator.
  */
-LTTNG_HIDDEN
 struct lttng_ht_node_u64 *lttng_ht_iter_get_node_u64(
 		struct lttng_ht_iter *iter)
 {
 	struct cds_lfht_node *node;
 
-	assert(iter);
+	LTTNG_ASSERT(iter);
 	node = cds_lfht_iter_get_node(&iter->iter);
 	if (!node) {
 		return NULL;
@@ -565,13 +556,12 @@ struct lttng_ht_node_u64 *lttng_ht_iter_get_node_u64(
 /*
  * Return lttng ht stream and index id node from iterator.
  */
-LTTNG_HIDDEN
 struct lttng_ht_node_two_u64 *lttng_ht_iter_get_node_two_u64(
 		struct lttng_ht_iter *iter)
 {
 	struct cds_lfht_node *node;
 
-	assert(iter);
+	LTTNG_ASSERT(iter);
 	node = cds_lfht_iter_get_node(&iter->iter);
 	if (!node) {
 		return NULL;