Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Improve L2FIB delete entry handling and "show l2fib" CLI options
[vpp.git]
/
src
/
vlibmemory
/
memory_client.c
diff --git
a/src/vlibmemory/memory_client.c
b/src/vlibmemory/memory_client.c
index
deb913b
..
9c8dcaa
100644
(file)
--- 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);
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);
pthread_mutex_unlock (&svm->mutex);
svm_pop_heap (oldheap);
@@
-261,7
+261,7
@@
vl_api_memclnt_delete_reply_t_handler (vl_api_memclnt_delete_reply_t * mp)
am->vl_input_queue = 0;
}
am->vl_input_queue = 0;
}
-void
+int
vl_client_disconnect (void)
{
vl_api_memclnt_delete_t *mp;
vl_client_disconnect (void)
{
vl_api_memclnt_delete_t *mp;
@@
-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.
*/
* 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)
{
begin = time (0);
while (1)
{
@@
-303,7
+302,7
@@
vl_client_disconnect (void)
am->my_client_index = ~0;
am->my_registration = 0;
am->shmem_hdr = 0;
am->my_client_index = ~0;
am->my_registration = 0;
am->shmem_hdr = 0;
-
break
;
+
return -1
;
}
if (svm_queue_sub (vl_input_queue, (u8 *) & rp, SVM_Q_NOWAIT, 0) < 0)
continue;
}
if (svm_queue_sub (vl_input_queue, (u8 *) & rp, SVM_Q_NOWAIT, 0) < 0)
continue;
@@
-318,6
+317,7
@@
vl_client_disconnect (void)
vl_msg_api_handler ((void *) rp);
break;
}
vl_msg_api_handler ((void *) rp);
break;
}
+ return 0;
}
/**
}
/**
@@
-362,7
+362,6
@@
vl_client_install_client_message_handlers (void)
#undef _
}
#undef _
}
-
int
vl_client_api_map (const char *region_name)
{
int
vl_client_api_map (const char *region_name)
{
@@
-378,7
+377,13
@@
vl_client_api_map (const char *region_name)
void
vl_client_api_unmap (void)
{
void
vl_client_api_unmap (void)
{
- vl_unmap_shmem ();
+ vl_unmap_shmem_client ();
+}
+
+u8
+vl_mem_client_is_connected (void)
+{
+ return (memory_client_main.connected_to_vlib != 0);
}
static int
}
static int
@@
-444,8
+449,8
@@
vl_client_connect_to_vlib_no_map (const char *svm_name,
0 /* dont map */ );
}
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;
{
memory_client_main_t *mm = &memory_client_main;
api_main_t *am = &api_main;
@@
-462,11
+467,24
@@
vl_client_disconnect_from_vlib (void)
if (mm->connected_to_vlib)
{
vl_client_disconnect ();
if (mm->connected_to_vlib)
{
vl_client_disconnect ();
- vl_client_api_unmap ();
+ if (do_unmap)
+ vl_client_api_unmap ();
}
memset (mm, 0, sizeof (*mm));
}
}
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)
{
static void vl_api_get_first_msg_id_reply_t_handler
(vl_api_get_first_msg_id_reply_t * mp)
{