X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Fhashtable.hpp;h=dee40ddfdf935e4a5f53a8852de6ad21d303e24e;hp=bd5cb948eac3a1be1f1e7a17b32c4ed2721d02fa;hb=HEAD;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f

diff --git a/src/common/hashtable/hashtable.hpp b/src/common/hashtable/hashtable.hpp
index bd5cb948e..ac1af7eed 100644
--- a/src/common/hashtable/hashtable.hpp
+++ b/src/common/hashtable/hashtable.hpp
@@ -8,17 +8,19 @@
 #ifndef _LTT_HT_H
 #define _LTT_HT_H
 
-#include <urcu.h>
-#include <stdint.h>
-
 #include <common/macros.hpp>
+
 #include <lttng/lttng-export.h>
+
+#include <memory>
+#include <stdint.h>
+#include <urcu.h>
 #include <urcu/rculfhash.h>
 
 LTTNG_EXPORT extern unsigned long lttng_ht_seed;
 
-typedef unsigned long (*hash_fct_type)(const void *_key, unsigned long seed);
-typedef cds_lfht_match_fct hash_match_fct;
+using hash_fct_type = unsigned long (*)(const void *, unsigned long);
+using hash_match_fct = cds_lfht_match_fct;
 
 enum lttng_ht_type {
 	LTTNG_HT_TYPE_STRING,
@@ -27,7 +29,10 @@ enum lttng_ht_type {
 	LTTNG_HT_TYPE_TWO_U64,
 };
 
+struct lttng_ht_deleter;
+
 struct lttng_ht {
+	using uptr = std::unique_ptr<lttng_ht, lttng_ht_deleter>;
 	struct cds_lfht *ht;
 	cds_lfht_match_fct match_fct;
 	hash_fct_type hash_fct;
@@ -69,58 +74,48 @@ struct lttng_ht_node_two_u64 {
 /* Hashtable new and destroy */
 struct lttng_ht *lttng_ht_new(unsigned long size, enum lttng_ht_type type);
 void lttng_ht_destroy(struct lttng_ht *ht);
+struct lttng_ht_deleter {
+	void operator()(lttng_ht *ht)
+	{
+		lttng_ht_destroy(ht);
+	};
+};
 
 /* Specialized node init and free functions */
 void lttng_ht_node_init_str(struct lttng_ht_node_str *node, char *key);
-void lttng_ht_node_init_ulong(struct lttng_ht_node_ulong *node,
-		unsigned long key);
-void lttng_ht_node_init_u64(struct lttng_ht_node_u64 *node,
-		uint64_t key);
-void lttng_ht_node_init_two_u64(struct lttng_ht_node_two_u64 *node,
-		uint64_t key1, uint64_t key2);
+void lttng_ht_node_init_ulong(struct lttng_ht_node_ulong *node, unsigned long key);
+void lttng_ht_node_init_u64(struct lttng_ht_node_u64 *node, uint64_t key);
+void lttng_ht_node_init_two_u64(struct lttng_ht_node_two_u64 *node, uint64_t key1, uint64_t key2);
 void lttng_ht_node_free_str(struct lttng_ht_node_str *node);
 void lttng_ht_node_free_ulong(struct lttng_ht_node_ulong *node);
 void lttng_ht_node_free_u64(struct lttng_ht_node_u64 *node);
 void lttng_ht_node_free_two_u64(struct lttng_ht_node_two_u64 *node);
 
-void lttng_ht_lookup(struct lttng_ht *ht, const void *key,
-		struct lttng_ht_iter *iter);
+void lttng_ht_lookup(struct lttng_ht *ht, const void *key, struct lttng_ht_iter *iter);
 
 /* Specialized add unique functions */
-void lttng_ht_add_unique_str(struct lttng_ht *ht,
-		struct lttng_ht_node_str *node);
-void lttng_ht_add_unique_ulong(struct lttng_ht *ht,
-		struct lttng_ht_node_ulong *node);
-void lttng_ht_add_unique_u64(struct lttng_ht *ht,
-		struct lttng_ht_node_u64 *node);
-void lttng_ht_add_unique_two_u64(struct lttng_ht *ht,
-		struct lttng_ht_node_two_u64 *node);
-struct lttng_ht_node_ulong *lttng_ht_add_replace_ulong(
-		struct lttng_ht *ht, struct lttng_ht_node_ulong *node);
-struct lttng_ht_node_u64 *lttng_ht_add_replace_u64(
-		struct lttng_ht *ht, struct lttng_ht_node_u64 *node);
-void lttng_ht_add_str(struct lttng_ht *ht,
-		struct lttng_ht_node_str *node);
-void lttng_ht_add_ulong(struct lttng_ht *ht,
-		struct lttng_ht_node_ulong *node);
-void lttng_ht_add_u64(struct lttng_ht *ht,
-		struct lttng_ht_node_u64 *node);
+void lttng_ht_add_unique_str(struct lttng_ht *ht, struct lttng_ht_node_str *node);
+void lttng_ht_add_unique_ulong(struct lttng_ht *ht, struct lttng_ht_node_ulong *node);
+void lttng_ht_add_unique_u64(struct lttng_ht *ht, struct lttng_ht_node_u64 *node);
+void lttng_ht_add_unique_two_u64(struct lttng_ht *ht, struct lttng_ht_node_two_u64 *node);
+struct lttng_ht_node_ulong *lttng_ht_add_replace_ulong(struct lttng_ht *ht,
+						       struct lttng_ht_node_ulong *node);
+struct lttng_ht_node_u64 *lttng_ht_add_replace_u64(struct lttng_ht *ht,
+						   struct lttng_ht_node_u64 *node);
+void lttng_ht_add_str(struct lttng_ht *ht, struct lttng_ht_node_str *node);
+void lttng_ht_add_ulong(struct lttng_ht *ht, struct lttng_ht_node_ulong *node);
+void lttng_ht_add_u64(struct lttng_ht *ht, struct lttng_ht_node_u64 *node);
 
 int lttng_ht_del(struct lttng_ht *ht, struct lttng_ht_iter *iter);
 
-void lttng_ht_get_first(struct lttng_ht *ht,
-		struct lttng_ht_iter *iter);
+void lttng_ht_get_first(struct lttng_ht *ht, struct lttng_ht_iter *iter);
 void lttng_ht_get_next(struct lttng_ht *ht, struct lttng_ht_iter *iter);
 
 unsigned long lttng_ht_get_count(struct lttng_ht *ht);
 
-struct lttng_ht_node_str *lttng_ht_iter_get_node_str(
-		struct lttng_ht_iter *iter);
-struct lttng_ht_node_ulong *lttng_ht_iter_get_node_ulong(
-		struct lttng_ht_iter *iter);
-struct lttng_ht_node_u64 *lttng_ht_iter_get_node_u64(
-		struct lttng_ht_iter *iter);
-struct lttng_ht_node_two_u64 *lttng_ht_iter_get_node_two_u64(
-		struct lttng_ht_iter *iter);
+struct lttng_ht_node_str *lttng_ht_iter_get_node_str(struct lttng_ht_iter *iter);
+struct lttng_ht_node_ulong *lttng_ht_iter_get_node_ulong(struct lttng_ht_iter *iter);
+struct lttng_ht_node_u64 *lttng_ht_iter_get_node_u64(struct lttng_ht_iter *iter);
+struct lttng_ht_node_two_u64 *lttng_ht_iter_get_node_two_u64(struct lttng_ht_iter *iter);
 
 #endif /* _LTT_HT_H */