/*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * 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, 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 _LGPL_SOURCE
-#include <assert.h>
#include <string.h>
#include <urcu.h>
#include <urcu/compiler.h>
return hash_match_key_two_u64((void *) &match_node->key, (void *) key);
}
+static inline
+const char *lttng_ht_type_str(enum lttng_ht_type type)
+{
+ switch (type) {
+ case LTTNG_HT_TYPE_STRING:
+ return "STRING";
+ case LTTNG_HT_TYPE_ULONG:
+ return "ULONG";
+ case LTTNG_HT_TYPE_U64:
+ return "U64";
+ case LTTNG_HT_TYPE_TWO_U64:
+ return "TWO_U64";
+ default:
+ ERR("Unknown lttng hashtable type %d", type);
+ abort();
+ }
+}
+
/*
* Return an allocated lttng hashtable.
*/
-LTTNG_HIDDEN
struct lttng_ht *lttng_ht_new(unsigned long size, int type)
{
struct lttng_ht *ht;
* There is already an assert in the RCU hashtable code so if the ht is
* NULL here there is a *huge* problem.
*/
- assert(ht->ht);
+ LTTNG_ASSERT(ht->ht);
switch (type) {
case LTTNG_HT_TYPE_STRING:
goto error;
}
- DBG3("Created hashtable size %lu at %p of type %d", size, ht->ht, type);
+ DBG3("Created hashtable size %lu at %p of type %s", size, ht->ht,
+ lttng_ht_type_str(type));
return ht;
/*
* Free a lttng hashtable.
*/
-LTTNG_HIDDEN
void lttng_ht_destroy(struct lttng_ht *ht)
{
int ret;
ret = cds_lfht_destroy(ht->ht, NULL);
- assert(!ret);
+ LTTNG_ASSERT(!ret);
free(ht);
}
/*
* Init lttng ht node string.
*/
-LTTNG_HIDDEN
void lttng_ht_node_init_str(struct lttng_ht_node_str *node, char *key)
{
- assert(node);
+ LTTNG_ASSERT(node);
node->key = key;
cds_lfht_node_init(&node->node);
/*
* Init lttng ht node unsigned long.
*/
-LTTNG_HIDDEN
void lttng_ht_node_init_ulong(struct lttng_ht_node_ulong *node,
unsigned long key)
{
- assert(node);
+ LTTNG_ASSERT(node);
node->key = key;
cds_lfht_node_init(&node->node);
/*
* Init lttng ht node uint64_t.
*/
-LTTNG_HIDDEN
void lttng_ht_node_init_u64(struct lttng_ht_node_u64 *node,
uint64_t key)
{
- assert(node);
+ LTTNG_ASSERT(node);
node->key = key;
cds_lfht_node_init(&node->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)
{
- assert(node);
+ LTTNG_ASSERT(node);
node->key.key1 = key1;
node->key.key2 = key2;
/*
* Free lttng ht node string.
*/
-LTTNG_HIDDEN
void lttng_ht_node_free_str(struct lttng_ht_node_str *node)
{
- assert(node);
+ LTTNG_ASSERT(node);
free(node);
}
/*
* Free lttng ht node unsigned long.
*/
-LTTNG_HIDDEN
void lttng_ht_node_free_ulong(struct lttng_ht_node_ulong *node)
{
- assert(node);
+ LTTNG_ASSERT(node);
free(node);
}
/*
* Free lttng ht node uint64_t.
*/
-LTTNG_HIDDEN
void lttng_ht_node_free_u64(struct lttng_ht_node_u64 *node)
{
- assert(node);
+ LTTNG_ASSERT(node);
free(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);
+ LTTNG_ASSERT(node);
free(node);
}
/*
* Lookup function in hashtable.
*/
-LTTNG_HIDDEN
-void lttng_ht_lookup(struct lttng_ht *ht, void *key,
+void lttng_ht_lookup(struct lttng_ht *ht, const void *key,
struct lttng_ht_iter *iter)
{
- assert(ht);
- assert(ht->ht);
+ LTTNG_ASSERT(ht);
+ LTTNG_ASSERT(ht->ht);
cds_lfht_lookup(ht->ht, ht->hash_fct(key, lttng_ht_seed),
ht->match_fct, key, &iter->iter);
/*
* Add unique string node to hashtable.
*/
-LTTNG_HIDDEN
void lttng_ht_add_unique_str(struct lttng_ht *ht,
struct lttng_ht_node_str *node)
{
struct cds_lfht_node *node_ptr;
- assert(ht);
- assert(ht->ht);
- assert(node);
+ LTTNG_ASSERT(ht);
+ LTTNG_ASSERT(ht->ht);
+ LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
rcu_read_lock();
node_ptr = cds_lfht_add_unique(ht->ht, ht->hash_fct(node->key, lttng_ht_seed),
ht->match_fct, node->key, &node->node);
rcu_read_unlock();
- assert(node_ptr == &node->node);
+ LTTNG_ASSERT(node_ptr == &node->node);
}
/*
* Add string node to hashtable.
*/
-LTTNG_HIDDEN
void lttng_ht_add_str(struct lttng_ht *ht,
struct lttng_ht_node_str *node)
{
- assert(ht);
- assert(ht->ht);
- assert(node);
+ LTTNG_ASSERT(ht);
+ LTTNG_ASSERT(ht->ht);
+ LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
rcu_read_lock();
/*
* 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);
- assert(ht->ht);
- assert(node);
+ LTTNG_ASSERT(ht);
+ LTTNG_ASSERT(ht->ht);
+ LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
rcu_read_lock();
/*
* 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);
- assert(ht->ht);
- assert(node);
+ LTTNG_ASSERT(ht);
+ LTTNG_ASSERT(ht->ht);
+ LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
rcu_read_lock();
/*
* 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)
{
struct cds_lfht_node *node_ptr;
- assert(ht);
- assert(ht->ht);
- assert(node);
+ LTTNG_ASSERT(ht);
+ LTTNG_ASSERT(ht->ht);
+ LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
rcu_read_lock();
ht->hash_fct((void *) node->key, lttng_ht_seed), ht->match_fct,
(void *) node->key, &node->node);
rcu_read_unlock();
- assert(node_ptr == &node->node);
+ LTTNG_ASSERT(node_ptr == &node->node);
}
/*
* 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)
{
struct cds_lfht_node *node_ptr;
- assert(ht);
- assert(ht->ht);
- assert(node);
+ LTTNG_ASSERT(ht);
+ LTTNG_ASSERT(ht->ht);
+ LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
rcu_read_lock();
ht->hash_fct(&node->key, lttng_ht_seed), ht->match_fct,
&node->key, &node->node);
rcu_read_unlock();
- assert(node_ptr == &node->node);
+ LTTNG_ASSERT(node_ptr == &node->node);
}
/*
* 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)
{
struct cds_lfht_node *node_ptr;
- assert(ht);
- assert(ht->ht);
- assert(node);
+ LTTNG_ASSERT(ht);
+ LTTNG_ASSERT(ht->ht);
+ LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
rcu_read_lock();
ht->hash_fct((void *) &node->key, lttng_ht_seed), ht->match_fct,
(void *) &node->key, &node->node);
rcu_read_unlock();
- assert(node_ptr == &node->node);
+ LTTNG_ASSERT(node_ptr == &node->node);
}
/*
* 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)
{
struct cds_lfht_node *node_ptr;
- assert(ht);
- assert(ht->ht);
- assert(node);
+ LTTNG_ASSERT(ht);
+ LTTNG_ASSERT(ht->ht);
+ LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
rcu_read_lock();
} else {
return caa_container_of(node_ptr, struct lttng_ht_node_ulong, node);
}
- assert(node_ptr == &node->node);
+ LTTNG_ASSERT(node_ptr == &node->node);
}
/*
* 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)
{
struct cds_lfht_node *node_ptr;
- assert(ht);
- assert(ht->ht);
- assert(node);
+ LTTNG_ASSERT(ht);
+ LTTNG_ASSERT(ht->ht);
+ LTTNG_ASSERT(node);
/* RCU read lock protects from ABA. */
rcu_read_lock();
} else {
return caa_container_of(node_ptr, struct lttng_ht_node_u64, node);
}
- assert(node_ptr == &node->node);
+ LTTNG_ASSERT(node_ptr == &node->node);
}
/*
* Delete node from hashtable.
*/
-LTTNG_HIDDEN
int lttng_ht_del(struct lttng_ht *ht, struct lttng_ht_iter *iter)
{
int ret;
- assert(ht);
- assert(ht->ht);
- assert(iter);
+ LTTNG_ASSERT(ht);
+ LTTNG_ASSERT(ht->ht);
+ LTTNG_ASSERT(iter);
/* RCU read lock protects from ABA. */
rcu_read_lock();
/*
* Get first node in the hashtable.
*/
-LTTNG_HIDDEN
void lttng_ht_get_first(struct lttng_ht *ht, struct lttng_ht_iter *iter)
{
- assert(ht);
- assert(ht->ht);
- assert(iter);
+ LTTNG_ASSERT(ht);
+ LTTNG_ASSERT(ht->ht);
+ LTTNG_ASSERT(iter);
cds_lfht_first(ht->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);
- assert(ht->ht);
- assert(iter);
+ LTTNG_ASSERT(ht);
+ LTTNG_ASSERT(ht->ht);
+ LTTNG_ASSERT(iter);
cds_lfht_next(ht->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;
unsigned long count;
- assert(ht);
- assert(ht->ht);
+ LTTNG_ASSERT(ht);
+ LTTNG_ASSERT(ht->ht);
/* RCU read lock protects from ABA and allows RCU traversal. */
rcu_read_lock();
/*
* 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)
{
struct cds_lfht_node *node;
- assert(iter);
+ LTTNG_ASSERT(iter);
node = cds_lfht_iter_get_node(&iter->iter);
if (!node) {
return NULL;
/*
* 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)
{
struct cds_lfht_node *node;
- assert(iter);
+ LTTNG_ASSERT(iter);
node = cds_lfht_iter_get_node(&iter->iter);
if (!node) {
return NULL;
/*
* 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)
{
struct cds_lfht_node *node;
- assert(iter);
+ LTTNG_ASSERT(iter);
node = cds_lfht_iter_get_node(&iter->iter);
if (!node) {
return NULL;
/*
* 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)
{
struct cds_lfht_node *node;
- assert(iter);
+ LTTNG_ASSERT(iter);
node = cds_lfht_iter_get_node(&iter->iter);
if (!node) {
return NULL;