X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvcl_cfg.c;h=7b0710f5faf4baf33a50401787ee899c79cab98e;hb=91f102ed8;hp=5d64515ce5174461aabefb1bdce904a5130740b2;hpb=fe67afdd9386f09e07abfa2c1ba278f8bc549c32;p=vpp.git diff --git a/src/vcl/vcl_cfg.c b/src/vcl/vcl_cfg.c index 5d64515ce51..7b0710f5faf 100644 --- a/src/vcl/vcl_cfg.c +++ b/src/vcl/vcl_cfg.c @@ -19,7 +19,7 @@ * 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, @@ -34,7 +34,6 @@ vppcom_cfg_init (vppcom_cfg_t * vcl_cfg) 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); @@ -228,9 +227,9 @@ vppcom_cfg_read_file (char *conf_fname) int fd; unformat_input_t _input, *input = &_input; unformat_input_t _line_input, *line_input = &_line_input; - u8 vc_cfg_input = 0, *chroot_path; + 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) @@ -282,43 +281,19 @@ vppcom_cfg_read_file (char *conf_fname) VCFG_DBG (0, "VCL<%d>: configured max-workers %u", getpid (), vcl_cfg->max_workers); } - else if (unformat (line_input, "api-prefix %s", &chroot_path)) - { - vec_terminate_c_string (chroot_path); - if (vcl_cfg->vpp_api_filename) - vec_free (vcl_cfg->vpp_api_filename); - vcl_cfg->vpp_api_filename = format (0, "/%s-vpe-api%c", - chroot_path, 0); - vl_set_memory_root_path ((char *) chroot_path); - - VCFG_DBG (0, "VCL<%d>: configured api-prefix (%s) and api " - "filename (%s)", getpid (), chroot_path, - vcl_cfg->vpp_api_filename); - chroot_path = 0; /* Don't vec_free() it! */ - } 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)) { @@ -330,97 +305,97 @@ vppcom_cfg_read_file (char *conf_fname) vl_set_memory_gid (gid); VCFG_DBG (0, "VCL<%d>: configured gid %d", getpid (), gid); } - else if (unformat (line_input, "segment-baseva 0x%x", + 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%x", + else if (unformat (line_input, "segment-size 0x%lx", &vcl_cfg->segment_size)) { - VCFG_DBG (0, "VCL<%d>: configured segment_size 0x%x (%d)", + VCFG_DBG (0, "VCL<%d>: configured segment_size 0x%lx (%lu)", getpid (), vcl_cfg->segment_size, vcl_cfg->segment_size); } - else if (unformat (line_input, "segment-size %d", + else if (unformat (line_input, "segment-size %lu", &vcl_cfg->segment_size)) { - VCFG_DBG (0, "VCL<%d>: configured segment_size %d (0x%x)", + VCFG_DBG (0, "VCL<%d>: configured segment_size %lu (0x%lx)", getpid (), vcl_cfg->segment_size, vcl_cfg->segment_size); } - else if (unformat (line_input, "add-segment-size 0x%x", + else if (unformat (line_input, "add-segment-size 0x%lx", &vcl_cfg->add_segment_size)) { - VCFG_DBG (0, "VCL<%d>: configured add_segment_size 0x%x (%d)", + VCFG_DBG (0, "VCL<%d>: configured add_segment_size 0x%lx (%lu)", getpid (), vcl_cfg->add_segment_size, vcl_cfg->add_segment_size); } - else if (unformat (line_input, "add-segment-size %d", + else if (unformat (line_input, "add-segment-size %lu", &vcl_cfg->add_segment_size)) { - VCFG_DBG (0, "VCL<%d>: configured add_segment_size %d (0x%x)", + VCFG_DBG (0, "VCL<%d>: configured add_segment_size %lu (0x%lx)", getpid (), vcl_cfg->add_segment_size, vcl_cfg->add_segment_size); } - else if (unformat (line_input, "preallocated-fifo-pairs %d", + else if (unformat (line_input, "preallocated-fifo-pairs %u", &vcl_cfg->preallocated_fifo_pairs)) { - VCFG_DBG (0, "VCL<%d>: configured preallocated_fifo_pairs %d " + VCFG_DBG (0, "VCL<%d>: configured preallocated_fifo_pairs %u " "(0x%x)", getpid (), vcl_cfg->preallocated_fifo_pairs, vcl_cfg->preallocated_fifo_pairs); } - else if (unformat (line_input, "rx-fifo-size 0x%lx", + else if (unformat (line_input, "rx-fifo-size 0x%x", &vcl_cfg->rx_fifo_size)) { - VCFG_DBG (0, "VCL<%d>: configured rx_fifo_size 0x%x (%d)", + VCFG_DBG (0, "VCL<%d>: configured rx_fifo_size 0x%x (%u)", getpid (), vcl_cfg->rx_fifo_size, vcl_cfg->rx_fifo_size); } - else if (unformat (line_input, "rx-fifo-size %d", + else if (unformat (line_input, "rx-fifo-size %u", &vcl_cfg->rx_fifo_size)) { - VCFG_DBG (0, "VCL<%d>: configured rx_fifo_size %d (0x%x)", + VCFG_DBG (0, "VCL<%d>: configured rx_fifo_size %u (0x%x)", getpid (), vcl_cfg->rx_fifo_size, vcl_cfg->rx_fifo_size); } - else if (unformat (line_input, "tx-fifo-size 0x%lx", + else if (unformat (line_input, "tx-fifo-size 0x%x", &vcl_cfg->tx_fifo_size)) { - VCFG_DBG (0, "VCL<%d>: configured tx_fifo_size 0x%x (%d)", + VCFG_DBG (0, "VCL<%d>: configured tx_fifo_size 0x%x (%u)", getpid (), vcl_cfg->tx_fifo_size, vcl_cfg->tx_fifo_size); } - else if (unformat (line_input, "tx-fifo-size %ld", + else if (unformat (line_input, "tx-fifo-size %u", &vcl_cfg->tx_fifo_size)) { - VCFG_DBG (0, "VCL<%d>: configured tx_fifo_size %d (0x%x)", + VCFG_DBG (0, "VCL<%d>: configured tx_fifo_size %u (0x%x)", getpid (), vcl_cfg->tx_fifo_size, vcl_cfg->tx_fifo_size); } - else if (unformat (line_input, "event-queue-size 0x%lx", + else if (unformat (line_input, "event-queue-size 0x%x", &vcl_cfg->event_queue_size)) { - VCFG_DBG (0, "VCL<%d>: configured event_queue_size 0x%x (%d)", + VCFG_DBG (0, "VCL<%d>: configured event_queue_size 0x%x (%u)", getpid (), vcl_cfg->event_queue_size, vcl_cfg->event_queue_size); } - else if (unformat (line_input, "event-queue-size %ld", + else if (unformat (line_input, "event-queue-size %u", &vcl_cfg->event_queue_size)) { - VCFG_DBG (0, "VCL<%d>: configured event_queue_size %d (0x%x)", + VCFG_DBG (0, "VCL<%d>: configured event_queue_size %u (0x%x)", getpid (), vcl_cfg->event_queue_size, vcl_cfg->event_queue_size); } - else if (unformat (line_input, "listen-queue-size 0x%lx", + 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 %ld", + 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)", @@ -472,16 +447,15 @@ vppcom_cfg_read_file (char *conf_fname) else if (unformat (line_input, "namespace-secret %lu", &vcl_cfg->namespace_secret)) { - VCFG_DBG (0, - "VCL<%d>: configured namespace_secret %llu (0x%llx)", - getpid (), + VCFG_DBG (0, "VCL<%d>: configured namespace_secret %llu " + "(0x%llx)", getpid (), (unsigned long long) vcl_cfg->namespace_secret, (unsigned long long) 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) { @@ -500,6 +474,18 @@ vppcom_cfg_read_file (char *conf_fname) VCFG_DBG (0, "VCL<%d>: configured with mq with eventfd", getpid ()); } + else if (unformat (line_input, "tls-engine %u", + &vcl_cfg->tls_engine)) + { + 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, "}")) { vc_cfg_input = 0; @@ -558,18 +544,8 @@ vppcom_cfg (vppcom_cfg_t * vcl_cfg) vppcom_cfg_heapsize (conf_fname); vppcom_cfg_read_file (conf_fname); - env_var_str = getenv (VPPCOM_ENV_API_PREFIX); - if (env_var_str) - { - if (vcl_cfg->vpp_api_filename) - vec_free (vcl_cfg->vpp_api_filename); - vcl_cfg->vpp_api_filename = format (0, "/%s-vpe-api%c", env_var_str, 0); - vl_set_memory_root_path ((char *) env_var_str); - - VCFG_DBG (0, "VCL<%d>: configured api prefix (%s) and filename (%s) " - "from " VPPCOM_ENV_API_PREFIX "!", getpid (), env_var_str, - vcl_cfg->vpp_api_filename); - } + /* Regrab cfg after heap initialization */ + vcl_cfg = &vcm->cfg; env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_ID); if (env_var_str) { @@ -632,9 +608,16 @@ vppcom_cfg (vppcom_cfg_t * vcl_cfg) 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); } }