From e86a8edd3c14fb41ace2a12efd17bc7772bf623f Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Fri, 5 Jan 2018 03:20:25 -0800 Subject: api: refactor vlibmemory - separate client/server code for both memory and socket apis - separate memory api code from generic vlib api code - move unix_shared_memory_fifo to svm and rename to svm_fifo_t - overall declutter Change-Id: I90cdd98ff74d0787d58825b914b0f1eafcfa4dc2 Signed-off-by: Florin Coras --- src/plugins/memif/memif_api.c | 8 ++++---- src/plugins/memif/memif_test.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins/memif') diff --git a/src/plugins/memif/memif_api.c b/src/plugins/memif/memif_api.c index 684f53c5193..068fd3d69f0 100644 --- a/src/plugins/memif/memif_api.c +++ b/src/plugins/memif/memif_api.c @@ -60,7 +60,7 @@ */ #define REPLY_MACRO(t) \ do { \ - unix_shared_memory_queue_t * q = \ + svm_queue_t * q = \ vl_api_client_index_to_input_queue (mp->client_index); \ if (!q) \ return; \ @@ -75,7 +75,7 @@ do { \ #define REPLY_MACRO2(t, body) \ do { \ - unix_shared_memory_queue_t * q = \ + svm_queue_t * q = \ vl_api_client_index_to_input_queue (mp->client_index); \ if (!q) \ return; \ @@ -219,7 +219,7 @@ vl_api_memif_delete_t_handler (vl_api_memif_delete_t * mp) } static void -send_memif_details (unix_shared_memory_queue_t * q, +send_memif_details (svm_queue_t * q, memif_if_t * mif, vnet_sw_interface_t * swif, u8 * interface_name, u32 context) @@ -270,7 +270,7 @@ vl_api_memif_dump_t_handler (vl_api_memif_dump_t * mp) vnet_sw_interface_t *swif; memif_if_t *mif; u8 *if_name = 0; - unix_shared_memory_queue_t *q; + svm_queue_t *q; q = vl_api_client_index_to_input_queue (mp->client_index); if (q == 0) diff --git a/src/plugins/memif/memif_test.c b/src/plugins/memif/memif_test.c index 559d0f7d19f..00b3ad5d22c 100644 --- a/src/plugins/memif/memif_test.c +++ b/src/plugins/memif/memif_test.c @@ -361,7 +361,7 @@ vat_plugin_register (vat_main_t * vam) const char *id ## _CRC __attribute__ ((unused)) = #n "_" #crc; foreach_vl_msg_name_crc_vpe; #undef _ - mm->ping_id = vl_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); + mm->ping_id = vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); if (mm->msg_id_base != (u16) ~0) memif_vat_api_hookup (vam); -- cgit 1.2.3-korg