From 50c48ee92d1b74703c4c172666e1307c81693fb2 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Mon, 4 Mar 2019 13:24:33 -0700 Subject: [PATCH] event: Eliminate extra event in spdk_subsystem_init This isn't required anymore because spdk_subsystem_init is now always called after an event has been executed, so it always runs after the framework has initialized. Change-Id: I05e1a4dd605f27247b6d43f5234173e07d9b9dd2 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/446996 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Darek Stojaczyk Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris --- lib/event/subsystem.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/lib/event/subsystem.c b/lib/event/subsystem.c index c485e3fee..7665890cd 100644 --- a/lib/event/subsystem.c +++ b/lib/event/subsystem.c @@ -150,11 +150,14 @@ spdk_subsystem_init_next(int rc) } } -static void -spdk_subsystem_verify(void *arg1, void *arg2) +void +spdk_subsystem_init(spdk_msg_fn cb_fn, void *cb_arg) { struct spdk_subsystem_depend *dep; + g_app_start_fn = cb_fn; + g_app_start_arg = cb_arg; + /* Verify that all dependency name and depends_on subsystems are registered */ TAILQ_FOREACH(dep, &g_subsystems_deps, tailq) { if (!spdk_subsystem_find(&g_subsystems, dep->name)) { @@ -175,18 +178,6 @@ spdk_subsystem_verify(void *arg1, void *arg2) spdk_subsystem_init_next(0); } -void -spdk_subsystem_init(spdk_msg_fn cb_fn, void *cb_arg) -{ - struct spdk_event *verify_event; - - g_app_start_fn = cb_fn; - g_app_start_arg = cb_arg; - - verify_event = spdk_event_allocate(spdk_env_get_current_core(), spdk_subsystem_verify, NULL, NULL); - spdk_event_call(verify_event); -} - static void _spdk_subsystem_fini_next(void *arg1) {