X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Fhashtable.c;h=f449fab8bd6dabab89302b86c9222d0569fc5cf6;hp=46717c9bab15fb82aee3d355a68f6e43d4496c91;hb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;hpb=aefea3b7b1a1e7255becc0de1b0eac73d6798bed

diff --git a/src/common/hashtable/hashtable.c b/src/common/hashtable/hashtable.c
index 46717c9ba..f449fab8b 100644
--- a/src/common/hashtable/hashtable.c
+++ b/src/common/hashtable/hashtable.c
@@ -1,21 +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 _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <string.h>
 #include <urcu.h>
@@ -27,10 +17,20 @@
 #include "hashtable.h"
 #include "utils.h"
 
-#define HASH_SEED            0x42UL		/* The answer to life */
+/* seed_lock protects both seed_init and lttng_ht_seed. */
+static pthread_mutex_t seed_lock = PTHREAD_MUTEX_INITIALIZER;
+static bool seed_init;
+unsigned long lttng_ht_seed;
 
 static unsigned long min_hash_alloc_size = 1;
-static unsigned long max_hash_buckets_size = (1UL << 20);
+static unsigned long max_hash_buckets_size = 0;
+
+/*
+ * Getter/lookup functions need to be called with RCU read-side lock
+ * held. However, modification functions (add, add_unique, replace, del)
+ * take the RCU lock internally, so it does not matter whether the
+ * caller hold the RCU lock or not.
+ */
 
 /*
  * Match function for string node.
@@ -54,9 +54,32 @@ static int match_ulong(struct cds_lfht_node *node, const void *key)
 	return hash_match_key_ulong((void *) match_node->key, (void *) key);
 }
 
+/*
+ * Match function for u64 node.
+ */
+static int match_u64(struct cds_lfht_node *node, const void *key)
+{
+	struct lttng_ht_node_u64 *match_node =
+		caa_container_of(node, struct lttng_ht_node_u64, node);
+
+	return hash_match_key_u64(&match_node->key, (void *) key);
+}
+
+/*
+ * Match function for two uint64_t node.
+ */
+static int match_two_u64(struct cds_lfht_node *node, const void *key)
+{
+	struct lttng_ht_node_two_u64 *match_node =
+		caa_container_of(node, struct lttng_ht_node_two_u64, node);
+
+	return hash_match_key_two_u64((void *) &match_node->key, (void *) key);
+}
+
 /*
  * Return an allocated lttng hashtable.
  */
+LTTNG_HIDDEN
 struct lttng_ht *lttng_ht_new(unsigned long size, int type)
 {
 	struct lttng_ht *ht;
@@ -65,6 +88,13 @@ struct lttng_ht *lttng_ht_new(unsigned long size, int type)
 	if (!size)
 		size = DEFAULT_HT_SIZE;
 
+	pthread_mutex_lock(&seed_lock);
+	if (!seed_init) {
+		lttng_ht_seed = (unsigned long) time(NULL);
+		seed_init = true;
+	}
+	pthread_mutex_unlock(&seed_lock);
+
 	ht = zmalloc(sizeof(*ht));
 	if (ht == NULL) {
 		PERROR("zmalloc lttng_ht");
@@ -72,7 +102,7 @@ struct lttng_ht *lttng_ht_new(unsigned long size, int type)
 	}
 
 	ht->ht = cds_lfht_new(size, min_hash_alloc_size, max_hash_buckets_size,
-			CDS_LFHT_AUTO_RESIZE, NULL);
+			CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING, NULL);
 	/*
 	 * There is already an assert in the RCU hashtable code so if the ht is
 	 * NULL here there is a *huge* problem.
@@ -88,8 +118,17 @@ struct lttng_ht *lttng_ht_new(unsigned long size, int type)
 		ht->match_fct = match_ulong;
 		ht->hash_fct = hash_key_ulong;
 		break;
+	case LTTNG_HT_TYPE_U64:
+		ht->match_fct = match_u64;
+		ht->hash_fct = hash_key_u64;
+		break;
+	case LTTNG_HT_TYPE_TWO_U64:
+		ht->match_fct = match_two_u64;
+		ht->hash_fct = hash_key_two_u64;
+		break;
 	default:
 		ERR("Unknown lttng hashtable type %d", type);
+		lttng_ht_destroy(ht);
 		goto error;
 	}
 
@@ -104,6 +143,7 @@ error:
 /*
  * Free a lttng hashtable.
  */
