session: refactor local connects

[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 2b8a732..63af299 100644 (file)
--- a/src/vnet/session/segment_manager.c
+++ b/src/vnet/session/segment_manager.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -186,7 +186,7 @@ segment_manager_add_segment (segment_manager_t * sm, u32 segment_size)
   segment_manager_main_t *smm = &segment_manager_main;
   u32 rnd_margin = 128 << 10, seg_index, page_size;
   segment_manager_properties_t *props;
-  uword baseva = (u64) ~ 0, alloc_size;
+  uword baseva = (uword) ~ 0ULL, alloc_size;
   svm_fifo_segment_private_t *seg;
   u8 *seg_name;
   int rv;
@@ -379,7 +379,8 @@ void
 segment_manager_del_sessions (segment_manager_t * sm)
 {
   svm_fifo_segment_private_t *fifo_segment;
-  stream_session_t *session;
+  session_handle_t *handles = 0, *handle;
+  session_t *session;
   svm_fifo_t *fifo;
 
   ASSERT (pool_elts (sm->segments) != 0);
@@ -397,16 +398,11 @@ segment_manager_del_sessions (segment_manager_t * sm)
     while (fifo)
       {
        if (fifo->ct_session_index != SVM_FIFO_INVALID_SESSION_INDEX)
-         {
-           svm_fifo_t *next = fifo->next;
-           application_local_session_disconnect_w_index (sm->app_wrk_index,
-                                                         fifo->ct_session_index);
-           fifo = next;
-           continue;
-         }
-       session = session_get (fifo->master_session_index,
-                              fifo->master_thread_index);
-       session_close (session);
+         session = session_get (fifo->ct_session_index, 0);
+       else
+         session = session_get (fifo->master_session_index,
+                                fifo->master_thread_index);
+       vec_add1 (handles, session_handle (session));
        fifo = fifo->next;
       }
 
@@ -415,6 +411,9 @@ segment_manager_del_sessions (segment_manager_t * sm)
      */
   }));
   /* *INDENT-ON* */
+
+  vec_foreach (handle, handles)
+    session_close (session_get_from_handle (*handle));
 }
 
 /**
@@ -552,9 +551,10 @@ alloc_check:
 
       if (added_a_segment)
        {
+         app_worker_t *app_wrk;
          segment_handle = segment_manager_segment_handle (sm, fifo_segment);
-         rv = app_worker_add_segment_notify (sm->app_wrk_index,
-                                             segment_handle);
+         app_wrk = app_worker_get (sm->app_wrk_index);
+         rv = app_worker_add_segment_notify (app_wrk, segment_handle);
        }
       /* Drop the lock after app is notified */
       segment_manager_segment_reader_unlock (sm);
@@ -599,6 +599,9 @@ segment_manager_dealloc_fifos (u32 segment_index, svm_fifo_t * rx_fifo,
   svm_fifo_segment_private_t *fifo_segment;
   segment_manager_t *sm;
 
+  if (!rx_fifo || !tx_fifo)
+    return;
+
   /* It's possible to have no segment manager if the session was removed
    * as result of a detach. */
   if (!(sm = segment_manager_get_if_valid (rx_fifo->segment_manager)))
@@ -735,8 +738,8 @@ segment_manager_show_fn (vlib_main_t * vm, unformat_input_t * input,
   svm_fifo_segment_private_t *seg;
   segment_manager_t *sm;
   u8 show_segments = 0, verbose = 0;
-  uword address;
-  u64 size;
+  char *address;
+  size_t size;
   u32 active_fifos;
   u32 free_fifos;