X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Fhashtable.c;h=ed1d6d6d7695e86efd2fdd2c7e8b15aec7138cf1;hp=2080107005739f5d4cb61c5f9761a14d7b375998;hb=13fe116450c5021291db94d31e34e6446be48e18;hpb=990570edd474b304d4c935d82be6201d872025e4

diff --git a/src/common/hashtable/hashtable.c b/src/common/hashtable/hashtable.c
index 208010700..ed1d6d6d7 100644
--- a/src/common/hashtable/hashtable.c
+++ b/src/common/hashtable/hashtable.c
@@ -1,18 +1,18 @@
 /*
  * 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 as published by the Free
- * Software Foundation; only version 2 of the License.
+ * 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.
  *
  * 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
+ * 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., 59 Temple
- * Place - Suite 330, Boston, MA  02111-1307, USA.
+ * 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
@@ -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.
  */
@@ -199,6 +213,28 @@ void lttng_ht_add_unique_ulong(struct lttng_ht *ht,
 	assert(node_ptr == &node->node);
 }
 
+/*
+ * Add replace unsigned long node to hashtable.
+ */
+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);
+
+	node_ptr = cds_lfht_add_replace(ht->ht,
+			ht->hash_fct((void *) node->key, HASH_SEED), ht->match_fct,
+			(void *) node->key, &node->node);
+	if (!node_ptr) {
+		return NULL;
+	} else {
+		return caa_container_of(node_ptr, struct lttng_ht_node_ulong, node);
+	}
+	assert(node_ptr == &node->node);
+}
+
 /*
  * Delete node from hashtable.
  */