session: cleanup use of api_client_index

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

diff --git a/src/vcl/vcl_private.h b/src/vcl/vcl_private.h
index 75f16ca..0204bd5 100644 (file)
--- a/src/vcl/vcl_private.h
+++ b/src/vcl/vcl_private.h
@@ -18,7 +18,6 @@
 
 #include <vnet/session/application_interface.h>
 #include <vcl/vppcom.h>
-#include <vcl/vcl_event.h>
 #include <vcl/vcl_debug.h>
 
 #if (CLIB_DEBUG > 0)
@@ -139,6 +138,7 @@ do {                                            \
 
 typedef struct
 {
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
 #define _(type, name) type name;
   foreach_app_session_field
 #undef _
@@ -153,6 +153,7 @@ typedef struct
   /* Socket configuration state */
   u8 is_vep;
   u8 is_vep_session;
+  u8 has_rx_evt;
   u32 attr;
   u32 wait_cont_idx;
   vppcom_epoll_t vep;
@@ -218,8 +219,12 @@ typedef struct vcl_worker_
   /* Session pool */
   vcl_session_t *sessions;
 
+  /** Worker/thread index in current process */
   u32 wrk_index;
 
+  /** Worker index in vpp*/
+  u32 vpp_wrk_index;
+
   /** Message queues epoll fd. Initialized only if using mqs with eventfds */
   int mqs_epfd;
 
@@ -257,6 +262,12 @@ typedef struct vcl_worker_
 
   /** Vector acting as buffer for mq messages */
   svm_msg_q_msg_t *mq_msg_vector;
+
+  /** Vector of unhandled events */
+  session_event_t *unhandled_evts_vector;
+
+  /** Used also as a thread stop key buffer */
+  pthread_t thread_id;
 } vcl_worker_t;
 
 typedef struct vppcom_main_t_
@@ -265,15 +276,26 @@ typedef struct vppcom_main_t_
   u32 debug;
   pthread_t main_cpu;
 
-  /** VPP binary api input queue */
-  svm_queue_t *vl_input_queue;
+  /** Main process pid */
+  pid_t main_pid;
+
+  /** Current pid, may be different from main_pid if forked child */
+  pid_t current_pid;
+
+  /** App's index in vpp. It's used by vpp to identify the app */
+  u32 app_index;
 
   /** API client handle */
   u32 my_client_index;
 
+  /** VPP binary api input queue */
+  svm_queue_t *vl_input_queue;
+
   /** State of the connection, shared between msg RX thread and main thread */
   volatile app_state_t app_state;
 
+  u8 *app_name;
+
   /** VCL configuration */
   vppcom_cfg_t cfg;
 
@@ -295,13 +317,6 @@ typedef struct vppcom_main_t_
   /* VNET_API_ERROR_FOO -> "Foo" hash table */
   uword *error_string_by_error_number;
 
-  /* Obsolete */
-
-  /* Event thread */
-  vce_event_thread_t event_thread;
-
-  /* IO thread */
-  vppcom_session_io_thread_t session_io_thread;
 } vppcom_main_t;
 
 extern vppcom_main_t *vcm;