X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Funittest%2Fsession_test.c;h=8d5566feb46065d08c38ca29f0ce5cfd923ae449;hb=2de9c0f92bb486072d8371a24d9b23fd85e1aa80;hp=fa6a99ffbf039f2deea34edd12d3cb07036d8aad;hpb=a5160d7d1f0dda554960e1f0e9f7074bda256baa;p=vpp.git

diff --git a/src/plugins/unittest/session_test.c b/src/plugins/unittest/session_test.c
index fa6a99ffbf0..8d5566feb46 100644
--- a/src/plugins/unittest/session_test.c
+++ b/src/plugins/unittest/session_test.c
@@ -158,12 +158,14 @@ session_delete_loopback (u32 sw_if_index)
 {
   /* fails spectacularly  */
   /* vnet_delete_loopback_interface (sw_if_index); */
+
+  vnet_sw_interface_set_flags (vnet_get_main (), sw_if_index, 0);
 }
 
 static int
 session_test_basic (vlib_main_t * vm, unformat_input_t * input)
 {
-  session_endpoint_t server_sep = SESSION_ENDPOINT_NULL;
+  session_endpoint_cfg_t server_sep = SESSION_ENDPOINT_CFG_NULL;
   u64 options[APP_OPTIONS_N_OPTIONS], bind4_handle, bind6_handle;
   u32 server_index;
   int error = 0;
@@ -187,8 +189,9 @@ session_test_basic (vlib_main_t * vm, unformat_input_t * input)
 
   server_sep.is_ip4 = 1;
   vnet_listen_args_t bind_args = {
-    .sep = server_sep,
+    .sep_ext = server_sep,
     .app_index = 0,
+    .wrk_map_index = 0,
   };
 
   bind_args.app_index = server_index;
@@ -277,7 +280,7 @@ session_test_endpoint_cfg (vlib_main_t * vm, unformat_input_t * input)
   u32 server_index, client_index, sw_if_index[2], tries = 0;
   u64 options[APP_OPTIONS_N_OPTIONS], dummy_secret = 1234;
   u16 dummy_server_port = 1234, dummy_client_port = 5678;
-  session_endpoint_t server_sep = SESSION_ENDPOINT_NULL;
+  session_endpoint_cfg_t server_sep = SESSION_ENDPOINT_CFG_NULL;
   ip4_address_t intf_addr[3];
   transport_connection_t *tc;
   session_t *s;
@@ -344,7 +347,7 @@ session_test_endpoint_cfg (vlib_main_t * vm, unformat_input_t * input)
   server_sep.is_ip4 = 1;
   server_sep.port = dummy_server_port;
   vnet_listen_args_t bind_args = {
-    .sep = server_sep,
+    .sep_ext = server_sep,
     .app_index = server_index,
   };
   error = vnet_listen (&bind_args);
@@ -372,8 +375,7 @@ session_test_endpoint_cfg (vlib_main_t * vm, unformat_input_t * input)
   SESSION_TEST ((error == 0), "connect should work");
 
   /* wait for stuff to happen */
-  while ((connected_session_index == ~0
-	  || vec_len (tcp_main.wrk_ctx[0].pending_acks)) && ++tries < 100)
+  while (connected_session_index == ~0 && ++tries < 100)
     vlib_process_suspend (vm, 100e-3);
   clib_warning ("waited %.1f seconds for connections", tries / 10.0);
   SESSION_TEST ((connected_session_index != ~0), "session should exist");
@@ -1693,6 +1695,7 @@ session_test_proxy (vlib_main_t * vm, unformat_input_t * input)
   if (verbose)
     unformat_free (&tmp_input);
   vec_free (attach_args.name);
+  session_delete_loopback (sw_if_index);
   return 0;
 }
 
@@ -1736,7 +1739,7 @@ wait_for_event (svm_msg_q_t * mq, int fd, int epfd, u8 use_eventfd)
 }
 
 static int
-session_test_mq (vlib_main_t * vm, unformat_input_t * input)
+session_test_mq_speed (vlib_main_t * vm, unformat_input_t * input)
 {
   int error, __clib_unused verbose, use_eventfd = 0;
   u64 i, n_test_msgs = 1 << 10, *counter;
@@ -1746,7 +1749,6 @@ session_test_mq (vlib_main_t * vm, unformat_input_t * input)
   vl_api_registration_t *reg;
   struct epoll_event ep_evt;
   u32 app_index, api_index;
-  u32 fifo_segment_index;
   app_worker_t *app_wrk;
   segment_manager_t *sm;
   svm_msg_q_msg_t msg;
@@ -1812,12 +1814,11 @@ session_test_mq (vlib_main_t * vm, unformat_input_t * input)
     }
 
   sm = app_worker_get_or_alloc_connect_segment_manager (app_wrk);
-  segment_manager_alloc_session_fifos (sm, &rx_fifo, &tx_fifo,
-				       &fifo_segment_index);
+  segment_manager_alloc_session_fifos (sm, 0, &rx_fifo, &tx_fifo);
   s.rx_fifo = rx_fifo;
   s.tx_fifo = tx_fifo;
   s.session_state = SESSION_STATE_READY;
-  counter = (u64 *) rx_fifo->data;
+  counter = (u64 *) rx_fifo->head_chunk->data;
   start = vlib_time_now (vm);
 
   pid = fork ();
@@ -1870,6 +1871,107 @@ session_test_mq (vlib_main_t * vm, unformat_input_t * input)
   return 0;
 }
 
