From 6aff44ccbb55b93d8584366478bea28884aa3520 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Wed, 21 Aug 2019 13:27:36 -0700 Subject: [PATCH] event: Move spdk_reactors_fini higher up in file Change-Id: I07a96c0a4eaabd762da684a577381ec95410d32d Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465992 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Darek Stojaczyk --- lib/event/reactor.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/event/reactor.c b/lib/event/reactor.c index b635b39a8..497612019 100644 --- a/lib/event/reactor.c +++ b/lib/event/reactor.c @@ -164,6 +164,27 @@ spdk_reactors_init(void) return 0; } +void +spdk_reactors_fini(void) +{ + uint32_t i; + struct spdk_reactor *reactor; + + spdk_thread_lib_fini(); + + SPDK_ENV_FOREACH_CORE(i) { + reactor = spdk_reactor_get(i); + if (spdk_likely(reactor != NULL) && reactor->events != NULL) { + spdk_ring_free(reactor->events); + } + } + + spdk_mempool_free(g_spdk_event_mempool); + + free(g_reactors); + g_reactors = NULL; +} + struct spdk_event * spdk_event_allocate(uint32_t lcore, spdk_event_fn fn, void *arg1, void *arg2) { @@ -508,25 +529,4 @@ spdk_reactor_schedule_thread(struct spdk_thread *thread) return 0; } -void -spdk_reactors_fini(void) -{ - uint32_t i; - struct spdk_reactor *reactor; - - spdk_thread_lib_fini(); - - SPDK_ENV_FOREACH_CORE(i) { - reactor = spdk_reactor_get(i); - if (spdk_likely(reactor != NULL) && reactor->events != NULL) { - spdk_ring_free(reactor->events); - } - } - - spdk_mempool_free(g_spdk_event_mempool); - - free(g_reactors); - g_reactors = NULL; -} - SPDK_LOG_REGISTER_COMPONENT("reactor", SPDK_LOG_REACTOR)