X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Fhashtable.c;h=f449fab8bd6dabab89302b86c9222d0569fc5cf6;hp=d1049d1e2b9dea53b9747a0bcaf8cea4108833cd;hb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;hpb=42ce408ec43c984731b2cdb4a4dbbbb0196164b0 diff --git a/src/common/hashtable/hashtable.c b/src/common/hashtable/hashtable.c index d1049d1e2..f449fab8b 100644 --- a/src/common/hashtable/hashtable.c +++ b/src/common/hashtable/hashtable.c @@ -1,21 +1,10 @@ /* - * Copyright (C) 2011 - David Goulet + * Copyright (C) 2011 David Goulet * - * 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. */ -#define _GNU_SOURCE #define _LGPL_SOURCE #include #include @@ -28,6 +17,9 @@ #include "hashtable.h" #include "utils.h" +/* seed_lock protects both seed_init and lttng_ht_seed. */ +static pthread_mutex_t seed_lock = PTHREAD_MUTEX_INITIALIZER; +static bool seed_init; unsigned long lttng_ht_seed; static unsigned long min_hash_alloc_size = 1; @@ -87,6 +79,7 @@ static int match_two_u64(struct cds_lfht_node *node, const void *key) /* * Return an allocated lttng hashtable. */ +LTTNG_HIDDEN struct lttng_ht *lttng_ht_new(unsigned long size, int type) { struct lttng_ht *ht; @@ -95,6 +88,13 @@ struct lttng_ht *lttng_ht_new(unsigned long size, int type) if (!size) size = DEFAULT_HT_SIZE; + pthread_mutex_lock(&seed_lock); + if (!seed_init) { + lttng_ht_seed = (unsigned long) time(NULL); + seed_init = true; + } + pthread_mutex_unlock(&seed_lock); + ht = zmalloc(sizeof(*ht)); if (ht == NULL) { PERROR("zmalloc lttng_ht"); @@ -143,6 +143,7 @@ error: /* * Free a lttng hashtable. */ +LTTNG_HIDDEN void lttng_ht_destroy(struct lttng_ht *ht) { int ret; @@ -155,6 +156,7 @@ void lttng_ht_destroy(struct lttng_ht *ht) /* * Init lttng ht node string. */ +LTTNG_HIDDEN void lttng_ht_node_init_str(struct lttng_ht_node_str *node, char *key) { assert(node); @@ -166,6 +168,7 @@ void lttng_ht_node_init_str(struct lttng_ht_node_str *node, char *key) /* * Init lttng ht node unsigned long. */ +LTTNG_HIDDEN void lttng_ht_node_init_ulong(struct lttng_ht_node_ulong *node, unsigned long key) { @@ -178,6 +181,7 @@ void lttng_ht_node_init_ulong(struct lttng_ht_node_ulong *node, /* * Init lttng ht node uint64_t. */ +LTTNG_HIDDEN void lttng_ht_node_init_u64(struct lttng_ht_node_u64 *node, uint64_t key) { @@ -190,6 +194,7 @@ void lttng_ht_node_init_u64(struct lttng_ht_node_u64 *node, /* * Init lttng ht node with two uint64_t. */ +LTTNG_HIDDEN void lttng_ht_node_init_two_u64(struct lttng_ht_node_two_u64 *node, uint64_t key1, uint64_t key2) { @@ -203,6 +208,7 @@ void lttng_ht_node_init_two_u64(struct lttng_ht_node_two_u64 *node, /* * Free lttng ht node string. */ +LTTNG_HIDDEN void lttng_ht_node_free_str(struct lttng_ht_node_str *node) { assert(node); @@ -212,6 +218,7 @@ void lttng_ht_node_free_str(struct lttng_ht_node_str *node) /* * Free lttng ht node unsigned long. */ +LTTNG_HIDDEN void lttng_ht_node_free_ulong(struct lttng_ht_node_ulong *node) { assert(node); @@ -221,6 +228,7 @@ void lttng_ht_node_free_ulong(struct lttng_ht_node_ulong *node) /* * Free lttng ht node uint64_t. */ +LTTNG_HIDDEN void lttng_ht_node_free_u64(struct lttng_ht_node_u64 *node) { assert(node); @@ -230,6 +238,7 @@ void lttng_ht_node_free_u64(struct lttng_ht_node_u64 *node) /* * Free lttng ht node two uint64_t. */ +LTTNG_HIDDEN void lttng_ht_node_free_two_u64(struct lttng_ht_node_two_u64 *node) { assert(node); @@ -239,7 +248,8 @@ void lttng_ht_node_free_two_u64(struct lttng_ht_node_two_u64 *node) /* * Lookup function in hashtable. */ -void lttng_ht_lookup(struct lttng_ht *ht, void *key, +LTTNG_HIDDEN +void lttng_ht_lookup(struct lttng_ht *ht, const void *key, struct lttng_ht_iter *iter) { assert(ht); @@ -252,6 +262,7 @@ void lttng_ht_lookup(struct lttng_ht *ht, void *key, /* * Add unique string node to hashtable. */ +LTTNG_HIDDEN void lttng_ht_add_unique_str(struct lttng_ht *ht, struct lttng_ht_node_str *node) { @@ -271,6 +282,7 @@ void lttng_ht_add_unique_str(struct lttng_ht *ht, /* * Add string node to hashtable. */ +LTTNG_HIDDEN void lttng_ht_add_str(struct lttng_ht *ht, struct lttng_ht_node_str *node) { @@ -288,6 +300,7 @@ void lttng_ht_add_str(struct lttng_ht *ht, /* * Add unsigned long node to hashtable. */ +LTTNG_HIDDEN void lttng_ht_add_ulong(struct lttng_ht *ht, struct lttng_ht_node_ulong *node) { assert(ht); @@ -303,8 +316,8 @@ void lttng_ht_add_ulong(struct lttng_ht *ht, struct lttng_ht_node_ulong *node) /* * Add uint64_t node to hashtable. - */ +LTTNG_HIDDEN void lttng_ht_add_u64(struct lttng_ht *ht, struct lttng_ht_node_u64 *node) { assert(ht); @@ -321,6 +334,7 @@ void lttng_ht_add_u64(struct lttng_ht *ht, struct lttng_ht_node_u64 *node) /* * Add unique unsigned long node to hashtable. */ +LTTNG_HIDDEN void lttng_ht_add_unique_ulong(struct lttng_ht *ht, struct lttng_ht_node_ulong *node) { @@ -341,6 +355,7 @@ void lttng_ht_add_unique_ulong(struct lttng_ht *ht, /* * Add unique uint64_t node to hashtable. */ +LTTNG_HIDDEN void lttng_ht_add_unique_u64(struct lttng_ht *ht, struct lttng_ht_node_u64 *node) { @@ -361,6 +376,7 @@ void lttng_ht_add_unique_u64(struct lttng_ht *ht, /* * Add unique two uint64_t node to hashtable. */ +LTTNG_HIDDEN void lttng_ht_add_unique_two_u64(struct lttng_ht *ht, struct lttng_ht_node_two_u64 *node) { @@ -381,6 +397,7 @@ void lttng_ht_add_unique_two_u64(struct lttng_ht *ht, /* * Add replace unsigned long node to hashtable. */ +LTTNG_HIDDEN struct lttng_ht_node_ulong *lttng_ht_add_replace_ulong(struct lttng_ht *ht, struct lttng_ht_node_ulong *node) { @@ -406,6 +423,7 @@ struct lttng_ht_node_ulong *lttng_ht_add_replace_ulong(struct lttng_ht *ht, /* * Add replace unsigned long node to hashtable. */ +LTTNG_HIDDEN struct lttng_ht_node_u64 *lttng_ht_add_replace_u64(struct lttng_ht *ht, struct lttng_ht_node_u64 *node) { @@ -431,6 +449,7 @@ struct lttng_ht_node_u64 *lttng_ht_add_replace_u64(struct lttng_ht *ht, /* * Delete node from hashtable. */ +LTTNG_HIDDEN int lttng_ht_del(struct lttng_ht *ht, struct lttng_ht_iter *iter) { int ret; @@ -449,6 +468,7 @@ int lttng_ht_del(struct lttng_ht *ht, struct lttng_ht_iter *iter) /* * Get first node in the hashtable. */ +LTTNG_HIDDEN void lttng_ht_get_first(struct lttng_ht *ht, struct lttng_ht_iter *iter) { assert(ht); @@ -461,6 +481,7 @@ void lttng_ht_get_first(struct lttng_ht *ht, struct lttng_ht_iter *iter) /* * Get next node in the hashtable. */ +LTTNG_HIDDEN void lttng_ht_get_next(struct lttng_ht *ht, struct lttng_ht_iter *iter) { assert(ht); @@ -473,6 +494,7 @@ void lttng_ht_get_next(struct lttng_ht *ht, struct lttng_ht_iter *iter) /* * Return the number of nodes in the hashtable. */ +LTTNG_HIDDEN unsigned long lttng_ht_get_count(struct lttng_ht *ht) { long scb, sca; @@ -492,6 +514,7 @@ unsigned long lttng_ht_get_count(struct lttng_ht *ht) /* * Return lttng ht string node from iterator. */ +LTTNG_HIDDEN struct lttng_ht_node_str *lttng_ht_iter_get_node_str( struct lttng_ht_iter *iter) { @@ -508,6 +531,7 @@ struct lttng_ht_node_str *lttng_ht_iter_get_node_str( /* * Return lttng ht unsigned long node from iterator. */ +LTTNG_HIDDEN struct lttng_ht_node_ulong *lttng_ht_iter_get_node_ulong( struct lttng_ht_iter *iter) { @@ -524,6 +548,7 @@ struct lttng_ht_node_ulong *lttng_ht_iter_get_node_ulong( /* * Return lttng ht unsigned long node from iterator. */ +LTTNG_HIDDEN struct lttng_ht_node_u64 *lttng_ht_iter_get_node_u64( struct lttng_ht_iter *iter) { @@ -540,6 +565,7 @@ struct lttng_ht_node_u64 *lttng_ht_iter_get_node_u64( /* * Return lttng ht stream and index id node from iterator. */ +LTTNG_HIDDEN struct lttng_ht_node_two_u64 *lttng_ht_iter_get_node_two_u64( struct lttng_ht_iter *iter) { @@ -552,12 +578,3 @@ struct lttng_ht_node_two_u64 *lttng_ht_iter_get_node_two_u64( } return caa_container_of(node, struct lttng_ht_node_two_u64, node); } - -/* - * lib constructor - */ -static void __attribute__((constructor)) _init(void) -{ - /* Init hash table seed */ - lttng_ht_seed = (unsigned long) time(NULL); -}