svm_fifo rework to avoid contention on cursize

[vpp.git] / src / tests / vnet / session / udp_echo.c

diff --git a/src/tests/vnet/session/udp_echo.c b/src/tests/vnet/session/udp_echo.c
index 9fda73d..91d5dcc 100644 (file)
--- a/src/tests/vnet/session/udp_echo.c
+++ b/src/tests/vnet/session/udp_echo.c
@@ -454,7 +454,7 @@ cut_through_thread_fn (void *arg)
          else
            {
              /* We don't do anything with the data, drop it */
-             actual_transfer = svm_fifo_max_dequeue (rx_fifo);
+             actual_transfer = svm_fifo_max_dequeue_cons (rx_fifo);
              svm_fifo_dequeue_drop (rx_fifo, actual_transfer);
            }
        }
@@ -724,7 +724,7 @@ send_test_chunk (udp_echo_main_t * utm, app_session_t * s, u32 bytes)
   test_buf_offset = utm->bytes_sent % test_buf_len;
   bytes_this_chunk = clib_min (test_buf_len - test_buf_offset,
                               utm->bytes_to_send);
-  enq_space = svm_fifo_max_enqueue (s->tx_fifo);
+  enq_space = svm_fifo_max_enqueue_prod (s->tx_fifo);
   bytes_this_chunk = clib_min (bytes_this_chunk, enq_space);
 
   written = app_send (s, test_data + test_buf_offset, bytes_this_chunk,
@@ -975,7 +975,8 @@ server_handle_fifo_event_rx (udp_echo_main_t * utm, u32 session_index)
   rx_fifo = session->rx_fifo;
   tx_fifo = session->tx_fifo;
 
-  max_dequeue = svm_fifo_max_dequeue (rx_fifo);
+
+  max_dequeue = svm_fifo_max_dequeue_cons (rx_fifo);
   /* Allow enqueuing of a new event */
   svm_fifo_unset_event (rx_fifo);
 
@@ -1014,7 +1015,8 @@ server_handle_fifo_event_rx (udp_echo_main_t * utm, u32 session_index)
 
          /* If event wasn't set, add one */
          if (svm_fifo_set_event (tx_fifo))
-           app_send_io_evt_to_vpp (session->vpp_evt_q, tx_fifo,
+           app_send_io_evt_to_vpp (session->vpp_evt_q,
+                                   tx_fifo->master_session_index,
                                    SESSION_IO_EVT_TX, SVM_Q_WAIT);
        }
     }
@@ -1043,7 +1045,7 @@ server_handle_event_queue (udp_echo_main_t * utm)
       switch (e->event_type)
        {
        case SESSION_IO_EVT_RX:
-         server_handle_fifo_event_rx (utm, e->fifo->client_session_index);
+         server_handle_fifo_event_rx (utm, e->session_index);
          break;
 
        default: