X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Fhashtable.c;h=404734f544895a8b9463fe2673136ad75d38e6de;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=4fb19cffda923bf1f19062be891f6180f0e48c14;hpb=6dcd74cf9c4cce229b1c205ca05d8efcf4c4bceb;p=lttng-tools.git

diff --git a/src/common/hashtable/hashtable.c b/src/common/hashtable/hashtable.c
index 4fb19cffd..404734f54 100644
--- a/src/common/hashtable/hashtable.c
+++ b/src/common/hashtable/hashtable.c
@@ -1,22 +1,11 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <string.h>
 #include <urcu.h>
 #include <urcu/compiler.h>
@@ -86,6 +75,24 @@ 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.
  */
@@ -117,7 +124,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:
@@ -142,7 +149,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;
 
@@ -159,7 +167,7 @@ void lttng_ht_destroy(struct lttng_ht *ht)
 	int ret;
 
 	ret = cds_lfht_destroy(ht->ht, NULL);
-	assert(!ret);
+	LTTNG_ASSERT(!ret);
 	free(ht);
 }
 
@@ -169,7 +177,7 @@ void lttng_ht_destroy(struct lttng_ht *ht)
 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);
@@ -182,7 +190,7 @@ 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);
@@ -195,7 +203,7 @@ 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);
@@ -208,7 +216,7 @@ 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;
@@ -221,7 +229,7 @@ void lttng_ht_node_init_two_u64(struct lttng_ht_node_two_u64 *node,
 LTTNG_HIDDEN
 void lttng_ht_node_free_str(struct lttng_ht_node_str *node)
 {
-	assert(node);
+	LTTNG_ASSERT(node);
 	free(node);
 }
 
@@ -231,7 +239,7 @@ void lttng_ht_node_free_str(struct lttng_ht_node_str *node)
 LTTNG_HIDDEN
 void lttng_ht_node_free_ulong(struct lttng_ht_node_ulong *node)
 {
-	assert(node);
+	LTTNG_ASSERT(node);
 	free(node);
 }
 
@@ -241,7 +249,7 @@ void lttng_ht_node_free_ulong(struct lttng_ht_node_ulong *node)
 LTTNG_HIDDEN
 void lttng_ht_node_free_u64(struct lttng_ht_node_u64 *node)
 {
-	assert(node);
+	LTTNG_ASSERT(node);
 	free(node);
 }
 
@@ -251,7 +259,7 @@ void lttng_ht_node_free_u64(struct lttng_ht_node_u64 *node)
 LTTNG_HIDDEN
 void lttng_ht_node_free_two_u64(struct lttng_ht_node_two_u64 *node)
 {
-	assert(node);
+	LTTNG_ASSERT(node);
 	free(node);
 }
 
@@ -259,11 +267,11 @@ void lttng_ht_node_free_two_u64(struct lttng_ht_node_two_u64 *node)
  * Lookup function in hashtable.
  */
 LTTNG_HIDDEN
-void lttng_ht_lookup(struct lttng_ht *ht, void *key,
+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);
@@ -277,16 +285,16 @@ 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);
 }
 
 /*
@@ -296,9 +304,9 @@ 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();
@@ -313,9 +321,9 @@ void lttng_ht_add_str(struct lttng_ht *ht,
 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();
@@ -330,9 +338,9 @@ void lttng_ht_add_ulong(struct lttng_ht *ht, struct lttng_ht_node_ulong *node)
 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();
@@ -349,9 +357,9 @@ 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();
@@ -359,7 +367,7 @@ 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);
 }
 
 /*
@@ -370,9 +378,9 @@ 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();
@@ -380,7 +388,7 @@ 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);
 }
 
 /*
@@ -391,9 +399,9 @@ 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();
@@ -401,7 +409,7 @@ 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);
 }
 
 /*
@@ -412,9 +420,9 @@ 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();
@@ -427,7 +435,7 @@ 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);
 }
 
 /*
@@ -438,9 +446,9 @@ 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();
@@ -453,7 +461,7 @@ 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);
 }
 
 /*
@@ -464,9 +472,9 @@ 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();
@@ -481,9 +489,9 @@ int lttng_ht_del(struct lttng_ht *ht, struct lttng_ht_iter *iter)
 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);
 }
@@ -494,9 +502,9 @@ void lttng_ht_get_first(struct lttng_ht *ht, struct lttng_ht_iter *iter)
 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);
 }
@@ -510,8 +518,8 @@ 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();
@@ -530,7 +538,7 @@ struct lttng_ht_node_str *lttng_ht_iter_get_node_str(
 {
 	struct cds_lfht_node *node;
 
-	assert(iter);
+	LTTNG_ASSERT(iter);
 	node = cds_lfht_iter_get_node(&iter->iter);
 	if (!node) {
 		return NULL;
@@ -547,7 +555,7 @@ struct lttng_ht_node_ulong *lttng_ht_iter_get_node_ulong(
 {
 	struct cds_lfht_node *node;
 
-	assert(iter);
+	LTTNG_ASSERT(iter);
 	node = cds_lfht_iter_get_node(&iter->iter);
 	if (!node) {
 		return NULL;
@@ -564,7 +572,7 @@ struct lttng_ht_node_u64 *lttng_ht_iter_get_node_u64(
 {
 	struct cds_lfht_node *node;
 
-	assert(iter);
+	LTTNG_ASSERT(iter);
 	node = cds_lfht_iter_get_node(&iter->iter);
 	if (!node) {
 		return NULL;
@@ -581,7 +589,7 @@ struct lttng_ht_node_two_u64 *lttng_ht_iter_get_node_two_u64(
 {
 	struct cds_lfht_node *node;
 
-	assert(iter);
+	LTTNG_ASSERT(iter);
 	node = cds_lfht_iter_get_node(&iter->iter);
 	if (!node) {
 		return NULL;