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-apps/echo_client.c

diff --git a/src/vnet/session-apps/echo_client.c b/src/vnet/session-apps/echo_client.c
index 8366c56..bcb2edf 100644
--- a/src/vnet/session-apps/echo_client.c
+++ b/src/vnet/session-apps/echo_client.c
@@ -97,7 +97,7 @@
 	  clib_memcpy_fast (&hdr.lcl_ip, &at->lcl_ip,
 			    sizeof (ip46_address_t));
 	  hdr.lcl_port = at->lcl_port;
-	  svm_fifo_enqueue_nowait (f, sizeof (hdr), (u8 *) & hdr);
+	  svm_fifo_enqueue (f, sizeof (hdr), (u8 *) & hdr);
 	  svm_fifo_enqueue_nocopy (f, rv);
 	  session_send_io_evt_to_thread_custom (&f->master_session_index,
 						s->thread_index,

src/vnet/session-apps/http_server.c

diff --git a/src/vnet/session-apps/http_server.c b/src/vnet/session-apps/http_server.c
index c7e06bf..ace3c75 100644
--- a/src/vnet/session-apps/http_server.c
+++ b/src/vnet/session-apps/http_server.c
@@ -310,7 +310,7 @@
     {
       int actual_transfer;
 
-      actual_transfer = svm_fifo_enqueue_nowait
+      actual_transfer = svm_fifo_enqueue
 	(hs->tx_fifo, bytes_to_send, data + offset);
 
       /* Made any progress? */