X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvcl_cfg.c;h=3fdda9cd6042a98e4dc8072357925a79ba58ec4e;hb=935ce75cb;hp=3be6de0216732a2a33b93d6c5bf5018f88f96863;hpb=d4c709222b67f6c45ee7064637f69de9e9509222;p=vpp.git

diff --git a/src/vcl/vcl_cfg.c b/src/vcl/vcl_cfg.c
index 3be6de02167..3fdda9cd604 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,
@@ -283,18 +283,25 @@ vppcom_cfg_read_file (char *conf_fname)
 			vcl_cfg->max_workers);
 	    }
 	  else if (unformat (line_input, "api-prefix %s",
-			     &vcl_cfg->vpp_api_chroot))
+			     &vcl_cfg->vpp_bapi_chroot))
 	    {
-	      vec_terminate_c_string (vcl_cfg->vpp_api_chroot);
+	      vec_terminate_c_string (vcl_cfg->vpp_bapi_chroot);
 	      VCFG_DBG (0, "VCL<%d>: configured api-prefix (%s) ", getpid (),
-			vcl_cfg->vpp_api_chroot);
+			vcl_cfg->vpp_bapi_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, "app-socket-api %s",
+			     &vcl_cfg->vpp_app_socket_api))
+	    {
+	      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, "vpp-api-q-length %d", &q_len))
 	    {
@@ -323,37 +330,37 @@ 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 %u",
+	  else if (unformat (line_input, "segment-size %lu",
 			     &vcl_cfg->segment_size))
 	    {
-	      VCFG_DBG (0, "VCL<%d>: configured segment_size %u (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 (%u)",
+	      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 %u",
+	  else if (unformat (line_input, "add-segment-size %lu",
 			     &vcl_cfg->add_segment_size))
 	    {
-	      VCFG_DBG (0, "VCL<%d>: configured add_segment_size %u (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);
 	    }
@@ -473,7 +480,7 @@ vppcom_cfg_read_file (char *conf_fname)
 	  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)
 		{
@@ -498,6 +505,12 @@ vppcom_cfg_read_file (char *conf_fname)
 	      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;
@@ -561,8 +574,8 @@ vppcom_cfg (vppcom_cfg_t * vcl_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);
+      vcl_cfg->vpp_bapi_chroot = format (0, "%s", env_var_str);
+      vec_terminate_c_string (vcl_cfg->vpp_bapi_chroot);
       VCFG_DBG (0, "VCL<%d>: configured api prefix (%s) from "
 		VPPCOM_ENV_API_PREFIX "!", getpid (), env_var_str);
     }
@@ -628,9 +641,9 @@ 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);
     }
 }