X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=rculfhash-mm-mmap.c;h=4554ed6007f20df68bfac3f2fe74a5a9e39c55fc;hp=e2c565e67fee5b48654f9eb12b72aa6f41ec8c44;hb=aee1715b914e5f4ba5003079d5d954ef2209f04e;hpb=e4ea7f62f5f009af7818cb05bd239bf67bae78ce

diff --git a/rculfhash-mm-mmap.c b/rculfhash-mm-mmap.c
index e2c565e..4554ed6 100644
--- a/rculfhash-mm-mmap.c
+++ b/rculfhash-mm-mmap.c
@@ -36,14 +36,18 @@ static void *memory_map(size_t length)
 
 static void memory_unmap(void *ptr, size_t length)
 {
-	int ret = munmap(ptr, length);
+	int ret __attribute__((unused));
+
+	ret = munmap(ptr, length);
 
 	assert(ret == 0);
 }
 
 static void memory_populate(void *ptr, size_t length)
 {
-	void *ret = mmap(ptr, length, PROT_READ | PROT_WRITE,
+	void *ret __attribute__((unused));
+
+	ret = mmap(ptr, length, PROT_READ | PROT_WRITE,
 			MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
 	assert(ret == ptr);
@@ -55,7 +59,9 @@ static void memory_populate(void *ptr, size_t length)
  */
 static void memory_discard(void *ptr, size_t length)
 {
-	void *ret = mmap(ptr, length, PROT_NONE,
+	void *ret __attribute__((unused));
+
+	ret = mmap(ptr, length, PROT_NONE,
 			MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
 	assert(ret == ptr);
@@ -125,9 +131,9 @@ static
 struct cds_lfht *alloc_cds_lfht(unsigned long min_nr_alloc_buckets,
 		unsigned long max_nr_buckets)
 {
-	struct cds_lfht *ht;
-	unsigned long page_bucket_size = getpagesize() / sizeof(*ht->tbl_mmap);
+	unsigned long page_bucket_size;
 
+	page_bucket_size = getpagesize() / sizeof(struct cds_lfht_node);
 	if (max_nr_buckets <= page_bucket_size) {
 		/* small table */
 		min_nr_alloc_buckets = max_nr_buckets;
@@ -137,18 +143,9 @@ struct cds_lfht *alloc_cds_lfht(unsigned long min_nr_alloc_buckets,
 					page_bucket_size);
 	}
 
-	ht = calloc(1, sizeof(struct cds_lfht));
-	assert(ht);
-
-	ht->bucket_at = bucket_at;
-	ht->mm = &cds_lfht_mm_mmap;
-	ht->min_nr_alloc_buckets = min_nr_alloc_buckets;
-	ht->min_alloc_buckets_order =
-			get_count_order_ulong(min_nr_alloc_buckets);
-	ht->max_nr_buckets = max_nr_buckets;
-
-
-	return ht;
+	return __default_alloc_cds_lfht(
+			&cds_lfht_mm_mmap, sizeof(struct cds_lfht),
+			min_nr_alloc_buckets, max_nr_buckets);
 }
 
 const struct cds_lfht_mm_type cds_lfht_mm_mmap = {