session: fix local session tagging and cleanup

[vpp.git] / src / vnet / session / segment_manager.c

diff --git a/src/vnet/session/segment_manager.c b/src/vnet/session/segment_manager.c
index 6f149ad..8dd7292 100644 (file)
--- a/src/vnet/session/segment_manager.c
+++ b/src/vnet/session/segment_manager.c
@@ -34,7 +34,8 @@ static u32 default_app_evt_queue_size = 128;
 segment_manager_properties_t *
 segment_manager_properties_get (segment_manager_t * sm)
 {
-  return application_get_segment_manager_properties (sm->app_index);
+  app_worker_t *app_wrk = app_worker_get (sm->app_wrk_index);
+  return application_get_segment_manager_properties (app_wrk->app_index);
 }
 
 segment_manager_properties_t *
@@ -50,13 +51,13 @@ segment_manager_properties_init (segment_manager_properties_t * props)
 static u8
 segment_manager_app_detached (segment_manager_t * sm)
 {
-  return (sm->app_index == SEGMENT_MANAGER_INVALID_APP_INDEX);
+  return (sm->app_wrk_index == SEGMENT_MANAGER_INVALID_APP_INDEX);
 }
 
 void
 segment_manager_app_detach (segment_manager_t * sm)
 {
-  sm->app_index = SEGMENT_MANAGER_INVALID_APP_INDEX;
+  sm->app_wrk_index = SEGMENT_MANAGER_INVALID_APP_INDEX;
 }
 
 always_inline u32
@@ -192,7 +193,7 @@ segment_manager_add_segment (segment_manager_t * sm, u32 segment_size)
   if (props->segment_type != SSVM_SEGMENT_PRIVATE)
     {
       seg_name = format (0, "%d-%d%c", getpid (), segment_name_counter++, 0);
-      alloc_size = segment_size + rnd_margin;
+      alloc_size = (uword) segment_size + rnd_margin;
       baseva = clib_valloc_alloc (&smm->va_allocator, alloc_size, 0);
       if (!baseva)
        {
@@ -252,8 +253,7 @@ segment_manager_init (segment_manager_t * sm, u32 first_seg_size,
 {
   u32 rx_fifo_size, tx_fifo_size, pair_size;
   u32 rx_rounded_data_size, tx_rounded_data_size;
-  u64 approx_total_size, max_seg_size =
-    ((u64) 1 << 32) - clib_mem_get_page_size ();
+  u64 approx_total_size, max_seg_size = ((u64) 1 << 32) - (128 << 10);
   segment_manager_properties_t *props;
   svm_fifo_segment_private_t *segment;
   u32 approx_segment_count;
@@ -366,11 +366,11 @@ segment_manager_del_sessions (segment_manager_t * sm)
      */
     while (fifo)
       {
-       if (fifo->master_thread_index == 255)
+       if (fifo->ct_session_index != SVM_FIFO_INVALID_SESSION_INDEX)
          {
            svm_fifo_t *next = fifo->next;
-           application_local_session_disconnect_w_index (sm->app_index,
-                                                         fifo->master_session_index);
+           application_local_session_disconnect_w_index (sm->app_wrk_index,
+                                                         fifo->ct_session_index);
            fifo = next;
            continue;
          }
@@ -518,8 +518,8 @@ alloc_check:
       *fifo_segment_index = segment_manager_segment_index (sm, fifo_segment);
 
       if (added_a_segment)
-       rv = application_add_segment_notify (sm->app_index,
-                                            &fifo_segment->ssvm);
+       rv = app_worker_add_segment_notify (sm->app_wrk_index,
+                                           &fifo_segment->ssvm);
       /* Drop the lock after app is notified */
       segment_manager_segment_reader_unlock (sm);
       return rv;
@@ -591,7 +591,9 @@ segment_manager_dealloc_fifos (u32 segment_index, svm_fifo_t * rx_fifo,
       /* Remove segment manager if no sessions and detached from app */
       if (segment_manager_app_detached (sm)
          && !segment_manager_has_fifos (sm))
-       segment_manager_del (sm);
+       {
+         segment_manager_del (sm);
+       }
     }
   else
     segment_manager_segment_reader_unlock (sm);
@@ -721,8 +723,8 @@ segment_manager_show_fn (vlib_main_t * vm, unformat_input_t * input,
 
       /* *INDENT-OFF* */
       pool_foreach (sm, smm->segment_managers, ({
-       vlib_cli_output (vm, "%-10d%=15d%=12d", segment_manager_index(sm),
-                          sm->app_index, pool_elts (sm->segments));
+       vlib_cli_output (vm, "%-10d%=15d%=12d", segment_manager_index (sm),
+                          sm->app_wrk_index, pool_elts (sm->segments));
       }));
       /* *INDENT-ON* */