vcl: remove unused fields and structures

Change-Id: I49a95c4e2eb17e5a6ab514dde2505294a4c01353
Signed-off-by: Florin Coras <fcoras@cisco.com>

diff --git a/src/vcl/vcl_bapi.c b/src/vcl/vcl_bapi.c
index b06081f..6baa7c1 100644 (file)
--- a/src/vcl/vcl_bapi.c
+++ b/src/vcl/vcl_bapi.c
@@ -545,7 +545,6 @@ vppcom_send_connect_sock (vcl_session_t * session)
   clib_memcpy_fast (cmp->ip, &session->transport.rmt_ip, sizeof (cmp->ip));
   cmp->port = session->transport.rmt_port;
   cmp->proto = session->session_type;
-  clib_memcpy_fast (cmp->options, session->options, sizeof (cmp->options));
   vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & cmp);
 }
 
@@ -584,7 +583,6 @@ vppcom_send_bind_sock (vcl_session_t * session)
   clib_memcpy_fast (bmp->ip, &session->transport.lcl_ip, sizeof (bmp->ip));
   bmp->port = session->transport.lcl_port;
   bmp->proto = session->session_type;
-  clib_memcpy_fast (bmp->options, session->options, sizeof (bmp->options));
   vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & bmp);
 }
 

diff --git a/src/vcl/vcl_private.h b/src/vcl/vcl_private.h
index 28673bc..2187499 100644 (file)
--- a/src/vcl/vcl_private.h
+++ b/src/vcl/vcl_private.h
@@ -149,13 +149,6 @@ do {                                            \
 #define VCL_SESS_ATTR_TEST(ATTR, VAL)           \
   ((ATTR) & (1 << (VAL)) ? 1 : 0)
 
-typedef struct vcl_shared_session_
-{
-  u32 ss_index;
-  u32 *workers;
-  u32 session_index;
-} vcl_shared_session_t;
-
 typedef struct
 {
   CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
@@ -165,8 +158,6 @@ typedef struct
   u32 sndbuf_size;             // VPP-TBD: Hack until support setsockopt(SO_SNDBUF)
   u32 rcvbuf_size;             // VPP-TBD: Hack until support setsockopt(SO_RCVBUF)
   u32 user_mss;                        // VPP-TBD: Hack until support setsockopt(TCP_MAXSEG)
-  u8 *segment_name;
-  u32 sm_seg_index;
   u32 client_context;
   u64 vpp_handle;
   u32 vpp_thread_index;
@@ -176,11 +167,9 @@ typedef struct
   u8 is_vep_session;
   u8 has_rx_evt;
   u32 attr;
-  u32 wait_cont_idx;
   vppcom_epoll_t vep;
   int libc_epfd;
   svm_msg_q_t *our_evt_q;
-  u64 options[16];
   vcl_session_msg_t *accept_evts_fifo;
 #if VCL_ELOG
   elog_track_t elog_track;
@@ -336,9 +325,6 @@ typedef struct vppcom_main_t_
   /** Lock to protect worker registrations */
   clib_spinlock_t workers_lock;
 
-  /** Pool of shared sessions */
-  vcl_shared_session_t *shared_sessions;
-
   /** Lock to protect segment hash table */
   clib_rwlock_t segment_table_lock;
 
@@ -553,9 +539,6 @@ vcl_worker_t *vcl_worker_alloc_and_init (void);
 void vcl_worker_cleanup (vcl_worker_t * wrk, u8 notify_vpp);
 int vcl_worker_register_with_vpp (void);
 int vcl_worker_set_bapi (void);
-void vcl_worker_share_sessions (vcl_worker_t * parent_wrk);
-int vcl_worker_unshare_session (vcl_worker_t * wrk, vcl_session_t * s);
-vcl_shared_session_t *vcl_shared_session_get (u32 ss_index);
 
 void vcl_flush_mq_events (void);
 void vcl_cleanup_bapi (void);

diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c
index cc7a276..7c076d3 100644 (file)
--- a/src/vcl/vppcom.c
+++ b/src/vcl/vppcom.c
@@ -2216,11 +2216,9 @@ vep_verify_epoll_chain (vcl_worker_t * wrk, u32 vep_idx)
                "   is_vep         = %u\n"
                "   is_vep_session = %u\n"
                "   next_sid       = 0x%x (%u)\n"
-               "   wait_cont_idx  = 0x%x (%u)\n"
                "}\n", getpid (), vep_idx,
                session->is_vep, session->is_vep_session,
-               vep->next_sh, vep->next_sh,
-               session->wait_cont_idx, session->wait_cont_idx);
+               vep->next_sh, vep->next_sh);
 
   for (sid = vep->next_sh; sid != ~0; sid = vep->next_sh)
     {
@@ -2280,7 +2278,6 @@ vppcom_epoll_create (void)
   vep_session->vep.vep_sh = ~0;
   vep_session->vep.next_sh = ~0;
   vep_session->vep.prev_sh = ~0;
-  vep_session->wait_cont_idx = ~0;
   vep_session->vpp_handle = ~0;
 
   vcl_evt (VCL_EVT_EPOLL_CREATE, vep_session, vep_session->session_index);
@@ -2413,10 +2410,6 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle,
          goto done;
        }
 
-      vep_session->wait_cont_idx =
-       (vep_session->wait_cont_idx == session_handle) ?
-       session->vep.next_sh : vep_session->wait_cont_idx;
-
       if (session->vep.prev_sh == vep_handle)
        vep_session->vep.next_sh = session->vep.next_sh;
       else