From: David Goulet <dgoulet@efficios.com>
Date: Tue, 30 Oct 2012 19:17:06 +0000 (-0400)
Subject: Fix: Add the ACCOUNTING flag to ht creation and set bucket size to 0
X-Git-Tag: v2.1.0-rc6~5
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=13fe116450c5021291db94d31e34e6446be48e18;p=lttng-tools.git

Fix: Add the ACCOUNTING flag to ht creation and set bucket size to 0

The resize feature does not work well without the accounting :)

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/common/hashtable/hashtable.c b/src/common/hashtable/hashtable.c
index 46717c9ba..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.