From 514358e5d37254ee8b3fce1c63f863ed011159ee Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Tue, 15 Jan 2019 13:57:14 -0700 Subject: [PATCH] event: Move thread lib init/fini into reactor.c Keep all of the thread library interactions in one file. Change-Id: Iecb20d3767190b5da105a29670ead9e192d03257 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/c/440761 Tested-by: SPDK CI Jenkins Reviewed-by: Darek Stojaczyk Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- lib/event/app.c | 3 --- lib/event/reactor.c | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/event/app.c b/lib/event/app.c index 17a97aa7df..d09cd4423c 100644 --- a/lib/event/app.c +++ b/lib/event/app.c @@ -624,8 +624,6 @@ spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn, spdk_log_open(); SPDK_NOTICELOG("Total cores available: %d\n", spdk_env_get_core_count()); - spdk_thread_lib_init(NULL); - /* * If mask not specified on command line or in configuration file, * reactor_mask will be 0x1 which will enable core 0 to run one @@ -698,7 +696,6 @@ spdk_app_fini(void) spdk_reactors_fini(); spdk_conf_free(g_spdk_app.config); spdk_log_close(); - spdk_thread_lib_fini(); } static void diff --git a/lib/event/reactor.c b/lib/event/reactor.c index 0b775e90cc..ec2588f1d2 100644 --- a/lib/event/reactor.c +++ b/lib/event/reactor.c @@ -406,6 +406,8 @@ spdk_reactors_init(unsigned int max_delay_us) memset(g_reactors, 0, (last_core + 1) * sizeof(struct spdk_reactor)); + spdk_thread_lib_init(NULL); + SPDK_ENV_FOREACH_CORE(i) { reactor = spdk_reactor_get(i); spdk_reactor_construct(reactor, i, max_delay_us); @@ -422,6 +424,8 @@ 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) {