api: configurable binary api client rx pthread fcn

[vpp.git] / src / vlibmemory / memory_client.c

diff --git a/src/vlibmemory/memory_client.c b/src/vlibmemory/memory_client.c
index 3e1bdff..c61c3cb 100644 (file)
--- a/src/vlibmemory/memory_client.c
+++ b/src/vlibmemory/memory_client.c
@@ -44,17 +44,6 @@
 #include <vlibmemory/vl_memory_api_h.h>
 #undef vl_printfun
 
-typedef struct
-{
-  u8 rx_thread_jmpbuf_valid;
-  u8 connected_to_vlib;
-  jmp_buf rx_thread_jmpbuf;
-  pthread_t rx_thread_handle;
-  /* Plugin message base lookup scheme */
-  volatile u8 first_msg_id_reply_ready;
-  u16 first_msg_id_reply;
-} memory_client_main_t;
-
 memory_client_main_t memory_client_main;
 
 static void *
@@ -195,7 +184,7 @@ vl_client_connect (const char *name, int ctx_quota, int input_queue_size)
   mp->_vl_msg_id = ntohs (VL_API_MEMCLNT_CREATE);
   mp->ctx_quota = ctx_quota;
   mp->input_queue = (uword) vl_input_queue;
-  vl_api_to_api_string (strnlen_s (name, 64), name, &mp->name);
+  strncpy ((char *) mp->name, name, sizeof (mp->name) - 1);
 
   vl_msg_api_send_shmem (shmem_hdr->vl_input_queue, (u8 *) & mp);
 
@@ -390,10 +379,12 @@ vl_mem_client_is_connected (void)
 static int
 connect_to_vlib_internal (const char *svm_name,
                          const char *client_name,
-                         int rx_queue_size, int want_pthread, int do_map)
+                         int rx_queue_size, void *(*thread_fn) (void *),
+                         int do_map)
 {
   int rv = 0;
   memory_client_main_t *mm = &memory_client_main;
+  api_main_t *am = &api_main;
 
   if (do_map && (rv = vl_client_api_map (svm_name)))
     {
@@ -410,12 +401,19 @@ connect_to_vlib_internal (const char *svm_name,
 
   /* Start the rx queue thread */
 
-  if (want_pthread)
+  if (thread_fn)
     {
       rv = pthread_create (&mm->rx_thread_handle,
-                          NULL /*attr */ , rx_thread_fn, 0);
+                          NULL /*attr */ , thread_fn, 0);
       if (rv)
-       clib_warning ("pthread_create returned %d", rv);
+       {
+         clib_warning ("pthread_create returned %d", rv);
+         am->rx_thread_handle = 0;
+       }
+      else
+       {
+         am->rx_thread_handle = mm->rx_thread_handle;
+       }
     }
 
   mm->connected_to_vlib = 1;
@@ -427,8 +425,7 @@ vl_client_connect_to_vlib (const char *svm_name,
                           const char *client_name, int rx_queue_size)
 {
   return connect_to_vlib_internal (svm_name, client_name, rx_queue_size,
-                                  1 /* want pthread */ ,
-                                  1 /* do map */ );
+                                  rx_thread_fn, 1 /* do map */ );
 }
 
 int
@@ -437,7 +434,7 @@ vl_client_connect_to_vlib_no_rx_pthread (const char *svm_name,
                                         int rx_queue_size)
 {
   return connect_to_vlib_internal (svm_name, client_name, rx_queue_size,
-                                  0 /* want pthread */ ,
+                                  0 /* no rx_thread_fn */ ,
                                   1 /* do map */ );
 }
 
@@ -446,8 +443,7 @@ vl_client_connect_to_vlib_no_map (const char *svm_name,
                                  const char *client_name, int rx_queue_size)
 {
   return connect_to_vlib_internal (svm_name, client_name, rx_queue_size,
-                                  1 /* want pthread */ ,
-                                  0 /* dont map */ );
+                                  rx_thread_fn, 0 /* dont map */ );
 }
 
 int
@@ -460,6 +456,17 @@ vl_client_connect_to_vlib_no_rx_pthread_no_map (const char *svm_name,
                                   0 /* dont map */ );
 }
 
+int
+vl_client_connect_to_vlib_thread_fn (const char *svm_name,
+                                    const char *client_name,
+                                    int rx_queue_size,
+                                    void *(*thread_fn) (void *))
+{
+  return connect_to_vlib_internal (svm_name, client_name, rx_queue_size,
+                                  thread_fn, 1 /* do map */ );
+}
+
+
 static void
 disconnect_from_vlib_internal (u8 do_unmap)
 {
@@ -517,8 +524,7 @@ vl_client_get_first_plugin_msg_id (const char *plugin_name)
   clib_time_t clib_time;
   u16 rv = ~0;
 
-  size_t plugin_name_len = strnlen_s (plugin_name, 128);
-  if (plugin_name_len == 128)
+  if (strlen (plugin_name) + 1 > sizeof (mp->name))
     return (rv);
 
   clib_memset (&clib_time, 0, sizeof (clib_time));
@@ -539,7 +545,7 @@ vl_client_get_first_plugin_msg_id (const char *plugin_name)
       clib_memset (mp, 0, sizeof (*mp));
       mp->_vl_msg_id = ntohs (VL_API_GET_FIRST_MSG_ID);
       mp->client_index = am->my_client_index;
-      vl_api_to_api_string (plugin_name_len, plugin_name, &mp->name);
+      strncpy ((char *) mp->name, plugin_name, sizeof (mp->name) - 1);
 
       if (vl_socket_client_write () <= 0)
        goto sock_err;
@@ -564,7 +570,7 @@ vl_client_get_first_plugin_msg_id (const char *plugin_name)
       clib_memset (mp, 0, sizeof (*mp));
       mp->_vl_msg_id = ntohs (VL_API_GET_FIRST_MSG_ID);
       mp->client_index = am->my_client_index;
-      vl_api_to_api_string (plugin_name_len, plugin_name, &mp->name);
+      strncpy ((char *) mp->name, plugin_name, sizeof (mp->name) - 1);
 
       vl_msg_api_send_shmem (am->shmem_hdr->vl_input_queue, (u8 *) & mp);