Commit f90c3be4 authored by Ben Walker's avatar Ben Walker Committed by Changpeng Liu
Browse files

event: Don't use an event to initialize RPC 



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

Change-Id: I277179fbc15ebe140fd22be1b67847cf23c6153e
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/446994


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent f155c980

lib/event/app.c

+4 −13
Original line number Diff line number Diff line
@@ -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);

		}

	}

}