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

diff --git a/src/rculfhash-mm-chunk.c b/src/rculfhash-mm-chunk.c
index cf3a9ff..93931ee 100644
--- a/src/rculfhash-mm-chunk.c
+++ b/src/rculfhash-mm-chunk.c
@@ -14,15 +14,15 @@ static
 void cds_lfht_alloc_bucket_table(struct cds_lfht *ht, unsigned long order)
 {
 	if (order == 0) {
-		ht->tbl_chunk[0] = calloc(ht->min_nr_alloc_buckets,
-			sizeof(struct cds_lfht_node));
+		ht->tbl_chunk[0] = ht->alloc->calloc(ht->alloc->state,
+			ht->min_nr_alloc_buckets, sizeof(struct cds_lfht_node));
 		urcu_posix_assert(ht->tbl_chunk[0]);
 	} else if (order > ht->min_alloc_buckets_order) {
 		unsigned long i, len = 1UL << (order - 1 - ht->min_alloc_buckets_order);
 
 		for (i = len; i < 2 * len; i++) {
-			ht->tbl_chunk[i] = calloc(ht->min_nr_alloc_buckets,
-				sizeof(struct cds_lfht_node));
+			ht->tbl_chunk[i] = ht->alloc->calloc(ht->alloc->state,
+				ht->min_nr_alloc_buckets, sizeof(struct cds_lfht_node));
 			urcu_posix_assert(ht->tbl_chunk[i]);
 		}
 	}
@@ -38,12 +38,12 @@ static
 void cds_lfht_free_bucket_table(struct cds_lfht *ht, unsigned long order)
 {
 	if (order == 0)
-		poison_free(ht->tbl_chunk[0]);
+		poison_free(ht->alloc, ht->tbl_chunk[0]);
 	else if (order > ht->min_alloc_buckets_order) {
 		unsigned long i, len = 1UL << (order - 1 - ht->min_alloc_buckets_order);
 
 		for (i = len; i < 2 * len; i++)
-			poison_free(ht->tbl_chunk[i]);
+			poison_free(ht->alloc, ht->tbl_chunk[i]);
 	}
 	/* Nothing to do for 0 < order && order <= ht->min_alloc_buckets_order */
 }
@@ -60,7 +60,7 @@ 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)
 {
 	unsigned long nr_chunks, cds_lfht_size;
 
@@ -72,7 +72,7 @@ struct cds_lfht *alloc_cds_lfht(unsigned long min_nr_alloc_buckets,
 	cds_lfht_size = max(cds_lfht_size, sizeof(struct cds_lfht));
 
 	return __default_alloc_cds_lfht(
-			&cds_lfht_mm_chunk, cds_lfht_size,
+			&cds_lfht_mm_chunk, alloc, cds_lfht_size,
 			min_nr_alloc_buckets, max_nr_buckets);
 }