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

app: spdk_app_fini no longer gives return code

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

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: If77cbf745a8e3fcba4ea24411aa1816f3910cde7
Reviewed-on: https://review.gerrithub.io/381537
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Tomasz Zawadzki 2017-10-05 16:15:17 +02:00 committed by Jim Harris
parent b8f40516f0
commit 48b2eff97d
6 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/iscsi_tgt/iscsi_tgt.c
View File

@ -90,7 +90,7 @@ int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int ch; int ch;
int rc, app_rc; int rc;
int daemon_mode = 0; int daemon_mode = 0;
struct spdk_app_opts opts = {}; struct spdk_app_opts opts = {};
enum spdk_log_level print_level = SPDK_LOG_NOTICE; 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()); printf("Using net framework %s\n", spdk_net_framework_get_name());
/* Blocks until the application is exiting */ /* 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;
} }

2
include/spdk/event.h
View File

@ -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. * \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 * \brief Start shutting down the framework. Typically this function is not called directly, and

2
include/spdk_internal/event.h
View File

@ -46,7 +46,7 @@ struct spdk_event {
}; };
int spdk_reactors_init(unsigned int max_delay_us); 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_start(void);
void spdk_reactors_stop(void); void spdk_reactors_stop(void);

8
lib/event/app.c
View File

@ -388,18 +388,14 @@ spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn,
return g_spdk_app.rc; return g_spdk_app.rc;
} }
int void
spdk_app_fini(void) spdk_app_fini(void)
{ {
int rc; spdk_subsystem_fini();
rc = spdk_subsystem_fini();
spdk_trace_cleanup(); spdk_trace_cleanup();
spdk_reactors_fini(); spdk_reactors_fini();
spdk_conf_free(g_spdk_app.config); spdk_conf_free(g_spdk_app.config);
spdk_log_close(); spdk_log_close();
return rc;
} }
void void

4
lib/event/reactor.c
View File

@ -656,7 +656,7 @@ spdk_reactors_init(unsigned int max_delay_us)
return 0; return 0;
} }
int void
spdk_reactors_fini(void) spdk_reactors_fini(void)
{ {
uint32_t i; uint32_t i;
@ -674,8 +674,6 @@ spdk_reactors_fini(void)
spdk_mempool_free(g_spdk_event_mempool[i]); spdk_mempool_free(g_spdk_event_mempool[i]);
} }
} }
return 0;
} }
static void static void

4
test/app/bdev_svc/bdev_svc.c
View File

@ -123,9 +123,9 @@ main(int argc, char **argv)
opts.shutdown_cb = bdev_svc_shutdown; opts.shutdown_cb = bdev_svc_shutdown;
opts.max_delay_us = 1000 * 1000; opts.max_delay_us = 1000 * 1000;
spdk_app_start(&opts, bdev_svc_start, (void *)(intptr_t)opts.shm_id, NULL); rc = spdk_app_start(&opts, bdev_svc_start, (void *)(intptr_t)opts.shm_id, NULL);
rc = spdk_app_fini(); spdk_app_fini();
return rc; return rc;
} }