summaryrefslogtreecommitdiffstats
path: root/src/vlibmemory/memory_client.c
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2018-01-15 01:08:33 -0800
committerDave Barach <openvpp@barachs.net>2018-01-25 23:53:35 +0000
commitb384b543313b6b47a277c903e9d4fcd4343054fa (patch)
tree1996e3a25eb3a32fe5bbc405d75f38dd041a5a40 /src/vlibmemory/memory_client.c
parent4e578068fc3fe8ba176d211123ddd88962dab315 (diff)
session: add support for memfd segments
- update segment manager and session api to work with both flavors of ssvm segments - added generic ssvm slave/master init and del functions - cleanup/refactor tcp_echo - fixed uses of svm fifo pool as vector Change-Id: Ieee8b163faa407da6e77e657a2322de213a9d2a0 Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vlibmemory/memory_client.c')
-rw-r--r--src/vlibmemory/memory_client.c31
1 files changed, 24 insertions, 7 deletions
diff --git a/src/vlibmemory/memory_client.c b/src/vlibmemory/memory_client.c
index deb913b63e3..9f533019c87 100644
--- a/src/vlibmemory/memory_client.c
+++ b/src/vlibmemory/memory_client.c
@@ -190,8 +190,8 @@ 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 =
- svm_queue_init (input_queue_size, sizeof (uword), getpid (), 0);
+ vl_input_queue = svm_queue_init (input_queue_size, sizeof (uword),
+ getpid (), 0);
pthread_mutex_unlock (&svm->mutex);
svm_pop_heap (oldheap);
@@ -289,7 +289,6 @@ vl_client_disconnect (void)
* Have to be careful here, in case the client is disconnecting
* because e.g. the vlib process died, or is unresponsive.
*/
-
begin = time (0);
while (1)
{
@@ -362,7 +361,6 @@ vl_client_install_client_message_handlers (void)
#undef _
}
-
int
vl_client_api_map (const char *region_name)
{
@@ -381,6 +379,12 @@ vl_client_api_unmap (void)
vl_unmap_shmem ();
}
+u8
+vl_mem_client_is_connected (void)
+{
+ return (memory_client_main.connected_to_vlib != 0);
+}
+
static int
connect_to_vlib_internal (const char *svm_name,
const char *client_name,
@@ -444,8 +448,8 @@ vl_client_connect_to_vlib_no_map (const char *svm_name,
0 /* dont map */ );
}
-void
-vl_client_disconnect_from_vlib (void)
+static void
+disconnect_from_vlib_internal (u8 do_unmap)
{
memory_client_main_t *mm = &memory_client_main;
api_main_t *am = &api_main;
@@ -462,11 +466,24 @@ vl_client_disconnect_from_vlib (void)
if (mm->connected_to_vlib)
{
vl_client_disconnect ();
- vl_client_api_unmap ();
+ if (do_unmap)
+ vl_client_api_unmap ();
}
memset (mm, 0, sizeof (*mm));
}
+void
+vl_client_disconnect_from_vlib (void)
+{
+ disconnect_from_vlib_internal (1);
+}
+
+void
+vl_client_disconnect_from_vlib_no_unmap (void)
+{
+ disconnect_from_vlib_internal (0);
+}
+
static void vl_api_get_first_msg_id_reply_t_handler
(vl_api_get_first_msg_id_reply_t * mp)
{