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

event/app: Refactor check config file operation in spdk_app_start()

Browse Source 
Refactor spdk_app_start() in lib/event/app.c to support JSON config
file.

Change-Id: I157573eea48b774579158f41a9010e5faa1a3de5
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/405361
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2018-03-30 18:27:27 +09:00 committed by Jim Harris
parent 85f316b183
commit a4c86be7f0
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/event/app.c
View File

@ -273,6 +273,33 @@ start_rpc(void *arg1, void *arg2)
g_app_start_fn(g_app_start_arg1, g_app_start_arg2); g_app_start_fn(g_app_start_arg1, g_app_start_arg2);
} }
static struct spdk_conf *
spdk_app_setup_conf(const char *config_file)
{
struct spdk_conf *config;
int rc;
config = spdk_conf_allocate();
assert(config != NULL);
if (config_file) {
rc = spdk_conf_read(config, config_file);
if (rc != 0) {
SPDK_ERRLOG("Could not read config file %s\n", config_file);
goto error;
}
if (spdk_conf_first_section(config) == NULL) {
SPDK_ERRLOG("Invalid config file %s\n", config_file);
goto error;
}
}
spdk_conf_set_as_default(config);
return config;
error:
spdk_conf_free(config);
return NULL;
}
int int
spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn, spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn,
void *arg1, void *arg2) void *arg1, void *arg2)
@ -312,20 +339,10 @@ spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn,
} }
#endif #endif
config = spdk_conf_allocate(); config = spdk_app_setup_conf(opts->config_file);
assert(config != NULL); if (config == NULL) {
if (opts->config_file) { goto app_start_setup_conf_err;
rc = spdk_conf_read(config, opts->config_file);
if (rc != 0) {
SPDK_ERRLOG("Could not read config file %s\n", opts->config_file);
goto app_start_conf_free_err;
}
if (spdk_conf_first_section(config) == NULL) {
SPDK_ERRLOG("Invalid config file %s\n", opts->config_file);
goto app_start_conf_free_err;
}
} }
spdk_conf_set_as_default(config);
if (opts->shm_id == -1) { if (opts->shm_id == -1) {
sp = spdk_conf_find_section(config, "Global"); sp = spdk_conf_find_section(config, "Global");
@ -445,9 +462,7 @@ app_start_trace_cleanup_err:
app_start_log_close_err: app_start_log_close_err:
spdk_log_close(); spdk_log_close();
app_start_conf_free_err: app_start_setup_conf_err:
spdk_conf_free(config);
return 1; return 1;
} }