From 9d6ff68e3872062a6b87167a3b2e80c2561c879e Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Fri, 21 Jul 2017 11:13:32 -0700 Subject: [PATCH] event: Simplify spdk_reactors_fini We don't actually need the socket mask. Change-Id: Icec9e571e31f1955644b32c919e3f5a699338f0b Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/370722 Reviewed-by: Daniel Verkamp Tested-by: SPDK Automated Test System --- lib/event/reactor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/event/reactor.c b/lib/event/reactor.c index 58ef00733..57c9904d5 100644 --- a/lib/event/reactor.c +++ b/lib/event/reactor.c @@ -586,6 +586,8 @@ spdk_reactors_init(unsigned int max_delay_us) return -1; } } + } else { + g_spdk_event_mempool[i] = NULL; } } @@ -603,7 +605,6 @@ int spdk_reactors_fini(void) { uint32_t i; - uint64_t socket_mask; struct spdk_reactor *reactor; SPDK_ENV_FOREACH_CORE(i) { @@ -613,9 +614,8 @@ spdk_reactors_fini(void) } } - socket_mask = spdk_reactor_get_socket_mask(); for (i = 0; i < SPDK_MAX_SOCKET; i++) { - if ((1ULL << i) & socket_mask && g_spdk_event_mempool[i] != NULL) { + if (g_spdk_event_mempool[i] != NULL) { spdk_mempool_free(g_spdk_event_mempool[i]); } }