X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Fhashtable.h;h=e129ac5f88a063475d65aad3d136f851aea7e0fe;hb=4878de5c7deb512bbdac4fdfc498907efa06fb7c;hp=0dd925645fcd9d725105c9cfda3157efe48106ff;hpb=fb9a95c4d6242bd8336b638c90a7d8f846125659;p=lttng-tools.git

diff --git a/src/common/hashtable/hashtable.h b/src/common/hashtable/hashtable.h
index 0dd925645..e129ac5f8 100644
--- a/src/common/hashtable/hashtable.h
+++ b/src/common/hashtable/hashtable.h
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  *
- * 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.
  */
 
 #ifndef _LTT_HT_H
@@ -22,11 +12,12 @@
 #include <stdint.h>
 
 #include <common/macros.h>
+#include <lttng/lttng-export.h>
 #include <urcu/rculfhash.h>
 
-extern unsigned long lttng_ht_seed;
+LTTNG_EXPORT extern unsigned long lttng_ht_seed;
 
-typedef unsigned long (*hash_fct)(const void *_key, unsigned long seed);
+typedef unsigned long (*hash_fct_type)(const void *_key, unsigned long seed);
 typedef cds_lfht_match_fct hash_match_fct;
 
 enum lttng_ht_type {
@@ -39,7 +30,7 @@ enum lttng_ht_type {
 struct lttng_ht {
 	struct cds_lfht *ht;
 	cds_lfht_match_fct match_fct;
-	hash_fct hash_fct;
+	hash_fct_type hash_fct;
 };
 
 struct lttng_ht_iter {
@@ -76,87 +67,59 @@ struct lttng_ht_node_two_u64 {
 };
 
 /* Hashtable new and destroy */
-LTTNG_HIDDEN
-struct lttng_ht *lttng_ht_new(unsigned long size, int type);
-LTTNG_HIDDEN
+struct lttng_ht *lttng_ht_new(unsigned long size, enum lttng_ht_type type);
 void lttng_ht_destroy(struct lttng_ht *ht);
 
 /* Specialized node init and free functions */
-LTTNG_HIDDEN
 void lttng_ht_node_init_str(struct lttng_ht_node_str *node, char *key);
-LTTNG_HIDDEN
 void lttng_ht_node_init_ulong(struct lttng_ht_node_ulong *node,
 		unsigned long key);
-LTTNG_HIDDEN
 void lttng_ht_node_init_u64(struct lttng_ht_node_u64 *node,
 		uint64_t key);
-LTTNG_HIDDEN
 void lttng_ht_node_init_two_u64(struct lttng_ht_node_two_u64 *node,
 		uint64_t key1, uint64_t key2);
-LTTNG_HIDDEN
 void lttng_ht_node_free_str(struct lttng_ht_node_str *node);
-LTTNG_HIDDEN
 void lttng_ht_node_free_ulong(struct lttng_ht_node_ulong *node);
-LTTNG_HIDDEN
 void lttng_ht_node_free_u64(struct lttng_ht_node_u64 *node);
-LTTNG_HIDDEN
 void lttng_ht_node_free_two_u64(struct lttng_ht_node_two_u64 *node);
 
-LTTNG_HIDDEN
 void lttng_ht_lookup(struct lttng_ht *ht, const void *key,
 		struct lttng_ht_iter *iter);
 
 /* Specialized add unique functions */
-LTTNG_HIDDEN
 void lttng_ht_add_unique_str(struct lttng_ht *ht,
 		struct lttng_ht_node_str *node);
-LTTNG_HIDDEN
 void lttng_ht_add_unique_ulong(struct lttng_ht *ht,
 		struct lttng_ht_node_ulong *node);
-LTTNG_HIDDEN
 void lttng_ht_add_unique_u64(struct lttng_ht *ht,
 		struct lttng_ht_node_u64 *node);
-LTTNG_HIDDEN
 void lttng_ht_add_unique_two_u64(struct lttng_ht *ht,
 		struct lttng_ht_node_two_u64 *node);
-LTTNG_HIDDEN
 struct lttng_ht_node_ulong *lttng_ht_add_replace_ulong(
 		struct lttng_ht *ht, struct lttng_ht_node_ulong *node);
-LTTNG_HIDDEN
 struct lttng_ht_node_u64 *lttng_ht_add_replace_u64(
 		struct lttng_ht *ht, struct lttng_ht_node_u64 *node);
-LTTNG_HIDDEN
 void lttng_ht_add_str(struct lttng_ht *ht,
 		struct lttng_ht_node_str *node);
-LTTNG_HIDDEN
 void lttng_ht_add_ulong(struct lttng_ht *ht,
 		struct lttng_ht_node_ulong *node);
-LTTNG_HIDDEN
 void lttng_ht_add_u64(struct lttng_ht *ht,
 		struct lttng_ht_node_u64 *node);
 
-LTTNG_HIDDEN
 int lttng_ht_del(struct lttng_ht *ht, struct lttng_ht_iter *iter);
 
-LTTNG_HIDDEN
 void lttng_ht_get_first(struct lttng_ht *ht,
 		struct lttng_ht_iter *iter);
-LTTNG_HIDDEN
 void lttng_ht_get_next(struct lttng_ht *ht, struct lttng_ht_iter *iter);
 
-LTTNG_HIDDEN
 unsigned long lttng_ht_get_count(struct lttng_ht *ht);
 
-LTTNG_HIDDEN
 struct lttng_ht_node_str *lttng_ht_iter_get_node_str(
 		struct lttng_ht_iter *iter);
-LTTNG_HIDDEN
 struct lttng_ht_node_ulong *lttng_ht_iter_get_node_ulong(
 		struct lttng_ht_iter *iter);
-LTTNG_HIDDEN
 struct lttng_ht_node_u64 *lttng_ht_iter_get_node_u64(
 		struct lttng_ht_iter *iter);
-LTTNG_HIDDEN
 struct lttng_ht_node_two_u64 *lttng_ht_iter_get_node_two_u64(
 		struct lttng_ht_iter *iter);