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

event/env: remove dpdk_ prefix

Browse Source 
Remove dpdk_ prefix in spdk_app_opts and spdk_env_opts

Change-Id: I6f231f67072b808e84945d41b1fe31a180beb350
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/365787
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ziye Yang 2017-06-16 16:41:13 +08:00 committed by Daniel Verkamp
parent 7c4fe3d2d3
commit d939572ab3
14 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/iscsi_tgt/iscsi_tgt.c
View File

@ -140,13 +140,13 @@ main(int argc, char **argv)
opts.reactor_mask = optarg; opts.reactor_mask = optarg;
break; break;
case 'n': case 'n':
opts.dpdk_mem_channel = atoi(optarg); opts.mem_channel = atoi(optarg);
break; break;
case 'p': case 'p':
opts.dpdk_master_core = atoi(optarg); opts.master_core = atoi(optarg);
break; break;
case 's': case 's':
opts.dpdk_mem_size = atoi(optarg); opts.mem_size = atoi(optarg);
break; break;
case 'b': case 'b':
daemon_mode = 1; daemon_mode = 1;

6
app/nvmf_tgt/nvmf_main.c
View File

@ -113,13 +113,13 @@ main(int argc, char **argv)
opts.reactor_mask = optarg; opts.reactor_mask = optarg;
break; break;
case 'n': case 'n':
opts.dpdk_mem_channel = atoi(optarg); opts.mem_channel = atoi(optarg);
break; break;
case 'p': case 'p':
opts.dpdk_master_core = atoi(optarg); opts.master_core = atoi(optarg);
break; break;
case 's': case 's':
opts.dpdk_mem_size = atoi(optarg); opts.mem_size = atoi(optarg);
break; break;
case 'e': case 'e':
opts.tpoint_group_mask = optarg; opts.tpoint_group_mask = optarg;

8
app/vhost/vhost.c
View File

@ -50,7 +50,7 @@ vhost_app_opts_init(struct spdk_app_opts *opts)
spdk_app_opts_init(opts); spdk_app_opts_init(opts);
opts->name = "vhost"; opts->name = "vhost";
opts->config_file = SPDK_VHOST_DEFAULT_CONFIG; opts->config_file = SPDK_VHOST_DEFAULT_CONFIG;
opts->dpdk_mem_size = SPDK_VHOST_DEFAULT_MEM_SIZE; opts->mem_size = SPDK_VHOST_DEFAULT_MEM_SIZE;
} }
static void static void
@ -68,7 +68,7 @@ usage(char *executable_name)
printf(" -l facility use specific syslog facility (default: %s)\n", defaults.log_facility); printf(" -l facility use specific syslog facility (default: %s)\n", defaults.log_facility);
printf(" -n channel number of memory channels used for DPDK\n"); printf(" -n channel number of memory channels used for DPDK\n");
printf(" -p core master (primary) core for DPDK\n"); printf(" -p core master (primary) core for DPDK\n");
printf(" -s size memory size in MB for DPDK (default: %dMB)\n", defaults.dpdk_mem_size); printf(" -s size memory size in MB for DPDK (default: %dMB)\n", defaults.mem_size);
printf(" -S dir directory where to create vhost sockets (default: pwd)\n"); printf(" -S dir directory where to create vhost sockets (default: pwd)\n");
spdk_tracelog_usage(stdout, "-t"); spdk_tracelog_usage(stdout, "-t");
printf(" -h show this usage\n"); printf(" -h show this usage\n");
@ -107,13 +107,13 @@ main(int argc, char *argv[])
opts.reactor_mask = optarg; opts.reactor_mask = optarg;
break; break;
case 'p': case 'p':
opts.dpdk_master_core = strtoul(optarg, NULL, 10); opts.master_core = strtoul(optarg, NULL, 10);
break; break;
case 'q': case 'q':
spdk_g_notice_stderr_flag = 0; spdk_g_notice_stderr_flag = 0;
break; break;
case 's': case 's':
opts.dpdk_mem_size = strtoul(optarg, NULL, 10); opts.mem_size = strtoul(optarg, NULL, 10);
break; break;
case 'S': case 'S':
socket_path = optarg; socket_path = optarg;

2
examples/nvme/fio_plugin/fio_plugin.c
View File

