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

env_dpdk: add g_ prefix to init.c global variables

Browse Source 
Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ia5d5507ce08418f2b13fce1b7fb2163b23995c90

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/446457
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Jim Harris 2019-02-27 10:55:03 -07:00
parent 073edd0e4c
commit d631b855ff
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/env_dpdk/init.c
View File

@ -48,8 +48,8 @@
#define SPDK_ENV_DPDK_DEFAULT_MEM_CHANNEL -1 #define SPDK_ENV_DPDK_DEFAULT_MEM_CHANNEL -1
#define SPDK_ENV_DPDK_DEFAULT_CORE_MASK "0x1" #define SPDK_ENV_DPDK_DEFAULT_CORE_MASK "0x1"
static char **eal_cmdline; static char **g_eal_cmdline;
static int eal_cmdline_argcount; static int g_eal_cmdline_argcount;
static char * static char *
_sprintf_alloc(const char *format, ...) _sprintf_alloc(const char *format, ...)
@ -176,7 +176,7 @@ spdk_push_arg(char *args[], int *argcount, char *arg)
static void static void
spdk_destruct_eal_cmdline(void) spdk_destruct_eal_cmdline(void)
{ {
spdk_free_args(eal_cmdline, eal_cmdline_argcount); spdk_free_args(g_eal_cmdline, g_eal_cmdline_argcount);
} }
@ -362,8 +362,8 @@ spdk_build_eal_cmdline(const struct spdk_env_opts *opts)
} }
#endif #endif
eal_cmdline = args; g_eal_cmdline = args;
eal_cmdline_argcount = argcount; g_eal_cmdline_argcount = argcount;
if (atexit(spdk_destruct_eal_cmdline) != 0) { if (atexit(spdk_destruct_eal_cmdline) != 0) {
fprintf(stderr, "Failed to register cleanup handler\n"); fprintf(stderr, "Failed to register cleanup handler\n");
} }
@ -403,8 +403,8 @@ spdk_env_init(const struct spdk_env_opts *opts)
printf("Starting %s / %s initialization...\n", SPDK_VERSION_STRING, rte_version()); printf("Starting %s / %s initialization...\n", SPDK_VERSION_STRING, rte_version());
printf("[ DPDK EAL parameters: "); printf("[ DPDK EAL parameters: ");
for (i = 0; i < eal_cmdline_argcount; i++) { for (i = 0; i < g_eal_cmdline_argcount; i++) {
printf("%s ", eal_cmdline[i]); printf("%s ", g_eal_cmdline[i]);
} }
printf("]\n"); printf("]\n");
@ -412,17 +412,17 @@ spdk_env_init(const struct spdk_env_opts *opts)
* before passing so we can still free the individual strings * before passing so we can still free the individual strings
* correctly. * correctly.
*/ */
dpdk_args = calloc(eal_cmdline_argcount, sizeof(char *)); dpdk_args = calloc(g_eal_cmdline_argcount, sizeof(char *));
if (dpdk_args == NULL) { if (dpdk_args == NULL) {
fprintf(stderr, "Failed to allocate dpdk_args\n"); fprintf(stderr, "Failed to allocate dpdk_args\n");
return -1; return -1;
} }
memcpy(dpdk_args, eal_cmdline, sizeof(char *) * eal_cmdline_argcount); memcpy(dpdk_args, g_eal_cmdline, sizeof(char *) * g_eal_cmdline_argcount);
fflush(stdout); fflush(stdout);
orig_optind = optind; orig_optind = optind;
optind = 1; optind = 1;
rc = rte_eal_init(eal_cmdline_argcount, dpdk_args); rc = rte_eal_init(g_eal_cmdline_argcount, dpdk_args);
optind = orig_optind; optind = orig_optind;
free(dpdk_args); free(dpdk_args);