+LTTNG_HIDDEN
 void lttng_ht_destroy(struct lttng_ht *ht)
 {
 	int ret;
@@ -116,6 +156,7 @@ void lttng_ht_destroy(struct lttng_ht *ht)
 /*
  * Init lttng ht node string.
  */
+LTTNG_HIDDEN
 void lttng_ht_node_init_str(struct lttng_ht_node_str *node, char *key)
 {
 	assert(node);
@@ -127,6 +168,7 @@ 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)
 {
@@ -136,9 +178,37 @@ void lttng_ht_node_init_ulong(struct lttng_ht_node_ulong *node,
 	cds_lfht_node_init(&node->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);
+
+	node->key = key;
+	cds_lfht_node_init(&node->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);
+
+	node->key.key1 = key1;
+	node->key.key2 = key2;
+	cds_lfht_node_init(&node->node);
+}
+
 /*
  * Free lttng ht node string.
  */
+LTTNG_HIDDEN
 void lttng_ht_node_free_str(struct lttng_ht_node_str *node)
 {
 	assert(node);
@@ -148,28 +218,51 @@ void lttng_ht_node_free_str(struct lttng_ht_node_str *node)
 /*
  * Free lttng ht node unsigned long.
  */
+LTTNG_HIDDEN
 void lttng_ht_node_free_ulong(struct lttng_ht_node_ulong *node)
 {
 	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);
+	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);
+	free(node);
+}
+
 /*
  * Lookup function in hashtable.
  */
-void lttng_ht_lookup(struct lttng_ht *ht, void *key,
+LTTNG_HIDDEN
+void lttng_ht_lookup(struct lttng_ht *ht, const void *key,
 		struct lttng_ht_iter *iter)
 {
 	assert(ht);
 	assert(ht->ht);
 
-	cds_lfht_lookup(ht->ht, ht->hash_fct(key, HASH_SEED),
+	cds_lfht_lookup(ht->ht, ht->hash_fct(key, lttng_ht_seed),
 			ht->match_fct, key, &iter->iter);
 }
 
 /*
  * Add unique string node to hashtable.
  */
+LTTNG_HIDDEN
 void lttng_ht_add_unique_str(struct lttng_ht *ht,
 		struct lttng_ht_node_str *node)
 {
@@ -178,27 +271,70 @@ void lttng_ht_add_unique_str(struct lttng_ht *ht,
 	assert(ht->ht);
 	assert(node);
 
-	node_ptr = cds_lfht_add_unique(ht->ht, ht->hash_fct(node->key, HASH_SEED),
+	/* 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);
 }
 
+/*
+ * 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);
+
+	/* RCU read lock protects from ABA. */
+	rcu_read_lock();
+	cds_lfht_add(ht->ht, ht->hash_fct(node->key, lttng_ht_seed),
+			&node->node);
+	rcu_read_unlock();
+}
+
 /*
  * 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);
 
-	cds_lfht_add(ht->ht, ht->hash_fct((void *) node->key, HASH_SEED),
+	/* RCU read lock protects from ABA. */
+	rcu_read_lock();
+	cds_lfht_add(ht->ht, ht->hash_fct((void *) node->key, lttng_ht_seed),
+			&node->node);
+	rcu_read_unlock();
+}
+
+/*
+ * 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);
+
+	/* RCU read lock protects from ABA. */
+	rcu_read_lock();
+	cds_lfht_add(ht->ht, ht->hash_fct(&node->key, lttng_ht_seed),
 			&node->node);
+	rcu_read_unlock();
 }
 
 /*
  * 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)
 {
@@ -207,15 +343,61 @@ void lttng_ht_add_unique_ulong(struct lttng_ht *ht,
 	assert(ht->ht);
 	assert(node);
 
+	/* RCU read lock protects from ABA. */
+	rcu_read_lock();
 	node_ptr = cds_lfht_add_unique(ht->ht,
-			ht->hash_fct((void *) node->key, HASH_SEED), ht->match_fct,
+			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);
+}
+
+/*
+ * 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);
+
+	/* 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);
+}
+
+/*
+ * 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);
+
+	/* RCU read lock protects from ABA. */
+	rcu_read_lock();
+	node_ptr = cds_lfht_add_unique(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);
 }
 
 /*
  * 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)
 {
@@ -224,9 +406,12 @@ struct lttng_ht_node_ulong *lttng_ht_add_replace_ulong(struct lttng_ht *ht,
 	assert(ht->ht);
 	assert(node);
 
+	/* RCU read lock protects from ABA. */
+	rcu_read_lock();
 	node_ptr = cds_lfht_add_replace(ht->ht,
-			ht->hash_fct((void *) node->key, HASH_SEED), ht->match_fct,
+			ht->hash_fct((void *) node->key, lttng_ht_seed), ht->match_fct,
 			(void *) node->key, &node->node);
+	rcu_read_unlock();
 	if (!node_ptr) {
 		return NULL;
 	} else {
@@ -235,21 +420,55 @@ struct lttng_ht_node_ulong *lttng_ht_add_replace_ulong(struct lttng_ht *ht,
 	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);
+
+	/* RCU read lock protects from ABA. */
+	rcu_read_lock();
+	node_ptr = cds_lfht_add_replace(ht->ht,
+			ht->hash_fct(&node->key, lttng_ht_seed), ht->match_fct,
+			&node->key, &node->node);
+	rcu_read_unlock();
+	if (!node_ptr) {
+		return NULL;
+	} else {
+		return caa_container_of(node_ptr, struct lttng_ht_node_u64, node);
+	}
+	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);
 
-	return cds_lfht_del(ht->ht, iter->iter.node);
+	/* RCU read lock protects from ABA. */
+	rcu_read_lock();
+	ret = cds_lfht_del(ht->ht, iter->iter.node);
+	rcu_read_unlock();
+	return ret;
 }
 
 /*
  * Get first node in the hashtable.
  */
