X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Fhashtable.c;h=ed1d6d6d7695e86efd2fdd2c7e8b15aec7138cf1;hp=187a4d6b3ebabf4c6b6c612bcb8f36835ba3a24b;hb=13fe116450c5021291db94d31e34e6446be48e18;hpb=d14d33bf091e72b23b1f90ea18a0a01bed098b76 diff --git a/src/common/hashtable/hashtable.c b/src/common/hashtable/hashtable.c index 187a4d6b3..ed1d6d6d7 100644 --- a/src/common/hashtable/hashtable.c +++ b/src/common/hashtable/hashtable.c @@ -30,7 +30,7 @@ #define HASH_SEED 0x42UL /* The answer to life */ static unsigned long min_hash_alloc_size = 1; -static unsigned long max_hash_buckets_size = (1UL << 20); +static unsigned long max_hash_buckets_size = 0; /* * Match function for string node. @@ -72,7 +72,7 @@ struct lttng_ht *lttng_ht_new(unsigned long size, int type) } ht->ht = cds_lfht_new(size, min_hash_alloc_size, max_hash_buckets_size, - CDS_LFHT_AUTO_RESIZE, NULL); + CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING, NULL); /* * There is already an assert in the RCU hashtable code so if the ht is * NULL here there is a *huge* problem. @@ -110,6 +110,7 @@ void lttng_ht_destroy(struct lttng_ht *ht) ret = cds_lfht_destroy(ht->ht, NULL); assert(!ret); + free(ht); } /* @@ -182,6 +183,19 @@ void lttng_ht_add_unique_str(struct lttng_ht *ht, assert(node_ptr == &node->node); } +/* + * Add unsigned long node to hashtable. + */ +void lttng_ht_add_ulong(struct lttng_ht *ht, struct lttng_ht_node_ulong *node) +{ + assert(ht); + assert(ht->ht); + assert(node); + + cds_lfht_add(ht->ht, ht->hash_fct((void *) node->key, HASH_SEED), + &node->node); +} + /* * Add unique unsigned long node to hashtable. */