From 46777dd8b9cd410818c0ac5405b67bf70fcd24a8 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Mon, 4 Mar 2019 12:40:57 -0700 Subject: [PATCH] event: Eliminate extra event when loading JSON config Now that there is always one event to bootstrap, we don't need an event here. Change-Id: Ic87501461a608f5b15745a50b6e15f0f28aa55c2 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/446991 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Darek Stojaczyk Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- lib/event/app.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/lib/event/app.c b/lib/event/app.c index 035832b764..6ab5f15ef0 100644 --- a/lib/event/app.c +++ b/lib/event/app.c @@ -364,14 +364,6 @@ spdk_app_start_rpc(void *arg1, void *arg2) } } -static void -_spdk_app_json_config_load(void *arg1, void *arg2) -{ - struct spdk_event *event_done = arg1; - - spdk_app_json_config_load(g_spdk_app.json_config_file, g_spdk_app.rpc_addr, event_done); -} - static struct spdk_conf * spdk_app_setup_conf(const char *config_file) { @@ -569,16 +561,13 @@ static void bootstrap_fn(void *arg1, void *arg2) { struct spdk_event *rpc_start_event; - struct spdk_event *config_load_event; rpc_start_event = spdk_event_allocate(g_init_lcore, spdk_app_start_rpc, NULL, NULL); if (g_spdk_app.json_config_file) { g_delay_subsystem_init = false; - config_load_event = spdk_event_allocate(g_init_lcore, _spdk_app_json_config_load, - rpc_start_event, NULL); - spdk_event_call(config_load_event); + spdk_app_json_config_load(g_spdk_app.json_config_file, g_spdk_app.rpc_addr, rpc_start_event); } else { if (!g_delay_subsystem_init) { spdk_subsystem_init(rpc_start_event);