+LTTNG_HIDDEN
 void lttng_ht_get_first(struct lttng_ht *ht, struct lttng_ht_iter *iter)
 {
 	assert(ht);
@@ -262,6 +481,7 @@ 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);
@@ -274,6 +494,7 @@ 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;
@@ -282,7 +503,10 @@ unsigned long lttng_ht_get_count(struct lttng_ht *ht)
 	assert(ht);
 	assert(ht->ht);
 
+	/* RCU read lock protects from ABA and allows RCU traversal. */
+	rcu_read_lock();
 	cds_lfht_count_nodes(ht->ht, &scb, &count, &sca);
+	rcu_read_unlock();
 
 	return count;
 }
@@ -290,6 +514,7 @@ 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)
 {
@@ -306,6 +531,7 @@ 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)
 {
@@ -318,3 +544,37 @@ struct lttng_ht_node_ulong *lttng_ht_iter_get_node_ulong(
 	}
 	return caa_container_of(node, struct lttng_ht_node_ulong, node);
 }
+
+/*
+ * 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);
+	node = cds_lfht_iter_get_node(&iter->iter);
+	if (!node) {
+		return NULL;
+	}
+	return caa_container_of(node, struct lttng_ht_node_u64, node);
+}
+
+/*
+ * 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);
+	node = cds_lfht_iter_get_node(&iter->iter);
+	if (!node) {
+		return NULL;
+	}
+	return caa_container_of(node, struct lttng_ht_node_two_u64, node);
+}