vcl: stop tracking vpp event queues and thread index

[vpp.git] / src / vcl / vcl_private.h

diff --git a/src/vcl/vcl_private.h b/src/vcl/vcl_private.h
index c82de1a..0d26e64 100644 (file)
--- a/src/vcl/vcl_private.h
+++ b/src/vcl/vcl_private.h
@@ -154,7 +154,6 @@ typedef struct vcl_session_
   vcl_session_msg_t *accept_evts_fifo;
 
   u64 vpp_handle;
-  u32 vpp_thread_index;
   u32 listener_index;          /**< index of parent listener (if any) */
   int n_accepted_sessions;     /**< sessions accepted by this listener */
   u32 attributes;              /**< see @ref vppcom_session_attr_t */
@@ -175,7 +174,6 @@ typedef struct vppcom_cfg_t_
 {
   uword heapsize;
   u32 max_workers;
-  u32 vpp_api_q_length;
   uword segment_baseva;
   uword segment_size;
   uword add_segment_size;
@@ -197,9 +195,7 @@ typedef struct vppcom_cfg_t_
   u32 event_ring_size;
   char *event_log_path;
   u8 *vpp_app_socket_api;      /**< app socket api socket file name */
-  u8 *vpp_bapi_filename;       /**< bapi shm transport file name */
   u8 *vpp_bapi_socket_name;    /**< bapi socket transport socket name */
-  u8 *vpp_bapi_chroot;
   u32 tls_engine;
   u8 mt_wrk_supported;
 } vppcom_cfg_t;
@@ -266,9 +262,6 @@ typedef struct vcl_worker_
   /** Our event message queue */
   svm_msg_q_t *app_event_queue;
 
-  /** VPP workers event message queues */
-  svm_msg_q_t **vpp_event_queues;
-
   /** For deadman timers */
   clib_time_t clib_time;
 
@@ -290,7 +283,6 @@ typedef struct vcl_worker_
 
   clib_socket_t app_api_sock;
   socket_client_main_t bapi_sock_ctx;
-  memory_client_main_t bapi_shm_ctx;
   api_main_t bapi_api_ctx;
 
   /** vcl needs next epoll_create to go to libc_epoll */
@@ -298,6 +290,11 @@ typedef struct vcl_worker_
   volatile int rpc_done;
 } vcl_worker_t;
 
+STATIC_ASSERT (sizeof (session_disconnected_msg_t) <= 16,
+              "disconnected must fit in session_event_t");
+STATIC_ASSERT (sizeof (session_reset_msg_t) <= 16,
+              "disconnected must fit in session_event_t");
+
 typedef void (vcl_rpc_fn_t) (void *args);
 
 typedef struct vppcom_main_t_
@@ -673,12 +670,6 @@ vcl_n_workers (void)
   return pool_elts (vcm->workers);
 }
 
-static inline svm_msg_q_t *
-vcl_session_vpp_evt_q (vcl_worker_t * wrk, vcl_session_t * s)
-{
-  return wrk->vpp_event_queues[s->vpp_thread_index];
-}
-
 static inline u64
 vcl_vpp_worker_segment_handle (u32 wrk_index)
 {