@ -231,7 +231,7 @@ static int spdk_fio_setup(struct thread_data *td)
if (!spdk_env_initialized) { if (!spdk_env_initialized) {
spdk_env_opts_init(&opts); spdk_env_opts_init(&opts);
opts.name = "fio"; opts.name = "fio";
opts.dpdk_mem_size = 512; opts.mem_size = 512;
spdk_env_init(&opts); spdk_env_init(&opts);
spdk_env_initialized = true; spdk_env_initialized = true;
cpu_core_unaffinitized(); cpu_core_unaffinitized();

6
examples/nvme/identify/identify.c
View File

@ -1073,9 +1073,9 @@ int main(int argc, char **argv)
spdk_env_opts_init(&opts); spdk_env_opts_init(&opts);
opts.name = "identify"; opts.name = "identify";
opts.shm_id = g_shm_id; opts.shm_id = g_shm_id;
opts.dpdk_mem_size = g_dpdk_mem; opts.mem_size = g_dpdk_mem;
opts.dpdk_mem_channel = 1; opts.mem_channel = 1;
opts.dpdk_master_core = g_master_core; opts.master_core = g_master_core;
opts.core_mask = g_core_mask; opts.core_mask = g_core_mask;
if (g_trid.trtype != SPDK_NVME_TRANSPORT_PCIE) { if (g_trid.trtype != SPDK_NVME_TRANSPORT_PCIE) {
opts.no_pci = true; opts.no_pci = true;

2
examples/nvme/perf/perf.c
View File

@ -1344,7 +1344,7 @@ int main(int argc, char **argv)
} }
if (g_dpdk_mem) { if (g_dpdk_mem) {
opts.dpdk_mem_size = g_dpdk_mem; opts.mem_size = g_dpdk_mem;
} }
if (g_no_pci) { if (g_no_pci) {
opts.no_pci = g_no_pci; opts.no_pci = g_no_pci;

6
include/spdk/env.h
View File

@ -56,9 +56,9 @@ struct spdk_env_opts {
const char *name; const char *name;
const char *core_mask; const char *core_mask;
int shm_id; int shm_id;
int dpdk_mem_channel; int mem_channel;
int dpdk_master_core; int master_core;
int dpdk_mem_size; int mem_size;
bool no_pci; bool no_pci;
}; };

6
include/spdk/event.h
View File

@ -78,9 +78,9 @@ struct spdk_app_opts {
spdk_sighandler_t usr1_handler; spdk_sighandler_t usr1_handler;
bool enable_coredump; bool enable_coredump;
int dpdk_mem_channel; int mem_channel;
int dpdk_master_core; int master_core;
int dpdk_mem_size; int mem_size;
bool no_pci; bool no_pci;
/* The maximum latency allowed when passing an event /* The maximum latency allowed when passing an event

18
lib/env_dpdk/init.c
View File

@ -107,9 +107,9 @@ spdk_env_opts_init(struct spdk_env_opts *opts)
opts->name = SPDK_ENV_DPDK_DEFAULT_NAME; opts->name = SPDK_ENV_DPDK_DEFAULT_NAME;
opts->core_mask = SPDK_ENV_DPDK_DEFAULT_CORE_MASK; opts->core_mask = SPDK_ENV_DPDK_DEFAULT_CORE_MASK;
opts->shm_id = SPDK_ENV_DPDK_DEFAULT_SHM_ID; opts->shm_id = SPDK_ENV_DPDK_DEFAULT_SHM_ID;
opts->dpdk_mem_size = SPDK_ENV_DPDK_DEFAULT_MEM_SIZE; opts->mem_size = SPDK_ENV_DPDK_DEFAULT_MEM_SIZE;
opts->dpdk_master_core = SPDK_ENV_DPDK_DEFAULT_MASTER_CORE; opts->master_core = SPDK_ENV_DPDK_DEFAULT_MASTER_CORE;
opts->dpdk_mem_channel = SPDK_ENV_DPDK_DEFAULT_MEM_CHANNEL; opts->mem_channel = SPDK_ENV_DPDK_DEFAULT_MEM_CHANNEL;
} }
static void static void
@ -174,25 +174,25 @@ spdk_build_eal_cmdline(const struct spdk_env_opts *opts, char **out[])
} }
/* set the memory channel number */ /* set the memory channel number */
if (opts->dpdk_mem_channel > 0) { if (opts->mem_channel > 0) {
args = spdk_push_arg(args, &argcount, _sprintf_alloc("-n %d", opts->dpdk_mem_channel)); args = spdk_push_arg(args, &argcount, _sprintf_alloc("-n %d", opts->mem_channel));
if (args == NULL) { if (args == NULL) {
return -1; return -1;
} }
} }
/* set the memory size */ /* set the memory size */
if (opts->dpdk_mem_size > 0) { if (opts->mem_size > 0) {
args = spdk_push_arg(args, &argcount, _sprintf_alloc("-m %d", opts->dpdk_mem_size)); args = spdk_push_arg(args, &argcount, _sprintf_alloc("-m %d", opts->mem_size));
if (args == NULL) { if (args == NULL) {
return -1; return -1;
} }
} }
/* set the master core */ /* set the master core */
if (opts->dpdk_master_core > 0) { if (opts->master_core > 0) {
args = spdk_push_arg(args, &argcount, _sprintf_alloc("--master-lcore=%d", args = spdk_push_arg(args, &argcount, _sprintf_alloc("--master-lcore=%d",
opts->dpdk_master_core)); opts->master_core));
if (args == NULL) { if (args == NULL) {
return -1; return -1;
} }

12
lib/event/app.c
View File

@ -209,9 +209,9 @@ spdk_app_opts_init(struct spdk_app_opts *opts)
opts->log_facility = SPDK_APP_DEFAULT_LOG_FACILITY; opts->log_facility = SPDK_APP_DEFAULT_LOG_FACILITY;
opts->enable_coredump = true; opts->enable_coredump = true;
opts->shm_id = -1; opts->shm_id = -1;
opts->dpdk_mem_size = SPDK_APP_DPDK_DEFAULT_MEM_SIZE; opts->mem_size = SPDK_APP_DPDK_DEFAULT_MEM_SIZE;
opts->dpdk_master_core = SPDK_APP_DPDK_DEFAULT_MASTER_CORE; opts->master_core = SPDK_APP_DPDK_DEFAULT_MASTER_CORE;
opts->dpdk_mem_channel = SPDK_APP_DPDK_DEFAULT_MEM_CHANNEL; opts->mem_channel = SPDK_APP_DPDK_DEFAULT_MEM_CHANNEL;
opts->reactor_mask = NULL; opts->reactor_mask = NULL;
opts->max_delay_us = 0; opts->max_delay_us = 0;
} }
@ -314,9 +314,9 @@ spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn,
env_opts.name = opts->name; env_opts.name = opts->name;
env_opts.core_mask = opts->reactor_mask; env_opts.core_mask = opts->reactor_mask;
env_opts.shm_id = opts->shm_id; env_opts.shm_id = opts->shm_id;
env_opts.dpdk_mem_channel = opts->dpdk_mem_channel; env_opts.mem_channel = opts->mem_channel;
env_opts.dpdk_master_core = opts->dpdk_master_core; env_opts.master_core = opts->master_core;
env_opts.dpdk_mem_size = opts->dpdk_mem_size; env_opts.mem_size = opts->mem_size;
env_opts.no_pci = opts->no_pci; env_opts.no_pci = opts->no_pci;
spdk_env_init(&env_opts); spdk_env_init(&env_opts);

2
lib/rocksdb/env_spdk.cc
View File

@ -527,7 +527,7 @@ SpdkEnv::SpdkEnv(const std::string &dir, const std::string &conf,
opts->name = "rocksdb"; opts->name = "rocksdb";
opts->config_file = mConfig.c_str(); opts->config_file = mConfig.c_str();
opts->reactor_mask = "0x1"; opts->reactor_mask = "0x1";
opts->dpdk_mem_size = 1024 + cache_size_in_mb; opts->mem_size = 1024 + cache_size_in_mb;
opts->shutdown_cb = spdk_rocksdb_shutdown; opts->shutdown_cb = spdk_rocksdb_shutdown;
spdk_fs_set_cache_size(cache_size_in_mb); spdk_fs_set_cache_size(cache_size_in_mb);

6
test/app/stub/stub.c
View File

@ -84,13 +84,13 @@ main(int argc, char **argv)
opts.core_mask = optarg; opts.core_mask = optarg;
break; break;
case 'n': case 'n':
opts.dpdk_mem_channel = atoi(optarg); opts.mem_channel = atoi(optarg);
break; break;
case 'p': case 'p':
opts.dpdk_master_core = atoi(optarg); opts.master_core = atoi(optarg);
break; break;
case 's': case 's':
opts.dpdk_mem_size = atoi(optarg); opts.mem_size = atoi(optarg);
break; break;
case 'H': case 'H':
default: default:

2
test/lib/blobfs/fuse/fuse.c
View File

@ -333,7 +333,7 @@ int main(int argc, char **argv)
opts.name = "spdk_fuse"; opts.name = "spdk_fuse";
opts.config_file = argv[1]; opts.config_file = argv[1];
opts.reactor_mask = "0x3"; opts.reactor_mask = "0x3";
opts.dpdk_mem_size = 6144; opts.mem_size = 6144;
opts.shutdown_cb = spdk_fuse_shutdown; opts.shutdown_cb = spdk_fuse_shutdown;
g_bdev_name = argv[2]; g_bdev_name = argv[2];

2
test/lib/blobfs/mkfs/mkfs.c
View File

@ -104,7 +104,7 @@ int main(int argc, char **argv)
opts.name = "spdk_mkfs"; opts.name = "spdk_mkfs";
opts.config_file = argv[1]; opts.config_file = argv[1];
opts.reactor_mask = "0x3"; opts.reactor_mask = "0x3";
opts.dpdk_mem_size = 1024; opts.mem_size = 1024;
opts.shutdown_cb = NULL; opts.shutdown_cb = NULL;
spdk_fs_set_cache_size(512); spdk_fs_set_cache_size(512);