Commit 3d528833 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Ben Walker
Browse files

event: move default opt values out of public API 



The public API user is supposed to retrieve the defaults via the
spdk_app_opts_init() function.

Change-Id: Ie2bd6e809b2d47dbd5d62d396e8715f89f4052d9
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 2931a3ef

app/iscsi_tgt/iscsi_tgt.c

+5 −1
Original line number Diff line number Diff line
@@ -62,6 +62,10 @@ spdk_sigusr1(int signo __attribute__((__unused__))) 
static void

usage(char *executable_name)

{

	struct spdk_app_opts opts;



	spdk_app_opts_init(&opts);



	printf("%s [options]\n", executable_name);

	printf("options:\n");

	printf(" -c config  config file (default %s)\n", SPDK_ISCSI_DEFAULT_CONFIG);
@@ -69,7 +73,7 @@ usage(char *executable_name) 
	printf(" -m mask    core mask for DPDK\n");

	printf(" -i instance ID\n");

	printf(" -l facility use specific syslog facility (default %s)\n",

	       SPDK_APP_DEFAULT_LOG_FACILITY);

	       opts.log_facility);

	printf(" -n channel number of memory channels used for DPDK\n");

	printf(" -p core    master (primary) core for DPDK\n");

	printf(" -s size    memory size in MB for DPDK\n");

app/nvmf_tgt/nvmf_tgt.c

+5 −1
Original line number Diff line number Diff line
@@ -296,6 +296,10 @@ nvmf_tgt_shutdown_subsystem_by_nqn(const char *nqn) 
static void

usage(void)

{

	struct spdk_app_opts opts;



	spdk_app_opts_init(&opts);



	printf("nvmf [options]\n");

	printf("options:\n");

	printf(" -c config  - config file (default %s)\n", SPDK_NVMF_DEFAULT_CONFIG);
@@ -303,7 +307,7 @@ usage(void) 
	printf(" -m mask    - core mask for DPDK\n");

	printf(" -i instance ID\n");

	printf(" -l facility - use specific syslog facility (default %s)\n",

	       SPDK_APP_DEFAULT_LOG_FACILITY);

	       opts.log_facility);

	printf(" -n channel number of memory channels used for DPDK\n");

	printf(" -p core    master (primary) core for DPDK\n");

	printf(" -s size    memory size in MB for DPDK\n");

include/spdk/event.h

+0 −8
Original line number Diff line number Diff line
@@ -80,9 +80,6 @@ 


#include "spdk/queue.h"



#define SPDK_APP_DEFAULT_LOG_FACILITY	"local7"

#define SPDK_APP_DEFAULT_LOG_PRIORITY	"info"



typedef struct spdk_event *spdk_event_t;

typedef void (*spdk_event_fn)(spdk_event_t);
@@ -107,11 +104,6 @@ struct spdk_poller; 
typedef void (*spdk_app_shutdown_cb)(void);

typedef void (*spdk_sighandler_t)(int);



#define SPDK_APP_DPDK_DEFAULT_MEM_SIZE		2048

#define SPDK_APP_DPDK_DEFAULT_MASTER_CORE	0

#define SPDK_APP_DPDK_DEFAULT_MEM_CHANNEL	4

#define SPDK_APP_DPDK_DEFAULT_CORE_MASK		"0x1"



/**

 * \brief Event framework initialization options

 */

lib/event/app.c

+10 −1
Original line number Diff line number Diff line
@@ -53,6 +53,14 @@ 
#include "spdk/conf.h"

#include "spdk/trace.h"



#define SPDK_APP_DEFAULT_LOG_FACILITY	"local7"

#define SPDK_APP_DEFAULT_LOG_PRIORITY	"info"



#define SPDK_APP_DPDK_DEFAULT_MEM_SIZE		2048

#define SPDK_APP_DPDK_DEFAULT_MASTER_CORE	0

#define SPDK_APP_DPDK_DEFAULT_MEM_CHANNEL	4

#define SPDK_APP_DPDK_DEFAULT_CORE_MASK		"0x1"



/* Add enough here to append ".pid" plus 2 digit instance ID */

#define SPDK_APP_PIDFILE_MAX_LENGTH	40

#define SPDK_APP_PIDFILE_PREFIX		"/var/run"
@@ -215,9 +223,10 @@ spdk_app_opts_init(struct spdk_app_opts *opts) 


	memset(opts, 0, sizeof(*opts));



	opts->log_facility = SPDK_APP_DEFAULT_LOG_FACILITY;

	opts->enable_coredump = true;

	opts->instance_id = -1;

	opts->dpdk_mem_size = -1;

	opts->dpdk_mem_size = SPDK_APP_DPDK_DEFAULT_MEM_SIZE;

	opts->dpdk_master_core = SPDK_APP_DPDK_DEFAULT_MASTER_CORE;

	opts->dpdk_mem_channel = SPDK_APP_DPDK_DEFAULT_MEM_CHANNEL;

	opts->reactor_mask = NULL;

lib/event/dpdk_init.c

+0 −2
Original line number Diff line number Diff line
@@ -130,8 +130,6 @@ spdk_build_eal_cmdline(struct spdk_app_opts *opts) 
	}



	/* set the memory size */

	if (opts->dpdk_mem_size == -1)

		opts->dpdk_mem_size = SPDK_APP_DPDK_DEFAULT_MEM_SIZE;

	g_arg_strings[EAL_MEMSIZE_ARG] = spdk_sprintf_alloc("-m %d", opts->dpdk_mem_size);

	if (g_arg_strings[EAL_MEMSIZE_ARG] == NULL) {

		spdk_free_ealargs();