X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibmemory%2Fmemory_client.c;h=c61c3cbdd5130babc38feababdd2fccd7848b88e;hb=920180e5e0722c78c258ff26476fd5efa434032d;hp=383d7428b72f07cc177362f117bbbb8c2d558e37;hpb=2e1c8967faf4e9f7b45471df02e4e5b07fbb520a;p=vpp.git

diff --git a/src/vlibmemory/memory_client.c b/src/vlibmemory/memory_client.c
index 383d7428b72..c61c3cbdd51 100644
--- 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 *
@@ -63,7 +52,6 @@ rx_thread_fn (void *arg)
   svm_queue_t *q;
   memory_client_main_t *mm = &memory_client_main;
   api_main_t *am = &api_main;
-  int i;
 
   q = am->vl_input_queue;
 
@@ -71,25 +59,7 @@ rx_thread_fn (void *arg)
   if (setjmp (mm->rx_thread_jmpbuf) == 0)
     {
       mm->rx_thread_jmpbuf_valid = 1;
-      /*
-       * Find an unused slot in the per-cpu-mheaps array,
-       * and grab it for this thread. We need to be able to
-       * push/pop the thread heap without affecting other thread(s).
-       */
-      if (__os_thread_index == 0)
-	{
-	  for (i = 0; i < ARRAY_LEN (clib_per_cpu_mheaps); i++)
-	    {
-	      if (clib_per_cpu_mheaps[i] == 0)
-		{
-		  /* Copy the main thread mheap pointer */
-		  clib_per_cpu_mheaps[i] = clib_per_cpu_mheaps[0];
-		  __os_thread_index = i;
-		  break;
-		}
-	    }
-	  ASSERT (__os_thread_index > 0);
-	}
+      clib_mem_set_thread_index ();
       while (1)
 	vl_msg_api_queue_handler (q);
     }
@@ -100,8 +70,8 @@ static void
 vl_api_rx_thread_exit_t_handler (vl_api_rx_thread_exit_t * mp)
 {
   memory_client_main_t *mm = &memory_client_main;
-  vl_msg_api_free (mp);
-  longjmp (mm->rx_thread_jmpbuf, 1);
+  if (mm->rx_thread_jmpbuf_valid)
+    longjmp (mm->rx_thread_jmpbuf, 1);
 }
 
 static void
@@ -409,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)))
     {
@@ -429,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;
@@ -446,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
@@ -456,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 */ );
 }
 
@@ -465,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
@@ -479,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)
 {