diff options
| author |   Florin Coras <fcoras@cisco.com> | 2019-04-28 21:16:30 -0700 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2019-04-30 16:59:49 +0000 |
| commit | 87b15cebdaca21f6725637abeceec0f19f4eec51 (patch) | |
| tree | 3b6063188bc64972bdc359526dd8c0823bcd9fc9 /src/vnet/session-apps | |
| parent | c6eb5bc967d3d70016b4e4e182b3d68b1e558f60 (diff) | |
svm: more fifo refactor/cleanup
Change-Id: Ie76c69641c8598164d0d00fd498018037258fd86
Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vnet/session-apps')
| -rw-r--r-- | src/vnet/session-apps/echo_client.c | 2 | ||||
| -rw-r--r-- | src/vnet/session-apps/http_server.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/vnet/session-apps/echo_client.c b/src/vnet/session-apps/echo_client.c index 8366c56aa6b..bcb2edf3792 100644 --- a/src/vnet/session-apps/echo_client.c +++ b/src/vnet/session-apps/echo_client.c @@ -97,7 +97,7 @@ send_data_chunk (echo_client_main_t * ecm, eclient_session_t * s) 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, diff --git a/src/vnet/session-apps/http_server.c b/src/vnet/session-apps/http_server.c index c7e06bfbb2d..ace3c75ebb8 100644 --- a/src/vnet/session-apps/http_server.c +++ b/src/vnet/session-apps/http_server.c @@ -310,7 +310,7 @@ send_data (http_session_t * hs, u8 * data) { 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? */ |