commit 88001c64e9e5d0dc08e303857ca34687454ebf10
author Florin Coras <fcoras@cisco.com> Wed Apr 24 14:44:46 2019 -0700
committer Damjan Marion <dmarion@me.com> Thu Apr 25 18:05:16 2019 +0000
tree f747dabb08b764514c3465ca854ebed87031e8bb
parent 1ccbbfbf972eefc87491dd7c260bc0c4dcef8ac9

session: cleanup segment manager and fifo segment

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

src/tests/vnet/session/quic_echo.c

diff --git a/src/tests/vnet/session/quic_echo.c b/src/tests/vnet/session/quic_echo.c
index 4d1288f..7d0cedd 100644
--- a/src/tests/vnet/session/quic_echo.c
+++ b/src/tests/vnet/session/quic_echo.c
@@ -17,10 +17,10 @@
 #include <signal.h>
 
 #include <vnet/session/application_interface.h>
-#include <svm/svm_fifo_segment.h>
 #include <vlibmemory/api.h>
 
 #include <vpp/api/vpe_msg_enum.h>
+#include <svm/fifo_segment.h>
 
 #define vl_typedefs		/* define message structures */
 #include <vpp/api/vpe_all_api_h.h>
@@ -141,7 +141,7 @@
    * and all other messages are exchanged using shm IPC. */
   u8 use_sock_api;
 
-  svm_fifo_segment_main_t segment_main;
+  fifo_segment_main_t segment_main;
 } echo_main_t;
 
 echo_main_t echo_main;
@@ -290,8 +290,8 @@
 static int
 ssvm_segment_attach (char *name, ssvm_segment_type_t type, int fd)
 {
-  svm_fifo_segment_create_args_t _a, *a = &_a;
-  svm_fifo_segment_main_t *sm = &echo_main.segment_main;
+  fifo_segment_create_args_t _a, *a = &_a;
+  fifo_segment_main_t *sm = &echo_main.segment_main;
   int rv;
 
   clib_memset (a, 0, sizeof (*a));
@@ -301,7 +301,7 @@
   if (type == SSVM_SEGMENT_MEMFD)
     a->memfd_fd = fd;
 
-  if ((rv = svm_fifo_segment_attach (sm, a)))
+  if ((rv = fifo_segment_attach (sm, a)))
     {
       clib_warning ("svm_fifo_segment_attach ('%s') failed", name);
       return rv;
@@ -454,15 +454,15 @@
 static void
 vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp)
 {
-  svm_fifo_segment_main_t *sm = &echo_main.segment_main;
-  svm_fifo_segment_create_args_t _a, *a = &_a;
+  fifo_segment_main_t *sm = &echo_main.segment_main;
+  fifo_segment_create_args_t _a, *a = &_a;
   int rv;
 
   clib_memset (a, 0, sizeof (*a));
   a->segment_name = (char *) mp->segment_name;
   a->segment_size = mp->segment_size;
   /* Attach to the segment vpp created */
-  rv = svm_fifo_segment_attach (sm, a);
+  rv = fifo_segment_attach (sm, a);
   if (rv)
     {
       clib_warning ("svm_fifo_segment_attach ('%s') failed",
@@ -1286,7 +1286,7 @@
 {
   int i_am_server = 1, test_return_packets = 0;
   echo_main_t *em = &echo_main;
-  svm_fifo_segment_main_t *sm = &em->segment_main;
+  fifo_segment_main_t *sm = &em->segment_main;
   unformat_input_t _argv, *a = &_argv;
   u8 *chroot_prefix;
   u8 *uri = 0;
@@ -1309,7 +1309,7 @@
 
   clib_time_init (&em->clib_time);
   init_error_string_table (em);
-  svm_fifo_segment_main_init (sm, HIGH_SEGMENT_BASEVA, 20);
+  fifo_segment_main_init (sm, HIGH_SEGMENT_BASEVA, 20);
   unformat_init_command_line (a, argv);
 
   while (unformat_check_input (a) != UNFORMAT_END_OF_INPUT)