* Do not access it directly -- use vcm which will point to
* the heap allocated copy after init.
*/
-static vppcom_main_t _vppcom_main = {
+vppcom_main_t _vppcom_main = {
.debug = VPPCOM_DEBUG_INIT,
.is_init = 0,
.app_index = ~0,
vcl_cfg->heapsize = (256ULL << 20);
vcl_cfg->max_workers = 16;
- vcl_cfg->vpp_api_q_length = 1024;
- vcl_cfg->segment_baseva = HIGH_SEGMENT_BASEVA;
vcl_cfg->segment_size = (256 << 20);
vcl_cfg->add_segment_size = (128 << 20);
vcl_cfg->preallocated_fifo_pairs = 8;
vcl_cfg->rx_fifo_size = (1 << 20);
vcl_cfg->tx_fifo_size = (1 << 20);
vcl_cfg->event_queue_size = 2048;
- vcl_cfg->listen_queue_size = CLIB_CACHE_LINE_BYTES / sizeof (u32);
vcl_cfg->app_timeout = 10 * 60.0;
vcl_cfg->session_timeout = 10 * 60.0;
- vcl_cfg->accept_timeout = 60.0;
- vcl_cfg->event_ring_size = (128 << 10);
vcl_cfg->event_log_path = "/dev/shm";
}
unformat_input_t _line_input, *line_input = &_line_input;
u8 vc_cfg_input = 0;
struct stat s;
- u32 uid, gid, q_len;
+ u32 uid, gid;
fd = open (conf_fname, O_RDONLY);
if (fd < 0)
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
+ /* skip empty newlines as they confuse unformat_line_input */
+ unformat_skip_white_space (input);
(void) unformat_user (input, unformat_line_input, line_input);
unformat_skip_white_space (line_input);
VCFG_DBG (0, "VCL<%d>: configured max-workers %u", getpid (),
vcl_cfg->max_workers);
}
- else if (unformat (line_input, "api-prefix %s",
- &vcl_cfg->vpp_api_chroot))
- {
- vec_terminate_c_string (vcl_cfg->vpp_api_chroot);
- VCFG_DBG (0, "VCL<%d>: configured api-prefix (%s) ", getpid (),
- vcl_cfg->vpp_api_chroot);
- }
else if (unformat (line_input, "api-socket-name %s",
- &vcl_cfg->vpp_api_socket_name))
+ &vcl_cfg->vpp_bapi_socket_name))
{
- vec_terminate_c_string (vcl_cfg->vpp_api_socket_name);
+ vec_terminate_c_string (vcl_cfg->vpp_bapi_socket_name);
VCFG_DBG (0, "VCL<%d>: configured api-socket-name (%s)",
- getpid (), vcl_cfg->vpp_api_socket_name);
+ getpid (), vcl_cfg->vpp_bapi_socket_name);
}
- else if (unformat (line_input, "vpp-api-q-length %d", &q_len))
+ else if (unformat (line_input, "app-socket-api %s",
+ &vcl_cfg->vpp_app_socket_api))
{
- if (q_len < vcl_cfg->vpp_api_q_length)
- {
- fprintf (stderr,
- "VCL<%d>: ERROR: configured vpp-api-q-length "
- "(%u) is too small! Using default: %u ", getpid (),
- q_len, vcl_cfg->vpp_api_q_length);
- }
- else
- {
- vcl_cfg->vpp_api_q_length = q_len;
-
- VCFG_DBG (0, "VCL<%d>: configured vpp-api-q-length %u",
- getpid (), vcl_cfg->vpp_api_q_length);
- }
+ vec_terminate_c_string (vcl_cfg->vpp_app_socket_api);
+ VCFG_DBG (0, "VCL<%d>: configured app-socket-api (%s)",
+ getpid (), vcl_cfg->vpp_app_socket_api);
}
else if (unformat (line_input, "uid %d", &uid))
{
vl_set_memory_gid (gid);
VCFG_DBG (0, "VCL<%d>: configured gid %d", getpid (), gid);
}
- else if (unformat (line_input, "segment-baseva 0x%lx",
- &vcl_cfg->segment_baseva))
- {
- VCFG_DBG (0, "VCL<%d>: configured segment_baseva 0x%lx",
- getpid (), (unsigned long) vcl_cfg->segment_baseva);
- }
else if (unformat (line_input, "segment-size 0x%lx",
&vcl_cfg->segment_size))
{
getpid (), vcl_cfg->event_queue_size,
vcl_cfg->event_queue_size);
}
- else if (unformat (line_input, "listen-queue-size 0x%x",
- &vcl_cfg->listen_queue_size))
- {
- VCFG_DBG (0, "VCL<%d>: configured listen_queue_size 0x%x (%u)",
- getpid (), vcl_cfg->listen_queue_size,
- vcl_cfg->listen_queue_size);
- }
- else if (unformat (line_input, "listen-queue-size %u",
- &vcl_cfg->listen_queue_size))
- {
- VCFG_DBG (0, "VCL<%d>: configured listen_queue_size %u (0x%x)",
- getpid (), vcl_cfg->listen_queue_size,
- vcl_cfg->listen_queue_size);
- }
else if (unformat (line_input, "app-timeout %f",
&vcl_cfg->app_timeout))
{
VCFG_DBG (0, "VCL<%d>: configured session_timeout %f",
getpid (), vcl_cfg->session_timeout);
}
- else if (unformat (line_input, "accept-timeout %f",
- &vcl_cfg->accept_timeout))
- {
- VCFG_DBG (0, "VCL<%d>: configured accept_timeout %f",
- getpid (), vcl_cfg->accept_timeout);
- }
else if (unformat (line_input, "app-proxy-transport-tcp"))
{
vcl_cfg->app_proxy_transport_tcp = 1;
VCFG_DBG (0, "VCL<%d>: configured app_scope_global (%d)",
getpid (), vcl_cfg->app_scope_global);
}
+ else if (unformat (line_input, "huge_page"))
+ {
+ vcl_cfg->huge_page = 1;
+ VCFG_DBG (0, "VCL<%d>: configured huge_page (%d)", getpid (),
+ vcl_cfg->huge_page);
+ }
else if (unformat (line_input, "namespace-secret %lu",
&vcl_cfg->namespace_secret))
{
else if (unformat (line_input, "namespace-id %v",
&vcl_cfg->namespace_id))
{
- u32 max_nsid_vec_len = vcl_max_nsid_len ();
+ u32 max_nsid_vec_len = vcl_bapi_max_nsid_len ();
u32 nsid_vec_len = vec_len (vcl_cfg->namespace_id);
if (nsid_vec_len > max_nsid_vec_len)
{
- _vec_len (vcl_cfg->namespace_id) = max_nsid_vec_len;
+ vec_set_len (vcl_cfg->namespace_id, max_nsid_vec_len);
VCFG_DBG (0, "VCL<%d>: configured namespace_id is too long,"
" truncated to %d characters!",
getpid (), max_nsid_vec_len);
VCFG_DBG (0, "VCL<%d>: configured tls-engine %u (0x%x)",
getpid (), vcl_cfg->tls_engine, vcl_cfg->tls_engine);
}
+ else if (unformat (line_input, "multi-thread-workers"))
+ {
+ vcl_cfg->mt_wrk_supported = 1;
+ VCFG_DBG (0, "VCL<%d>: configured with multithread workers",
+ getpid ());
+ }
+ else if (unformat (line_input, "app_original_dst"))
+ {
+ vcl_cfg->app_original_dst = 1;
+ VCFG_DBG (0, "VCL<%d>: support original destination", getpid ());
+ }
else if (unformat (line_input, "}"))
{
vc_cfg_input = 0;
/* Regrab cfg after heap initialization */
vcl_cfg = &vcm->cfg;
- env_var_str = getenv (VPPCOM_ENV_API_PREFIX);
- if (env_var_str)
- {
- vcl_cfg->vpp_api_chroot = format (0, "%s", env_var_str);
- vec_terminate_c_string (vcl_cfg->vpp_api_chroot);
- VCFG_DBG (0, "VCL<%d>: configured api prefix (%s) from "
- VPPCOM_ENV_API_PREFIX "!", getpid (), env_var_str);
- }
env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_ID);
if (env_var_str)
{
env_var_str = getenv (VPPCOM_ENV_VPP_API_SOCKET);
if (env_var_str)
{
- vcm->cfg.vpp_api_socket_name = format (0, "%s%c", env_var_str, 0);
+ vcm->cfg.vpp_bapi_socket_name = format (0, "%s%c", env_var_str, 0);
VCFG_DBG (0, "VCL<%d>: configured api-socket-name (%s)", getpid (),
- vcl_cfg->vpp_api_socket_name);
+ vcl_cfg->vpp_bapi_socket_name);
+ }
+ env_var_str = getenv (VPPCOM_ENV_VPP_SAPI_SOCKET);
+ if (env_var_str)
+ {
+ vcm->cfg.vpp_app_socket_api = format (0, "%s%c", env_var_str, 0);
+ VCFG_DBG (0, "VCL<%d>: configured app-socket-api (%s)", getpid (),
+ vcl_cfg->vpp_app_socket_api);
+ }
+ env_var_str = getenv (VPPCOM_ENV_APP_USE_MQ_EVENTFD);
+ if (env_var_str)
+ {
+ vcm->cfg.use_mq_eventfd = 1;
+ VCFG_DBG (0, "VCL<%d>: configured " VPPCOM_ENV_APP_USE_MQ_EVENTFD,
+ getpid ());
}
}
Code Review / vpp.git / blobdiff