X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Fhashtable.c;h=07210fa8161e63e41a6ea12c061812b27c94d1c8;hp=ac39004e64617eceb6f1ba7d2b5b479021e50237;hb=efa116c6f19ecdc344a82709e7d919703ec96c45;hpb=cf5280ea47a194ae9e96f02afb9e9059813422b7

diff --git a/src/common/hashtable/hashtable.c b/src/common/hashtable/hashtable.c
index ac39004e6..07210fa81 100644
--- a/src/common/hashtable/hashtable.c
+++ b/src/common/hashtable/hashtable.c
@@ -27,10 +27,10 @@
 #include "hashtable.h"
 #include "utils.h"
 
-#define HASH_SEED            0x42UL		/* The answer to life */
+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;
 
 /*
  * Match function for string node.
@@ -54,6 +54,17 @@ 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);
+}
+
 /*
  * Return an allocated lttng hashtable.
  */
@@ -72,7 +83,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 +99,13 @@ 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;
 	default:
 		ERR("Unknown lttng hashtable type %d", type);
+		lttng_ht_destroy(ht);
 		goto error;
 	}
 
@@ -136,6 +152,18 @@ void lttng_ht_node_init_ulong(struct lttng_ht_node_ulong *node,
 	cds_lfht_node_init(&node->node);
 }
 
+/*
+ * Init lttng ht node uint64_t.
+ */
+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);
+}
+
 /*
  * Free lttng ht node string.
  */
@@ -154,6 +182,15 @@ void lttng_ht_node_free_ulong(struct lttng_ht_node_ulong *node)
 	free(node);
 }
 
+/*
+ * Free lttng ht node uint64_t.
+ */
+void lttng_ht_node_free_u64(struct lttng_ht_node_u64 *node)
+{
+	assert(node);
+	free(node);
+}
+
 /*
  * Lookup function in hashtable.
  */
@@ -163,7 +200,7 @@ void lttng_ht_lookup(struct lttng_ht *ht, void *key,
 	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);
 }
 
@@ -178,11 +215,52 @@ 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),
+	node_ptr = cds_lfht_add_unique(ht->ht, ht->hash_fct(node->key, lttng_ht_seed),
 			ht->match_fct, node->key, &node->node);
 	assert(node_ptr == &node->node);
 }
 
+/*
+ * Add string node to hashtable.
+ */
+void lttng_ht_add_str(struct lttng_ht *ht,
+		struct lttng_ht_node_str *node)
+{
+	assert(ht);
+	assert(ht->ht);
+	assert(node);
+
+	cds_lfht_add(ht->ht, ht->hash_fct(node->key, lttng_ht_seed),
+			&node->node);
+}
+
+/*
+ * Add unsigned long node to hashtable.
+ */
+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, lttng_ht_seed),
+			&node->node);
+}
+
+/*
+ * Add uint64_t node to hashtable.
+
+ */
+void lttng_ht_add_u64(struct lttng_ht *ht, struct lttng_ht_node_u64 *node)
+{
+	assert(ht);
+	assert(ht->ht);
+	assert(node);
+
+	cds_lfht_add(ht->ht, ht->hash_fct(&node->key, lttng_ht_seed),
+			&node->node);
+}
+
 /*
  * Add unique unsigned long node to hashtable.
  */
@@ -195,11 +273,28 @@ void lttng_ht_add_unique_ulong(struct lttng_ht *ht,
 	assert(node);
 
 	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);
 	assert(node_ptr == &node->node);
 }
 
+/*
+ * Add unique uint64_t node to hashtable.
+ */
+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);
+
+	node_ptr = cds_lfht_add_unique(ht->ht,
+			ht->hash_fct(&node->key, lttng_ht_seed), ht->match_fct,
+			&node->key, &node->node);
+	assert(node_ptr == &node->node);
+}
+
 /*
  * Add replace unsigned long node to hashtable.
  */
@@ -212,7 +307,7 @@ struct lttng_ht_node_ulong *lttng_ht_add_replace_ulong(struct lttng_ht *ht,
 	assert(node);
 
 	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);
 	if (!node_ptr) {
 		return NULL;
@@ -222,6 +317,28 @@ 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.
+ */
+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);
+
+	node_ptr = cds_lfht_add_replace(ht->ht,
+			ht->hash_fct(&node->key, lttng_ht_seed), ht->match_fct,
+			&node->key, &node->node);
+	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.
  */
@@ -305,3 +422,28 @@ 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.
+ */
+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);
+}
+
+/*
+ * lib constructor
+ */
+static void __attribute__((constructor)) _init(void)
+{
+	/* Init hash table seed */
+	lttng_ht_seed = (unsigned long) time(NULL);
+}