session: segment handle in accept/connect notifications

[vpp.git] / src / svm / test_svm_fifo1.c

diff --git a/src/svm/test_svm_fifo1.c b/src/svm/test_svm_fifo1.c
index 63b4a9b..243f8b6 100644 (file)
--- a/src/svm/test_svm_fifo1.c
+++ b/src/svm/test_svm_fifo1.c
@@ -26,20 +26,17 @@ hello_world (int verbose)
   u8 *retrieved_data = 0;
   clib_error_t *error = 0;
 
-  memset (a, 0, sizeof (*a));
+  clib_memset (a, 0, sizeof (*a));
 
   a->segment_name = "fifo-test1";
   a->segment_size = 256 << 10;
-  a->rx_fifo_size = 4096;
-  a->tx_fifo_size = 4096;
-  a->preallocated_fifo_pairs = 4;
 
   rv = svm_fifo_segment_create (a);
 
   if (rv)
     return clib_error_return (0, "svm_fifo_segment_create returned %d", rv);
 
-  sp = svm_fifo_get_segment (a->new_segment_index);
+  sp = svm_fifo_segment_get_segment (a->new_segment_indices[0]);
 
   f = svm_fifo_segment_alloc_fifo (sp, 4096, FIFO_SEGMENT_RX_FREELIST);
 
@@ -82,7 +79,7 @@ master (int verbose)
   u8 *retrieved_data = 0;
   int i;
 
-  memset (a, 0, sizeof (*a));
+  clib_memset (a, 0, sizeof (*a));
 
   a->segment_name = "fifo-test1";
   a->segment_size = 256 << 10;
@@ -92,7 +89,7 @@ master (int verbose)
   if (rv)
     return clib_error_return (0, "svm_fifo_segment_create returned %d", rv);
 
-  sp = svm_fifo_get_segment (a->new_segment_index);
+  sp = svm_fifo_segment_get_segment (a->new_segment_indices[0]);
 
   f = svm_fifo_segment_alloc_fifo (sp, 4096, FIFO_SEGMENT_RX_FREELIST);
 
@@ -118,7 +115,7 @@ mempig (int verbose)
   int rv;
   int i;
 
-  memset (a, 0, sizeof (*a));
+  clib_memset (a, 0, sizeof (*a));
 
   a->segment_name = "fifo-test1";
   a->segment_size = 256 << 10;
@@ -128,7 +125,7 @@ mempig (int verbose)
   if (rv)
     return clib_error_return (0, "svm_fifo_segment_create returned %d", rv);
 
-  sp = svm_fifo_get_segment (a->new_segment_index);
+  sp = svm_fifo_segment_get_segment (a->new_segment_indices[0]);
 
   for (i = 0; i < 1000; i++)
     {
@@ -176,7 +173,7 @@ offset (int verbose)
   u32 *recovered_data = 0;
   int i;
 
-  memset (a, 0, sizeof (*a));
+  clib_memset (a, 0, sizeof (*a));
 
   a->segment_name = "fifo-test1";
   a->segment_size = 256 << 10;
@@ -186,7 +183,7 @@ offset (int verbose)
   if (rv)
     return clib_error_return (0, "svm_fifo_segment_create returned %d", rv);
 
-  sp = svm_fifo_get_segment (a->new_segment_index);
+  sp = svm_fifo_segment_get_segment (a->new_segment_indices[0]);
 
   f = svm_fifo_segment_alloc_fifo (sp, 200 << 10, FIFO_SEGMENT_RX_FREELIST);
 
@@ -237,7 +234,7 @@ slave (int verbose)
   u8 *retrieved_data = 0;
   int i;
 
-  memset (a, 0, sizeof (*a));
+  clib_memset (a, 0, sizeof (*a));
 
   a->segment_name = "fifo-test1";
 
@@ -246,7 +243,7 @@ slave (int verbose)
   if (rv)
     return clib_error_return (0, "svm_fifo_segment_attach returned %d", rv);
 
-  sp = svm_fifo_get_segment (a->new_segment_index);
+  sp = svm_fifo_segment_get_segment (a->new_segment_indices[0]);
   sh = sp->ssvm.sh;
   fsh = (svm_fifo_segment_header_t *) sh->opaque[0];
 
@@ -276,7 +273,7 @@ test_ssvm_fifo1 (unformat_input_t * input)
   int verbose = 0;
   int test_id = 0;
 
-  svm_fifo_segment_init (0x200000000ULL, 20);
+  svm_fifo_segment_main_init (0x200000000ULL, 20);
 
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {