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

event: Don't use an event to initialize RPC

Browse Source 
Now that the boot strap event exists, this is not
necessary.

Change-Id: I277179fbc15ebe140fd22be1b67847cf23c6153e
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/446994
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: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Ben Walker 2019-03-04 12:56:38 -07:00 committed by Changpeng Liu
parent f155c98084
commit f90c3be49e
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/event/app.c
View File

@ -356,7 +356,7 @@ spdk_app_start_application(void)
}
static void
spdk_app_start_rpc(void *arg1, void *arg2)
spdk_app_start_rpc(void *arg1)
{
spdk_rpc_initialize(g_spdk_app.rpc_addr);
if (!g_delay_subsystem_init) {
@ -364,12 +364,6 @@ spdk_app_start_rpc(void *arg1, void *arg2)
}
}
static void
_spdk_app_start_rpc(void *arg1)
{
spdk_app_start_rpc(arg1, NULL);
}
static struct spdk_conf *
spdk_app_setup_conf(const char *config_file)
{
@ -566,18 +560,15 @@ spdk_app_setup_trace(struct spdk_app_opts *opts)
static void
bootstrap_fn(void *arg1, void *arg2)
{
struct spdk_event *rpc_start_event;
if (g_spdk_app.json_config_file) {
g_delay_subsystem_init = false;
spdk_app_json_config_load(g_spdk_app.json_config_file, g_spdk_app.rpc_addr, _spdk_app_start_rpc,
spdk_app_json_config_load(g_spdk_app.json_config_file, g_spdk_app.rpc_addr, spdk_app_start_rpc,
NULL);
} else {
if (!g_delay_subsystem_init) {
spdk_subsystem_init(_spdk_app_start_rpc, NULL);
spdk_subsystem_init(spdk_app_start_rpc, NULL);
} else {
rpc_start_event = spdk_event_allocate(g_init_lcore, spdk_app_start_rpc, NULL, NULL);
spdk_event_call(rpc_start_event);
spdk_rpc_initialize(g_spdk_app.rpc_addr);
}
}
}