commit dc15be2ca7c51772b00e4c5548934a35aa7e4add
author Klement Sekera <ksekera@cisco.com> Mon Jun 12 06:49:33 2017 +0200
committer Neale Ranns <nranns@cisco.com> Tue Sep 19 20:06:08 2017 +0000
tree ba4b707b73d21d3875264248a3affa93249816d3
parent 9d063047eb1a3738cb0fc9ebebb55793d155bb20

Add C++ API

Change-Id: Iff634f22d43470e2dc028387b3816257fd7b4156
Signed-off-by: Klement Sekera <ksekera@cisco.com>

src/vpp-api/vapi/vapi.c

diff --git a/src/vpp-api/vapi/vapi.c b/src/vpp-api/vapi/vapi.c
index b9c81a1..59415e0 100644
--- a/src/vpp-api/vapi/vapi.c
+++ b/src/vpp-api/vapi/vapi.c
@@ -102,7 +102,7 @@
   return (ctx->requests_count == ctx->requests_size);
 }
 
-static bool
+bool
 vapi_requests_empty (vapi_ctx_t ctx)
 {
   return (0 == ctx->requests_count);
@@ -229,6 +229,16 @@
   vl_msg_api_free (msg);
 }
 
+vapi_msg_id_t
+vapi_lookup_vapi_msg_id_t (vapi_ctx_t ctx, u16 vl_msg_id)
+{
+  if (vl_msg_id <= ctx->vl_msg_id_max)
+    {
+      return ctx->vl_msg_id_to_vapi_msg_t[vl_msg_id];
+    }
+  return ~0;
+}
+
 vapi_error_e
 vapi_ctx_alloc (vapi_ctx_t * result)
 {
@@ -420,16 +430,17 @@
       vapi_msg_id_t id = ctx->vl_msg_id_to_vapi_msg_t[msgid];
       if (id < __vapi_metadata.count)
 	{
-	  VAPI_DBG ("send msg %u[%s]", msgid, __vapi_metadata.msgs[id]->name);
+	  VAPI_DBG ("send msg@%p:%u[%s]", msg, msgid,
+		    __vapi_metadata.msgs[id]->name);
 	}
       else
 	{
-	  VAPI_DBG ("send msg %u[UNKNOWN]", msgid);
+	  VAPI_DBG ("send msg@%p:%u[UNKNOWN]", msg, msgid);
 	}
     }
   else
     {
-      VAPI_DBG ("send msg %u[UNKNOWN]", msgid);
+      VAPI_DBG ("send msg@%p:%u[UNKNOWN]", msg, msgid);
     }
 #endif
   tmp = unix_shared_memory_queue_add (q, (u8 *) & msg,
@@ -522,7 +533,26 @@
 	}
       *msg = (u8 *) data;
       *msg_size = ntohl (msgbuf->data_len);
-      VAPI_DBG ("recv msg %p", *msg);
+#if VAPI_DEBUG
+      unsigned msgid = be16toh (*(u16 *) * msg);
+      if (msgid <= ctx->vl_msg_id_max)
+	{
+	  vapi_msg_id_t id = ctx->vl_msg_id_to_vapi_msg_t[msgid];
+	  if (id < __vapi_metadata.count)
+	    {
+	      VAPI_DBG ("recv msg@%p:%u[%s]", *msg, msgid,
+			__vapi_metadata.msgs[id]->name);
+	    }
+	  else
+	    {
+	      VAPI_DBG ("recv msg@%p:%u[UNKNOWN]", *msg, msgid);
+	    }
+	}
+      else
+	{
+	  VAPI_DBG ("recv msg@%p:%u[UNKNOWN]", *msg, msgid);
+	}
+#endif
     }
   else
     {
@@ -534,7 +564,6 @@
 vapi_error_e
 vapi_wait (vapi_ctx_t ctx, vapi_wait_mode_e mode)
 {
-  /* FIXME */
   return VAPI_ENOTSUP;
 }
 
@@ -657,7 +686,7 @@
   return VAPI_OK;
 }
 
-static bool
+bool
 vapi_msg_is_with_context (vapi_msg_id_t id)
 {
   assert (id <= __vapi_metadata.count);
@@ -785,10 +814,6 @@
   return (VAPI_MODE_NONBLOCKING == ctx->mode);
 }
 
-bool vapi_requests_full (vapi_ctx_t ctx);
-
-size_t vapi_get_request_count (vapi_ctx_t ctx);
-
 size_t
 vapi_get_max_request_count (vapi_ctx_t ctx)
 {
@@ -886,6 +911,18 @@
   return VAPI_OK;
 }
 
+size_t
+vapi_get_message_count ()
+{
+  return __vapi_metadata.count;
+}
+
+const char *
+vapi_get_msg_name (vapi_msg_id_t id)
+{
+  return __vapi_metadata.msgs[id]->name;
+}
+
 /*
  * fd.io coding-style-patch-verification: ON
  *