commit 87b15cebdaca21f6725637abeceec0f19f4eec51
author Florin Coras <fcoras@cisco.com> Sun Apr 28 21:16:30 2019 -0700
committer Dave Barach <openvpp@barachs.net> Tue Apr 30 16:59:49 2019 +0000
tree 3b6063188bc64972bdc359526dd8c0823bcd9fc9
parent c6eb5bc967d3d70016b4e4e182b3d68b1e558f60

svm: more fifo refactor/cleanup

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

src/vnet/session/session.c

diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c
index aaf252b..75f7baf 100644
--- a/src/vnet/session/session.c
+++ b/src/vnet/session/session.c
@@ -296,7 +296,7 @@
 	continue;
       if (is_in_order)
 	{
-	  rv = svm_fifo_enqueue_nowait (s->rx_fifo, len, data);
+	  rv = svm_fifo_enqueue (s->rx_fifo, len, data);
 	  if (rv == len)
 	    {
 	      written += rv;
@@ -363,9 +363,9 @@
 
   if (is_in_order)
     {
-      enqueued = svm_fifo_enqueue_nowait (s->rx_fifo,
-					  b->current_length,
-					  vlib_buffer_get_current (b));
+      enqueued = svm_fifo_enqueue (s->rx_fifo,
+				   b->current_length,
+				   vlib_buffer_get_current (b));
       if (PREDICT_FALSE ((b->flags & VLIB_BUFFER_NEXT_PRESENT)
 			 && enqueued >= 0))
 	{
@@ -414,10 +414,9 @@
   ASSERT (svm_fifo_max_enqueue_prod (s->rx_fifo)
 	  >= b->current_length + sizeof (*hdr));
 
-  svm_fifo_enqueue_nowait (s->rx_fifo, sizeof (session_dgram_hdr_t),
-			   (u8 *) hdr);
-  enqueued = svm_fifo_enqueue_nowait (s->rx_fifo, b->current_length,
-				      vlib_buffer_get_current (b));
+  svm_fifo_enqueue (s->rx_fifo, sizeof (session_dgram_hdr_t), (u8 *) hdr);
+  enqueued = svm_fifo_enqueue (s->rx_fifo, b->current_length,
+			       vlib_buffer_get_current (b));
   if (PREDICT_FALSE ((b->flags & VLIB_BUFFER_NEXT_PRESENT) && enqueued >= 0))
     {
       in_order_off = enqueued > b->current_length ? enqueued : 0;