ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

event: Eliminate extra event when loading JSON config

Browse Source 
Now that there is always one event to bootstrap,
we don't need an event here.

Change-Id: Ic87501461a608f5b15745a50b6e15f0f28aa55c2
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/446991
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Ben Walker 2019-03-04 12:40:57 -07:00 committed by Darek Stojaczyk
parent 744857a79a
commit 46777dd8b9
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/event/app.c
View File

@ -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 * static struct spdk_conf *
spdk_app_setup_conf(const char *config_file) spdk_app_setup_conf(const char *config_file)
{ {
@ -569,16 +561,13 @@ static void
bootstrap_fn(void *arg1, void *arg2) bootstrap_fn(void *arg1, void *arg2)
{ {
struct spdk_event *rpc_start_event; 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, rpc_start_event = spdk_event_allocate(g_init_lcore, spdk_app_start_rpc,
NULL, NULL); NULL, NULL);
if (g_spdk_app.json_config_file) { if (g_spdk_app.json_config_file) {
g_delay_subsystem_init = false; g_delay_subsystem_init = false;
config_load_event = spdk_event_allocate(g_init_lcore, _spdk_app_json_config_load, spdk_app_json_config_load(g_spdk_app.json_config_file, g_spdk_app.rpc_addr, rpc_start_event);
rpc_start_event, NULL);
spdk_event_call(config_load_event);
} else { } else {
if (!g_delay_subsystem_init) { if (!g_delay_subsystem_init) {
spdk_subsystem_init(rpc_start_event); spdk_subsystem_init(rpc_start_event);