aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/ioam/lib-trace/trace_test.c
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-12-09 14:25:09 +0100
committerPaul Vinciguerra <pvinci@vinciconsulting.com>2019-12-10 04:11:04 +0000
commit0fa66d618e7d839782a896f75bc8b0337cc2a2b8 (patch)
tree9a9b8593063d59dbf66cc6d09914df072c6663e6 /src/plugins/ioam/lib-trace/trace_test.c
parent668605fc873a6409f38df712106f4b1290d87648 (diff)
ioam: use explicit api types
Also remove API boilerplate. Type: fix Signed-off-by: Ole Troan <ot@cisco.com> Change-Id: I62e795f5af3843af7912707ade4ba178ff326942
Diffstat (limited to 'src/plugins/ioam/lib-trace/trace_test.c')
-rw-r--r--src/plugins/ioam/lib-trace/trace_test.c124
1 files changed, 6 insertions, 118 deletions
diff --git a/src/plugins/ioam/lib-trace/trace_test.c b/src/plugins/ioam/lib-trace/trace_test.c
index 89814783455..d1f9db41f12 100644
--- a/src/plugins/ioam/lib-trace/trace_test.c
+++ b/src/plugins/ioam/lib-trace/trace_test.c
@@ -31,15 +31,6 @@
#include <ioam/lib-trace/trace.api_enum.h>
#include <ioam/lib-trace/trace.api_types.h>
-#define vl_endianfun /* define message structures */
-#define vl_printfun
-#define vl_api_version(n,v) static u32 api_version=(v);
-#define vl_print(handle, ...)
-#include <ioam/lib-trace/trace.api.h>
-#undef vl_endianfun
-#undef vl_printfun
-#undef vl_api_version
-
typedef struct
{
/* API message ID base */
@@ -49,62 +40,6 @@ typedef struct
trace_test_main_t trace_test_main;
-#define foreach_standard_reply_retval_handler \
-_(trace_profile_add_reply) \
-_(trace_profile_del_reply)
-
-#define foreach_custom_reply_handler \
-_(trace_profile_show_config_reply, \
- if(mp->trace_type) \
- { \
- errmsg(" Trace Type : 0x%x (%d)\n",mp->trace_type, mp->trace_type); \
- errmsg(" Trace timestamp precision : %d \n",mp->trace_tsp); \
- errmsg(" Node Id : 0x%x (%d)\n",htonl(mp->node_id), htonl(mp->node_id)); \
- errmsg(" App Data : 0x%x (%d)\n",htonl(mp->app_data), htonl(mp->app_data)); \
- } \
- else errmsg("No valid trace profile configuration found\n");)
-#define _(n) \
- static void vl_api_##n##_t_handler \
- (vl_api_##n##_t * mp) \
- { \
- vat_main_t * vam = trace_test_main.vat_main; \
- i32 retval = ntohl(mp->retval); \
- if (vam->async_mode) { \
- vam->async_errors += (retval < 0); \
- } else { \
- vam->retval = retval; \
- vam->result_ready = 1; \
- } \
- }
-foreach_standard_reply_retval_handler;
-#undef _
-
-#define _(n,body) \
- static void vl_api_##n##_t_handler \
- (vl_api_##n##_t * mp) \
- { \
- vat_main_t * vam = trace_test_main.vat_main; \
- i32 retval = ntohl(mp->retval); \
- if (vam->async_mode) { \
- vam->async_errors += (retval < 0); \
- } else { \
- vam->retval = retval; \
- vam->result_ready = 1; \
- } \
- if(retval>=0)do{body;} while(0); \
- else errmsg("Error, retval: %d",retval); \
- }
-foreach_custom_reply_handler;
-#undef _
-/*
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-#define foreach_vpe_api_reply_msg \
-_(TRACE_PROFILE_ADD_REPLY, trace_profile_add_reply) \
-_(TRACE_PROFILE_DEL_REPLY, trace_profile_del_reply) \
-_(TRACE_PROFILE_SHOW_CONFIG_REPLY, trace_profile_show_config_reply)
-
static int
api_trace_profile_add (vat_main_t * vam)
{
@@ -174,62 +109,15 @@ api_trace_profile_show_config (vat_main_t * vam)
return ret;
}
-/*
- * List of messages that the api test plugin sends,
- * and that the data plane plugin processes
- */
-#define foreach_vpe_api_msg \
-_(trace_profile_add, ""\
- "trace-type <0x1f|0x3|0x9|0x11|0x19> trace-elts <nn> trace-tsp <0|1|2|3> node-id <node id in hex> app-data <app_data in hex>") \
-_(trace_profile_del, "[id <nn>]") \
-_(trace_profile_show_config, "[id <nn>]")
-
-
-static void
-ioam_trace_vat_api_hookup (vat_main_t * vam)
+static int
+vl_api_trace_profile_show_config_reply_t_handler (vat_main_t * vam)
{
- trace_test_main_t *sm = &trace_test_main;
- /* Hook up handlers for replies from the data plane plug-in */
-#define _(N,n) \
- vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base), \
- #n, \
- vl_api_##n##_t_handler, \
- vl_noop_handler, \
- vl_api_##n##_t_endian, \
- vl_api_##n##_t_print, \
- sizeof(vl_api_##n##_t), 1);
- foreach_vpe_api_reply_msg;
-#undef _
-
- /* API messages we can send */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
- foreach_vpe_api_msg;
-#undef _
-
- /* Help strings */
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
- foreach_vpe_api_msg;
-#undef _
+ return -1;
}
-clib_error_t *
-trace_vat_plugin_register (vat_main_t * vam)
-{
- trace_test_main_t *sm = &trace_test_main;
- u8 *name;
-
- sm->vat_main = vam;
-
- name = format (0, "ioam_trace_%08x%c", api_version, 0);
- sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
-
- if (sm->msg_id_base != (u16) ~ 0)
- ioam_trace_vat_api_hookup (vam);
-
- vec_free (name);
-
- return 0;
-}
+/* Override generated plugin register symbol */
+#define vat_plugin_register trace_vat_plugin_register
+#include <ioam/lib-trace/trace.api_test.c>
/*
* fd.io coding-style-patch-verification: ON