Fix: rculfhash: use zmalloc()

[lttng-tools.git] / src / common / hashtable / rculfhash.c

diff --git a/src/common/hashtable/rculfhash.c b/src/common/hashtable/rculfhash.c
index 0ddd21a3b6335ccf3fb2ddb5ea5f1a9dbba1564c..ff7e681046a9ce8620195a7330b2f0c69f702a4e 100644 (file)
--- a/src/common/hashtable/rculfhash.c
+++ b/src/common/hashtable/rculfhash.c
@@ -278,6 +278,8 @@
 #include "rculfhash-internal.h"
 #include "urcu-flavor.h"
 
+#include <common/common.h>
+
 /*
  * We need to lock pthread exit, which deadlocks __nptl_setxid in the runas
  * clone.  This work-around will be allowed to be removed when runas.c gets
@@ -627,7 +629,7 @@ void free_split_items_count(struct cds_lfht *ht)
        poison_free(ht->split_count);
 }
 
-#if defined(HAVE_SCHED_GETCPU)
+#if defined(HAVE_SCHED_GETCPU) && !defined(VALGRIND)
 static
 int ht_get_split_count_index(unsigned long hash)
 {
@@ -1981,7 +1983,7 @@ void __cds_lfht_resize_lazy_launch(struct cds_lfht *ht)
                        uatomic_dec(&ht->in_progress_resize);
                        return;
                }
-               work = malloc(sizeof(*work));
+               work = zmalloc(sizeof(*work));
                if (work == NULL) {
                        dbg_printf("error allocating resize work, bailing out\n");
                        uatomic_dec(&ht->in_progress_resize);