X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Fhashtable.h;h=826e1207e00b3eb907715ba98299c896f9cbce6e;hp=d1dcdb574d9869d116fb43ca648cf4022b3f574c;hb=3c4599b9a5c12ceff19368c6cd51e01d81824726;hpb=702b1ea4d37c122c2622004fd4cf53175e7c7754

diff --git a/src/common/hashtable/hashtable.h b/src/common/hashtable/hashtable.h
index d1dcdb574..826e1207e 100644
--- a/src/common/hashtable/hashtable.h
+++ b/src/common/hashtable/hashtable.h
@@ -1,34 +1,39 @@
 /*
  * 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 as published by the Free
- * Software Foundation; only version 2 of the License.
+ * 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.
  *
  * 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
+ * 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., 59 Temple
- * Place - Suite 330, Boston, MA  02111-1307, USA.
+ * 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.
  */
 
 #ifndef _LTT_HT_H
 #define _LTT_HT_H
 
 #include <urcu.h>
+#include <stdint.h>
 
 #include "rculfhash.h"
 #include "rculfhash-internal.h"
 
+extern unsigned long lttng_ht_seed;
+
 typedef unsigned long (*hash_fct)(void *_key, unsigned long seed);
 typedef cds_lfht_match_fct hash_match_fct;
 
 enum lttng_ht_type {
 	LTTNG_HT_TYPE_STRING,
 	LTTNG_HT_TYPE_ULONG,
+	LTTNG_HT_TYPE_U64,
+	LTTNG_HT_TYPE_TWO_U64,
 };
 
 struct lttng_ht {
@@ -53,6 +58,23 @@ struct lttng_ht_node_ulong {
 	struct rcu_head head;
 };
 
+struct lttng_ht_node_u64 {
+	uint64_t key;
+	struct cds_lfht_node node;
+	struct rcu_head head;
+};
+
+struct lttng_ht_two_u64 {
+	uint64_t key1;
+	uint64_t key2;
+};
+
+struct lttng_ht_node_two_u64 {
+	struct lttng_ht_two_u64 key;
+	struct cds_lfht_node node;
+	struct rcu_head head;
+};
+
 /* Hashtable new and destroy */
 extern struct lttng_ht *lttng_ht_new(unsigned long size, int type);
 extern void lttng_ht_destroy(struct lttng_ht *ht);
@@ -61,8 +83,14 @@ extern void lttng_ht_destroy(struct lttng_ht *ht);
 extern void lttng_ht_node_init_str(struct lttng_ht_node_str *node, char *key);
 extern void lttng_ht_node_init_ulong(struct lttng_ht_node_ulong *node,
 		unsigned long key);
+extern void lttng_ht_node_init_u64(struct lttng_ht_node_u64 *node,
+		uint64_t key);
+extern void lttng_ht_node_init_two_u64(struct lttng_ht_node_two_u64 *node,
+		uint64_t key1, uint64_t key2);
 extern void lttng_ht_node_free_str(struct lttng_ht_node_str *node);
 extern void lttng_ht_node_free_ulong(struct lttng_ht_node_ulong *node);
+extern void lttng_ht_node_free_u64(struct lttng_ht_node_u64 *node);
+extern void lttng_ht_node_free_two_u64(struct lttng_ht_node_two_u64 *node);
 
 extern void lttng_ht_lookup(struct lttng_ht *ht, void *key,
 		struct lttng_ht_iter *iter);
@@ -72,8 +100,20 @@ extern void lttng_ht_add_unique_str(struct lttng_ht *ht,
 		struct lttng_ht_node_str *node);
 extern void lttng_ht_add_unique_ulong(struct lttng_ht *ht,
 		struct lttng_ht_node_ulong *node);
-struct lttng_ht_node_ulong *lttng_ht_add_replace_ulong(struct lttng_ht *ht,
+extern void lttng_ht_add_unique_u64(struct lttng_ht *ht,
+		struct lttng_ht_node_u64 *node);
+extern void lttng_ht_add_unique_two_u64(struct lttng_ht *ht,
+		struct lttng_ht_node_two_u64 *node);
+extern struct lttng_ht_node_ulong *lttng_ht_add_replace_ulong(
+		struct lttng_ht *ht, struct lttng_ht_node_ulong *node);
+extern struct lttng_ht_node_u64 *lttng_ht_add_replace_u64(
+		struct lttng_ht *ht, struct lttng_ht_node_u64 *node);
+extern void lttng_ht_add_str(struct lttng_ht *ht,
+		struct lttng_ht_node_str *node);
+extern void lttng_ht_add_ulong(struct lttng_ht *ht,
 		struct lttng_ht_node_ulong *node);
+extern void lttng_ht_add_u64(struct lttng_ht *ht,
+		struct lttng_ht_node_u64 *node);
 
 extern int lttng_ht_del(struct lttng_ht *ht, struct lttng_ht_iter *iter);
 
@@ -87,5 +127,9 @@ extern struct lttng_ht_node_str *lttng_ht_iter_get_node_str(
 		struct lttng_ht_iter *iter);
 extern struct lttng_ht_node_ulong *lttng_ht_iter_get_node_ulong(
 		struct lttng_ht_iter *iter);
+extern struct lttng_ht_node_u64 *lttng_ht_iter_get_node_u64(
+		struct lttng_ht_iter *iter);
+extern struct lttng_ht_node_two_u64 *lttng_ht_iter_get_node_two_u64(
+		struct lttng_ht_iter *iter);
 
 #endif /* _LTT_HT_H */