Commit 46777dd8 authored by Ben Walker's avatar Ben Walker Committed by Darek Stojaczyk
Browse files

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: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/446991


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 avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 744857a7

lib/event/app.c

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