[ Edit by Mathieu Desnoyers: fix null pointer in poison_free. ]
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-#define poison_free(ptr) \
- do { \
- memset(ptr, 0x42, sizeof(*(ptr))); \
- free(ptr); \
+#define poison_free(ptr) \
+ do { \
+ if (ptr) { \
+ memset(ptr, 0x42, sizeof(*(ptr))); \
+ free(ptr); \
+ } \
} while (0)
#else
#define poison_free(ptr) free(ptr)
} while (0)
#else
#define poison_free(ptr) free(ptr)
#endif /* #else #if defined(HAVE_SYSCONF) */
static
#endif /* #else #if defined(HAVE_SYSCONF) */
static
-struct ht_items_count *alloc_split_items_count(void)
+void alloc_split_items_count(struct cds_lfht *ht)
{
struct ht_items_count *count;
{
struct ht_items_count *count;
}
assert(split_count_mask >= 0);
}
assert(split_count_mask >= 0);
- return calloc(split_count_mask + 1, sizeof(*count));
+
+ if (ht->flags & CDS_LFHT_ACCOUNTING) {
+ ht->split_count = calloc(split_count_mask + 1, sizeof(*count));
+ assert(ht->split_count);
+ } else {
+ ht->split_count = NULL;
+ }
-void free_split_items_count(struct ht_items_count *count)
+void free_split_items_count(struct cds_lfht *ht)
+ poison_free(ht->split_count);
}
#if defined(HAVE_SCHED_GETCPU)
}
#if defined(HAVE_SCHED_GETCPU)
ht->cds_lfht_rcu_register_thread = cds_lfht_rcu_register_thread;
ht->cds_lfht_rcu_unregister_thread = cds_lfht_rcu_unregister_thread;
ht->resize_attr = attr;
ht->cds_lfht_rcu_register_thread = cds_lfht_rcu_register_thread;
ht->cds_lfht_rcu_unregister_thread = cds_lfht_rcu_unregister_thread;
ht->resize_attr = attr;
- ht->split_count = alloc_split_items_count();
+ alloc_split_items_count(ht);
/* this mutex should not nest in read-side C.S. */
pthread_mutex_init(&ht->resize_mutex, NULL);
ht->flags = flags;
/* this mutex should not nest in read-side C.S. */
pthread_mutex_init(&ht->resize_mutex, NULL);
ht->flags = flags;
ret = cds_lfht_delete_dummy(ht);
if (ret)
return ret;
ret = cds_lfht_delete_dummy(ht);
if (ret)
return ret;
- free_split_items_count(ht->split_count);
+ free_split_items_count(ht);
if (attr)
*attr = ht->resize_attr;
poison_free(ht);
if (attr)
*attr = ht->resize_attr;
poison_free(ht);
unsigned long nr_dummy = 0;
*approx_before = 0;
unsigned long nr_dummy = 0;
*approx_before = 0;
- if (split_count_mask >= 0) {
int i;
for (i = 0; i < split_count_mask + 1; i++) {
int i;
for (i = 0; i < split_count_mask + 1; i++) {
} while (!is_end(node));
dbg_printf("number of dummy nodes: %lu\n", nr_dummy);
*approx_after = 0;
} while (!is_end(node));
dbg_printf("number of dummy nodes: %lu\n", nr_dummy);
*approx_after = 0;
- if (split_count_mask >= 0) {
int i;
for (i = 0; i < split_count_mask + 1; i++) {
int i;
for (i = 0; i < split_count_mask + 1; i++) {
rcu_register_thread();
test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL,
init_hash_size, 1,
rcu_register_thread();
test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL,
init_hash_size, 1,
- opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0, NULL);
+ (opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0) |
+ CDS_LFHT_ACCOUNTING, NULL);
ret = populate_hash();
assert(!ret);
ret = populate_hash();
assert(!ret);
*/
enum {
CDS_LFHT_AUTO_RESIZE = (1U << 0),
*/
enum {
CDS_LFHT_AUTO_RESIZE = (1U << 0),
+ CDS_LFHT_ACCOUNTING = (1U << 1),