interface: send proper link/admin status in event

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

diff --git a/src/vlibmemory/memory_client.c b/src/vlibmemory/memory_client.c
index 383d742..25c01f1 100644 (file)
--- a/src/vlibmemory/memory_client.c
+++ b/src/vlibmemory/memory_client.c
@@ -63,7 +63,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 +70,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 +81,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
@@ -413,6 +394,7 @@ connect_to_vlib_internal (const char *svm_name,
 {
   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)))
     {
@@ -434,7 +416,14 @@ connect_to_vlib_internal (const char *svm_name,
       rv = pthread_create (&mm->rx_thread_handle,
                           NULL /*attr */ , rx_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;