X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=src%2Frculfhash-internal.h;h=e17210b8624cf7fd370ef88f591174e100085548;hp=325e55bed31a920ae7f27ef08343707ee6379163;hb=HEAD;hpb=b047e7a793421e3ff1f5dca2b27c72751a1f4db4

diff --git a/src/rculfhash-internal.h b/src/rculfhash-internal.h
index 325e55b..7225ec9 100644
--- a/src/rculfhash-internal.h
+++ b/src/rculfhash-internal.h
@@ -1,27 +1,13 @@
+// SPDX-FileCopyrightText: 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+// SPDX-FileCopyrightText: 2011 Lai Jiangshan <laijs@cn.fujitsu.com>
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 #ifndef _URCU_RCULFHASH_INTERNAL_H
 #define _URCU_RCULFHASH_INTERNAL_H
 
 /*
- * urcu/rculfhash-internal.h
- *
  * Internal header for Lock-Free RCU Hash Table
- *
- * Copyright 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- * 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 <urcu/assert.h>
@@ -73,6 +59,7 @@ struct cds_lfht {
 	/* Initial configuration items */
 	unsigned long max_nr_buckets;
 	const struct cds_lfht_mm_type *mm;	/* memory management plugin */
+	const struct cds_lfht_alloc *alloc;	/* memory allocator for mm */
 	const struct rcu_flavor_struct *flavor;	/* RCU flavor */
 
 	long count;			/* global approximate item count */
@@ -153,30 +140,32 @@ extern unsigned int cds_lfht_fls_ulong(unsigned long x);
 extern int cds_lfht_get_count_order_ulong(unsigned long x);
 
 #ifdef POISON_FREE
-#define poison_free(ptr)					\
+#define poison_free(alloc, ptr)					\
 	do {							\
 		if (ptr) {					\
 			memset(ptr, 0x42, sizeof(*(ptr)));	\
-			free(ptr);				\
+			alloc->free(alloc->state, ptr);				\
 		}						\
 	} while (0)
 #else
-#define poison_free(ptr)	free(ptr)
+#define poison_free(alloc, ptr)	alloc->free(alloc->state, ptr)
 #endif
 
 static inline
 struct cds_lfht *__default_alloc_cds_lfht(
 		const struct cds_lfht_mm_type *mm,
+		const struct cds_lfht_alloc *alloc,
 		unsigned long cds_lfht_size,
 		unsigned long min_nr_alloc_buckets,
 		unsigned long max_nr_buckets)
 {
 	struct cds_lfht *ht;
 
-	ht = calloc(1, cds_lfht_size);
+	ht = alloc->calloc(alloc->state, 1, cds_lfht_size);
 	urcu_posix_assert(ht);
 
 	ht->mm = mm;
+	ht->alloc = alloc;
 	ht->bucket_at = mm->bucket_at;
 	ht->min_nr_alloc_buckets = min_nr_alloc_buckets;
 	ht->min_alloc_buckets_order =