#include <sys/mman.h>
#include "rculfhash-internal.h"
+#ifndef MAP_ANONYMOUS
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
/* reserve inaccessible memory space without allocation any memory */
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);
*/
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);
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;
page_bucket_size);
}
- ht = calloc(1, sizeof(struct cds_lfht));
- assert(ht);
-
- 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;
-
- ht->bucket_at = bucket_at;
-
- 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 = {