From 7c75d49894833089f34b7e71196e60b2ae5979b1 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 24 Jun 2014 01:20:30 +0000 Subject: [PATCH] rculfhash: fall back to single-threaded resize on calloc failure Having a calloc fail on my server should not be fatal. Signed-off-by: Eric Wong Signed-off-by: Mathieu Desnoyers --- rculfhash.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/rculfhash.c b/rculfhash.c index 7d39388..2a45045 100644 --- a/rculfhash.c +++ b/rculfhash.c @@ -1189,7 +1189,10 @@ void partition_resize_helper(struct cds_lfht *ht, unsigned long i, } partition_len = len >> cds_lfht_get_count_order_ulong(nr_threads); work = calloc(nr_threads, sizeof(*work)); - assert(work); + if (!work) { + dbg_printf("error allocating for resize, single-threading\n"); + goto fallback; + } for (thread = 0; thread < nr_threads; thread++) { work[thread].ht = ht; work[thread].i = i; @@ -1205,6 +1208,11 @@ void partition_resize_helper(struct cds_lfht *ht, unsigned long i, assert(!ret); } free(work); + return; +fallback: + ht->flavor->thread_online(); + fct(ht, i, 0, len); + ht->flavor->thread_offline(); } /* -- 2.34.1