X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibmemory%2Fmemory_client.h;h=a0168693a4b4c80edf2ea6fb3ecab931917e89e8;hb=b29d523af039ac007238300a7316ba9e3e44ce25;hp=7ec72538bc94948c127f3d7ea07436d92ce4a3f2;hpb=920180e5e0722c78c258ff26476fd5efa434032d;p=vpp.git

diff --git a/src/vlibmemory/memory_client.h b/src/vlibmemory/memory_client.h
index 7ec72538bc9..a0168693a4b 100644
--- a/src/vlibmemory/memory_client.h
+++ b/src/vlibmemory/memory_client.h
@@ -36,6 +36,7 @@ typedef struct
 } memory_client_main_t;
 
 extern memory_client_main_t memory_client_main;
+extern __thread memory_client_main_t *my_memory_client_main;
 
 int vl_client_connect (const char *name, int ctx_quota, int input_queue_size);
 void vl_client_send_disconnect (u8 do_cleanup);
@@ -49,7 +50,7 @@ int vl_client_connect_to_vlib (const char *svm_name, const char *client_name,
 int vl_client_connect_to_vlib_thread_fn (const char *svm_name,
 					 const char *client_name,
 					 int rx_queue_size,
-					 void *(*)(void *));
+					 void *(*)(void *), void *);
 int vl_client_connect_to_vlib_no_rx_pthread (const char *svm_name,
 					     const char *client_name,
 					     int rx_queue_size);
@@ -62,6 +63,19 @@ int vl_client_connect_to_vlib_no_rx_pthread_no_map (const char *svm_name,
 void vl_client_install_client_message_handlers (void);
 u8 vl_mem_client_is_connected (void);
 
+always_inline memory_client_main_t *
+vlibapi_get_memory_client_main (void)
+{
+  ASSERT (my_memory_client_main);
+  return my_memory_client_main;
+}
+
+always_inline void
+vlibapi_set_memory_client_main (memory_client_main_t * mm)
+{
+  my_memory_client_main = mm;
+}
+
 #endif /* SRC_VLIBMEMORY_MEMORY_CLIENT_H_ */
 
 /*