X-Git-Url: http://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=src%2Frculfhash-mm-order.c;fp=src%2Frculfhash-mm-order.c;h=2b0f707ef05ca77703e9de6c19cb55f5068cb948;hp=1014c3838d79fad745cc464befe4b2d098db8e08;hb=ac7352545826996e3866c599e4a8eff05fb662ca;hpb=c6fbc27960c6ae09af830e33884a40f53a879f6b

diff --git a/src/rculfhash-mm-order.c b/src/rculfhash-mm-order.c
index 1014c38..2b0f707 100644
--- a/src/rculfhash-mm-order.c
+++ b/src/rculfhash-mm-order.c
@@ -14,12 +14,12 @@ static
 void cds_lfht_alloc_bucket_table(struct cds_lfht *ht, unsigned long order)
 {
 	if (order == 0) {
-		ht->tbl_order[0] = calloc(ht->min_nr_alloc_buckets,
-			sizeof(struct cds_lfht_node));
+		ht->tbl_order[0] = ht->alloc->calloc(ht->alloc->state,
+			ht->min_nr_alloc_buckets, sizeof(struct cds_lfht_node));
 		urcu_posix_assert(ht->tbl_order[0]);
 	} else if (order > ht->min_alloc_buckets_order) {
-		ht->tbl_order[order] = calloc(1UL << (order -1),
-			sizeof(struct cds_lfht_node));
+		ht->tbl_order[order] = ht->alloc->calloc(ht->alloc->state,
+			1UL << (order -1), sizeof(struct cds_lfht_node));
 		urcu_posix_assert(ht->tbl_order[order]);
 	}
 	/* Nothing to do for 0 < order && order <= ht->min_alloc_buckets_order */
@@ -34,9 +34,9 @@ static
 void cds_lfht_free_bucket_table(struct cds_lfht *ht, unsigned long order)
 {
 	if (order == 0)
-		poison_free(ht->tbl_order[0]);
+		poison_free(ht->alloc, ht->tbl_order[0]);
 	else if (order > ht->min_alloc_buckets_order)
-		poison_free(ht->tbl_order[order]);
+		poison_free(ht->alloc, ht->tbl_order[order]);
 	/* Nothing to do for 0 < order && order <= ht->min_alloc_buckets_order */
 }
 
@@ -62,10 +62,10 @@ struct cds_lfht_node *bucket_at(struct cds_lfht *ht, unsigned long index)
 
 static
 struct cds_lfht *alloc_cds_lfht(unsigned long min_nr_alloc_buckets,
-		unsigned long max_nr_buckets)
+		unsigned long max_nr_buckets, const struct cds_lfht_alloc *alloc)
 {
 	return __default_alloc_cds_lfht(
-			&cds_lfht_mm_order, sizeof(struct cds_lfht),
+			&cds_lfht_mm_order, alloc, sizeof(struct cds_lfht),
 			min_nr_alloc_buckets, max_nr_buckets);
 }