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 <fcoras@cisco.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
index 4b9d1a58932..ce1da6979e7 100644
--- a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
+++ b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
@@ -47,7 +47,7 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_init0
   clib_warning ("Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_init0");
 
   plugin_main->my_client_index = my_client_index;
-  plugin_main->vl_input_queue = uword_to_pointer (queue_address, unix_shared_memory_queue_t *);
+  plugin_main->vl_input_queue = uword_to_pointer (queue_address, svm_queue_t *);
 
   plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
   plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
diff --git a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.h b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.h
index 81e2a1bbbb6..51db3da83b5 100644
--- a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.h
+++ b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.h
@@ -25,7 +25,7 @@
 /* Global state for JVPP-IOAM-POT */
 typedef struct {
     /* Pointer to shared memory queue */
-    unix_shared_memory_queue_t * vl_input_queue;
+    svm_queue_t * vl_input_queue;
 
     /* VPP api client index */
     u32 my_client_index;