X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibapi%2Fapi_shared.c;h=65288d89f67a7e6d030605b5ff36eeefe92e043b;hb=0577ff1c39662f720450154fe409bdad16204c63;hp=fbaa9c9e01314b9e04ade60c1809755561d13a8a;hpb=7784140f2bd2d5ae44f2be1507ac25f102006155;p=vpp.git

diff --git a/src/vlibapi/api_shared.c b/src/vlibapi/api_shared.c
index fbaa9c9e013..65288d89f67 100644
--- a/src/vlibapi/api_shared.c
+++ b/src/vlibapi/api_shared.c
@@ -30,6 +30,7 @@
 #include <vlib/unix/unix.h>
 #include <vlibapi/api.h>
 #include <vppinfra/elog.h>
+#include <vppinfra/callback.h>
 
 /* *INDENT-OFF* */
 api_main_t api_global_main =
@@ -453,7 +454,7 @@ msg_handler_internal (api_main_t * am,
 	u32 c;
       } *ed;
       ed = ELOG_DATA (am->elog_main, e);
-      if (id < vec_len (am->msg_names))
+      if (id < vec_len (am->msg_names) && am->msg_names[id])
 	ed->c = elog_string (am->elog_main, (char *) am->msg_names[id]);
       else
 	ed->c = elog_string (am->elog_main, "BOGUS");
@@ -485,7 +486,23 @@ msg_handler_internal (api_main_t * am,
 	      vl_msg_api_barrier_trace_context (am->msg_names[id]);
 	      vl_msg_api_barrier_sync ();
 	    }
+
+	  if (am->is_autoendian[id])
+	    {
+	      void (*endian_fp) (void *);
+	      endian_fp = am->msg_endian_handlers[id];
+	      (*endian_fp) (the_msg);
+	    }
+
+	  if (PREDICT_FALSE (vec_len (am->perf_counter_cbs) != 0))
+	    clib_call_callbacks (am->perf_counter_cbs, am, id,
+				 0 /* before */ );
+
 	  (*am->msg_handlers[id]) (the_msg);
+
+	  if (PREDICT_FALSE (vec_len (am->perf_counter_cbs) != 0))
+	    clib_call_callbacks (am->perf_counter_cbs, am, id,
+				 1 /* after */ );
 	  if (!am->is_mp_safe[id])
 	    vl_msg_api_barrier_release ();
 	}
@@ -520,7 +537,7 @@ msg_handler_internal (api_main_t * am,
 	u32 c;
       } *ed;
       ed = ELOG_DATA (am->elog_main, e);
-      if (id < vec_len (am->msg_names))
+      if (id < vec_len (am->msg_names) && am->msg_names[id])
 	{
 	  ed->c = elog_string (am->elog_main, (char *) am->msg_names[id]);
 	  ed->barrier = !am->is_mp_safe[id];
@@ -562,7 +579,7 @@ vl_msg_api_handler_with_vm_node (api_main_t * am, svm_region_t * vlib_rp,
 	u32 c;
       } *ed;
       ed = ELOG_DATA (am->elog_main, e);
-      if (id < vec_len (am->msg_names))
+      if (id < vec_len (am->msg_names) && am->msg_names[id])
 	ed->c = elog_string (am->elog_main, (char *) am->msg_names[id]);
       else
 	ed->c = elog_string (am->elog_main, "BOGUS");
@@ -606,7 +623,19 @@ vl_msg_api_handler_with_vm_node (api_main_t * am, svm_region_t * vlib_rp,
       if (PREDICT_FALSE (vl_msg_api_fuzz_hook != 0))
 	(*vl_msg_api_fuzz_hook) (id, the_msg);
 
+      if (am->is_autoendian[id])
+	{
+	  void (*endian_fp) (void *);
+	  endian_fp = am->msg_endian_handlers[id];
+	  (*endian_fp) (the_msg);
+	}
+      if (PREDICT_FALSE (vec_len (am->perf_counter_cbs) != 0))
+	clib_call_callbacks (am->perf_counter_cbs, am, id, 0 /* before */ );
+
       (*handler) (the_msg, vm, node);
+
+      if (PREDICT_FALSE (vec_len (am->perf_counter_cbs) != 0))
+	clib_call_callbacks (am->perf_counter_cbs, am, id, 1 /* after */ );
       if (is_private)
 	{
 	  am->vlib_rp = old_vlib_rp;
@@ -624,8 +653,22 @@ vl_msg_api_handler_with_vm_node (api_main_t * am, svm_region_t * vlib_rp,
    * Special-case, so we can e.g. bounce messages off the vnet
    * main thread without copying them...
    */
-  if (!(am->message_bounce[id]))
-    vl_msg_api_free (the_msg);
+  if (id >= vec_len (am->message_bounce) || !(am->message_bounce[id]))
+    {
+      if (is_private)
+	{
+	  old_vlib_rp = am->vlib_rp;
+	  save_shmem_hdr = am->shmem_hdr;
+	  am->vlib_rp = vlib_rp;
+	  am->shmem_hdr = (void *) vlib_rp->user_ctx;
+	}
+      vl_msg_api_free (the_msg);
+      if (is_private)
+	{
+	  am->vlib_rp = old_vlib_rp;
+	  am->shmem_hdr = save_shmem_hdr;
+	}
+    }
 
   if (PREDICT_FALSE (am->elog_trace_api_messages))
     {
@@ -649,7 +692,7 @@ vl_msg_api_handler_with_vm_node (api_main_t * am, svm_region_t * vlib_rp,
 	u32 c;
       } *ed;
       ed = ELOG_DATA (am->elog_main, e);
-      if (id < vec_len (am->msg_names))
+      if (id < vec_len (am->msg_names) && am->msg_names[id])
 	ed->c = elog_string (am->elog_main, (char *) am->msg_names[id]);
       else
 	ed->c = elog_string (am->elog_main, "BOGUS");
@@ -772,7 +815,8 @@ _(msg_endian_handlers)                          \
 _(msg_print_handlers)                           \
 _(api_trace_cfg)				\
 _(message_bounce)				\
-_(is_mp_safe)
+_(is_mp_safe)					\
+_(is_autoendian)
 
 void
 vl_msg_api_config (vl_msg_api_msg_config_t * c)
@@ -813,6 +857,7 @@ vl_msg_api_config (vl_msg_api_msg_config_t * c)
   am->msg_print_handlers[c->id] = c->print;
   am->message_bounce[c->id] = c->message_bounce;
   am->is_mp_safe[c->id] = c->is_mp_safe;
+  am->is_autoendian[c->id] = c->is_autoendian;
 
   am->api_trace_cfg[c->id].size = c->size;
   am->api_trace_cfg[c->id].trace_enable = c->traced;
@@ -842,6 +887,7 @@ vl_msg_api_set_handlers (int id, char *name, void *handler, void *cleanup,
   c->replay = 1;
   c->message_bounce = 0;
   c->is_mp_safe = 0;
+  c->is_autoendian = 0;
   vl_msg_api_config (c);
 }