Commit 48b2eff9 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Jim Harris
Browse files

app: spdk_app_fini no longer gives return code 



spdk_app_fini() changed to void, as no operation within it
can fail with meaningful return code.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: If77cbf745a8e3fcba4ea24411aa1816f3910cde7
Reviewed-on: https://review.gerrithub.io/381537


Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent b8f40516

app/iscsi_tgt/iscsi_tgt.c

+4 −4
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ int 
main(int argc, char **argv)

{

	int ch;

	int rc, app_rc;

	int rc;

	int daemon_mode = 0;

	struct spdk_app_opts opts = {};

	enum spdk_log_level print_level = SPDK_LOG_NOTICE;
@@ -179,9 +179,9 @@ main(int argc, char **argv) 


	printf("Using net framework %s\n", spdk_net_framework_get_name());

	/* Blocks until the application is exiting */

	app_rc = spdk_app_start(&opts, spdk_startup, NULL, NULL);

	rc = spdk_app_start(&opts, spdk_startup, NULL, NULL);



	rc = spdk_app_fini();

	spdk_app_fini();



	return app_rc ? app_rc : rc;

	return rc;

}

include/spdk/event.h

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ int spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn, 
/**

 * \brief Perform final shutdown operations on an application using the event framework.

 */

int spdk_app_fini(void);

void spdk_app_fini(void);



/**

 * \brief Start shutting down the framework.  Typically this function is not called directly, and

include/spdk_internal/event.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct spdk_event { 
};



int spdk_reactors_init(unsigned int max_delay_us);

int spdk_reactors_fini(void);

void spdk_reactors_fini(void);



void spdk_reactors_start(void);

void spdk_reactors_stop(void);

lib/event/app.c

+2 −6
Original line number Diff line number Diff line
@@ -388,18 +388,14 @@ spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn, 
	return g_spdk_app.rc;

}



int

void

spdk_app_fini(void)

{

	int rc;



	rc = spdk_subsystem_fini();

	spdk_subsystem_fini();

	spdk_trace_cleanup();

	spdk_reactors_fini();

	spdk_conf_free(g_spdk_app.config);

	spdk_log_close();



	return rc;

}



void

lib/event/reactor.c

+1 −3
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ spdk_reactors_init(unsigned int max_delay_us) 
	return 0;

}



int

void

spdk_reactors_fini(void)

{

	uint32_t i;
@@ -674,8 +674,6 @@ spdk_reactors_fini(void) 
			spdk_mempool_free(g_spdk_event_mempool[i]);

		}

	}



	return 0;

}



static void