uatomic/x86: Remove redundant memory barriers

[urcu.git] / src / rculfhash-mm-chunk.c

diff --git a/src/rculfhash-mm-chunk.c b/src/rculfhash-mm-chunk.c
index 9273ac9755c295cf29d5006698827da821ad2ef3..93931ee7a7e773dbd6fcf92917c6cfac1cfe2306 100644 (file)
--- a/src/rculfhash-mm-chunk.c
+++ b/src/rculfhash-mm-chunk.c
@@ -1,42 +1,28 @@
+// SPDX-FileCopyrightText: 2011 Lai Jiangshan <laijs@cn.fujitsu.com>
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 /*
- * rculfhash-mm-chunk.c
- *
  * Chunk based memory management for Lock-Free RCU Hash Table
- *
- * Copyright 2011 - Lai Jiangshan <laijs@cn.fujitsu.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stddef.h>
 #include <urcu/assert.h>
-#include <rculfhash-internal.h>
+#include "rculfhash-internal.h"
 
 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]);
                }
        }
@@ -52,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 */
 }
@@ -74,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;
 
@@ -86,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);
 }