summaryrefslogtreecommitdiffstats
path: root/src/vlibmemory/memory_client.c
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2018-01-05 03:20:25 -0800
committerDave Barach <openvpp@barachs.net>2018-01-09 18:33:08 +0000
commite86a8edd3c14fb41ace2a12efd17bc7772bf623f (patch)
tree480219864cadd743fdb95c21379aeaf88a985e23 /src/vlibmemory/memory_client.c
parent4363ad6c96b5641fca1b16c5a6ec22e2364adcfd (diff)
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>
Diffstat (limited to 'src/vlibmemory/memory_client.c')
-rw-r--r--src/vlibmemory/memory_client.c50
1 files changed, 15 insertions, 35 deletions
diff --git a/src/vlibmemory/memory_client.c b/src/vlibmemory/memory_client.c
index c47f25e6e3d..1bb2fe86136 100644
--- a/src/vlibmemory/memory_client.c
+++ b/src/vlibmemory/memory_client.c
@@ -17,33 +17,15 @@
*------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <stdlib.h>
#include <setjmp.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <time.h>
-#include <fcntl.h>
-#include <string.h>
-#include <vppinfra/clib.h>
-#include <vppinfra/vec.h>
+
+#include <svm/svm.h>
+#include <vppinfra/serialize.h>
#include <vppinfra/hash.h>
-#include <vppinfra/bitmap.h>
-#include <vppinfra/fifo.h>
-#include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/format.h>
-
-#include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
-#include <vlibmemory/api.h>
+#include <vlibmemory/memory_client.h>
+
+/* A hack. vl_client_get_first_plugin_msg_id depends on it */
+#include <vlibmemory/socket_client.h>
#include <vlibmemory/vl_memory_msg_enum.h>
@@ -77,7 +59,7 @@ memory_client_main_t memory_client_main;
static void *
rx_thread_fn (void *arg)
{
- unix_shared_memory_queue_t *q;
+ svm_queue_t *q;
memory_client_main_t *mm = &memory_client_main;
api_main_t *am = &api_main;
int i;
@@ -178,7 +160,7 @@ vl_client_connect (const char *name, int ctx_quota, int input_queue_size)
svm_region_t *svm;
vl_api_memclnt_create_t *mp;
vl_api_memclnt_create_reply_t *rp;
- unix_shared_memory_queue_t *vl_input_queue;
+ svm_queue_t *vl_input_queue;
vl_shmem_hdr_t *shmem_hdr;
int rv = 0;
void *oldheap;
@@ -208,8 +190,7 @@ vl_client_connect (const char *name, int ctx_quota, int input_queue_size)
pthread_mutex_lock (&svm->mutex);
oldheap = svm_push_data_heap (svm);
vl_input_queue =
- unix_shared_memory_queue_init (input_queue_size, sizeof (uword),
- getpid (), 0);
+ svm_queue_init (input_queue_size, sizeof (uword), getpid (), 0);
pthread_mutex_unlock (&svm->mutex);
svm_pop_heap (oldheap);
@@ -235,8 +216,8 @@ vl_client_connect (const char *name, int ctx_quota, int input_queue_size)
/* Wait up to 10 seconds */
for (i = 0; i < 1000; i++)
{
- qstatus = unix_shared_memory_queue_sub (vl_input_queue, (u8 *) & rp,
- 1 /* nowait */ );
+ qstatus = svm_queue_sub (vl_input_queue, (u8 *) & rp,
+ 1 /* nowait */ );
if (qstatus == 0)
goto read_one_msg;
ts.tv_sec = 0;
@@ -270,7 +251,7 @@ vl_api_memclnt_delete_reply_t_handler (vl_api_memclnt_delete_reply_t * mp)
pthread_mutex_lock (&am->vlib_rp->mutex);
oldheap = svm_push_data_heap (am->vlib_rp);
- unix_shared_memory_queue_free (am->vl_input_queue);
+ svm_queue_free (am->vl_input_queue);
pthread_mutex_unlock (&am->vlib_rp->mutex);
svm_pop_heap (oldheap);
@@ -284,7 +265,7 @@ vl_client_disconnect (void)
{
vl_api_memclnt_delete_t *mp;
vl_api_memclnt_delete_reply_t *rp;
- unix_shared_memory_queue_t *vl_input_queue;
+ svm_queue_t *vl_input_queue;
vl_shmem_hdr_t *shmem_hdr;
time_t begin;
api_main_t *am = &api_main;
@@ -323,7 +304,7 @@ vl_client_disconnect (void)
am->shmem_hdr = 0;
break;
}
- if (unix_shared_memory_queue_sub (vl_input_queue, (u8 *) & rp, 1) < 0)
+ if (svm_queue_sub (vl_input_queue, (u8 *) & rp, 1) < 0)
continue;
/* drain the queue */
@@ -365,7 +346,6 @@ _(MEMCLNT_CREATE_REPLY, memclnt_create_reply) \
_(MEMCLNT_DELETE_REPLY, memclnt_delete_reply) \
_(MEMCLNT_KEEPALIVE, memclnt_keepalive)
-
void
vl_client_install_client_message_handlers (void)
{