X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Fhashtable.c;h=263df46839d37af58e2efe66770f5e1833c90f0f;hp=24d579773e0ab26d89cfb5f078f84562ce4431df;hb=d88aee689d5bd0067f362a323cb69c37717df59f;hpb=d0b96690836f4b876096f3dc14801f8e25281a77

diff --git a/src/common/hashtable/hashtable.c b/src/common/hashtable/hashtable.c
index 24d579773..263df4683 100644
--- a/src/common/hashtable/hashtable.c
+++ b/src/common/hashtable/hashtable.c
@@ -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.
  */
@@ -88,6 +99,10 @@ 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);
 		goto error;
@@ -136,6 +151,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 +181,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_ulong *node)
+{
+	assert(node);
+	free(node);
+}
+
 /*
  * Lookup function in hashtable.
  */
@@ -196,6 +232,20 @@ void lttng_ht_add_ulong(struct lttng_ht *ht, struct lttng_ht_node_ulong *node)
 			&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.
  */
@@ -213,6 +263,23 @@ void lttng_ht_add_unique_ulong(struct lttng_ht *ht,
 	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.
  */
@@ -235,6 +302,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.
  */
@@ -319,10 +408,26 @@ 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()
+static void __attribute__((constructor)) _init(void)
 {
 	/* Init hash table seed */
 	lttng_ht_seed = (unsigned long) time(NULL);