+static int
+session_test_mq_basic (vlib_main_t * vm, unformat_input_t * input)
+{
+  svm_msg_q_cfg_t _cfg, *cfg = &_cfg;
+  svm_msg_q_msg_t msg1, msg2, msg[12];
+  int __clib_unused verbose, i, rv;
+  svm_msg_q_t *mq;
+  svm_msg_q_ring_t *ring;
+  u8 *rings_ptr;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "verbose"))
+	verbose = 1;
+      else
+	{
+	  vlib_cli_output (vm, "parse error: '%U'", format_unformat_error,
+			   input);
+	  return -1;
+	}
+    }
+
+  svm_msg_q_ring_cfg_t rc[2] = { {8, 8, 0}
+  , {8, 16, 0}
+  };
+  cfg->consumer_pid = ~0;
+  cfg->n_rings = 2;
+  cfg->q_nitems = 16;
+  cfg->ring_cfgs = rc;
+
+  mq = svm_msg_q_alloc (cfg);
+  SESSION_TEST (mq != 0, "svm_msg_q_alloc");
+  SESSION_TEST (vec_len (mq->rings) == 2, "ring allocation");
+  rings_ptr = (u8 *) mq->rings + vec_bytes (mq->rings);
+  vec_foreach (ring, mq->rings)
+  {
+    SESSION_TEST (ring->data == rings_ptr, "ring data");
+    rings_ptr += (uword) ring->nitems * ring->elsize;
+  }
+
+  msg1 = svm_msg_q_alloc_msg (mq, 8);
+  rv = (mq->rings[0].cursize != 1
+	|| msg1.ring_index != 0 || msg1.elt_index != 0);
+  SESSION_TEST (rv == 0, "msg alloc1");
+
+  msg2 = svm_msg_q_alloc_msg (mq, 15);
+  rv = (mq->rings[1].cursize != 1
+	|| msg2.ring_index != 1 || msg2.elt_index != 0);
+  SESSION_TEST (rv == 0, "msg alloc2");
+
+  svm_msg_q_free_msg (mq, &msg1);
+  SESSION_TEST (mq->rings[0].cursize == 0, "free msg");
+
+  for (i = 0; i < 12; i++)
+    {
+      msg[i] = svm_msg_q_alloc_msg (mq, 7);
+      *(u32 *) svm_msg_q_msg_data (mq, &msg[i]) = i;
+    }
+
+  rv = (mq->rings[0].cursize != 8 || mq->rings[1].cursize != 5);
+  SESSION_TEST (rv == 0, "msg alloc3");
+
+  *(u32 *) svm_msg_q_msg_data (mq, &msg2) = 123;
+  svm_msg_q_add (mq, &msg2, SVM_Q_NOWAIT);
+  for (i = 0; i < 12; i++)
+    svm_msg_q_add (mq, &msg[i], SVM_Q_NOWAIT);
+
+  rv = svm_msg_q_sub (mq, &msg2, SVM_Q_NOWAIT, 0);
+  SESSION_TEST (rv == 0, "dequeue1");
+
+  SESSION_TEST (msg2.ring_index == 1 && msg2.elt_index == 0,
+		"dequeue1 result");
+  rv = (*(u32 *) svm_msg_q_msg_data (mq, &msg2) == 123);
+  SESSION_TEST (rv, "dequeue 1 data");
+
+  svm_msg_q_free_msg (mq, &msg2);
+
+  for (i = 0; i < 12; i++)
+    {
+      if (svm_msg_q_sub (mq, &msg[i], SVM_Q_NOWAIT, 0))
+	SESSION_TEST (0, "dequeue2");
+      if (i < 8)
+	{
+	  if (msg[i].ring_index != 0 || msg[i].elt_index != (i + 1) % 8)
+	    SESSION_TEST (0, "dequeue2 result2");
+	}
+      else
+	{
+	  if (msg[i].ring_index != 1 || msg[i].elt_index != (i - 8) + 1)
+	    SESSION_TEST (0, "dequeue2 result3");
+	}
+      if (*(u32 *) svm_msg_q_msg_data (mq, &msg[i]) != i)
+	SESSION_TEST (0, "dequeue2 wrong data");
+      svm_msg_q_free_msg (mq, &msg[i]);
+    }
+  rv = (mq->rings[0].cursize == 0 && mq->rings[1].cursize == 0);
+  SESSION_TEST (rv, "post dequeue");
+
+  return 0;
+}
+
 static clib_error_t *
 session_test (vlib_main_t * vm,
 	      unformat_input_t * input, vlib_cli_command_t * cmd_arg)
@@ -1892,8 +1994,10 @@ session_test (vlib_main_t * vm,
 	res = session_test_proxy (vm, input);
       else if (unformat (input, "endpt-cfg"))
 	res = session_test_endpoint_cfg (vm, input);
-      else if (unformat (input, "mq"))
-	res = session_test_mq (vm, input);
+      else if (unformat (input, "mq-speed"))
+	res = session_test_mq_speed (vm, input);
+      else if (unformat (input, "mq-basic"))
+	res = session_test_mq_basic (vm, input);
       else if (unformat (input, "all"))
 	{
 	  if ((res = session_test_basic (vm, input)))
@@ -1908,7 +2012,9 @@ session_test (vlib_main_t * vm,
 	    goto done;
 	  if ((res = session_test_endpoint_cfg (vm, input)))
 	    goto done;
-	  if ((res = session_test_mq (vm, input)))
+	  if ((res = session_test_mq_speed (vm, input)))
+	    goto done;
+	  if ((res = session_test_mq_basic (vm, input)))
 	    goto done;
 	}
       else