summaryrefslogtreecommitdiffstats
path: root/src/plugins/ioam/lib-trace/trace_api.c
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-10-08 11:35:23 +0200
committerNeale Ranns <nranns@cisco.com>2019-10-09 07:53:10 +0000
commitab96454e3aba8e60094e773a39e9d28f50d7192e (patch)
treec78289d57c16992ec340b1c64da61ddf51abc726 /src/plugins/ioam/lib-trace/trace_api.c
parentb126ebcf421830e739e74a532e35351f1a5fe2c1 (diff)
ioam: remove api boilerplate
Note: The VAT _test.c plugins need some more adjustments. Type: refactor Change-Id: Ifa150683d7d68db7950f66ef85eea73c8281ba14 Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/plugins/ioam/lib-trace/trace_api.c')
-rw-r--r--src/plugins/ioam/lib-trace/trace_api.c81
1 files changed, 5 insertions, 76 deletions
diff --git a/src/plugins/ioam/lib-trace/trace_api.c b/src/plugins/ioam/lib-trace/trace_api.c
index f74d4e7f43b..fbabc6d7243 100644
--- a/src/plugins/ioam/lib-trace/trace_api.c
+++ b/src/plugins/ioam/lib-trace/trace_api.c
@@ -27,37 +27,9 @@
#include <vlibapi/api.h>
#include <vlibmemory/api.h>
-
/* define message IDs */
-#include <ioam/lib-trace/trace_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_api_version
-
-/* List of message types that this plugin understands */
-
-#define foreach_trace_plugin_api_msg \
-_(TRACE_PROFILE_ADD, trace_profile_add) \
-_(TRACE_PROFILE_DEL, trace_profile_del) \
-_(TRACE_PROFILE_SHOW_CONFIG, trace_profile_show_config)
+#include <ioam/lib-trace/trace.api_enum.h>
+#include <ioam/lib-trace/trace.api_types.h>
static void vl_api_trace_profile_add_t_handler
(vl_api_trace_profile_add_t * mp)
@@ -122,44 +94,11 @@ static void vl_api_trace_profile_show_config_t_handler
}
}
-/* Set up the API message handling tables */
-static clib_error_t *
-trace_plugin_api_hookup (vlib_main_t * vm)
-{
- trace_main_t *sm = &trace_main;
-#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_trace_plugin_api_msg;
-#undef _
-
- return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (trace_main_t * sm, api_main_t * am)
-{
-#define _(id,n,crc) \
- vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
- foreach_vl_msg_name_crc_trace;
-#undef _
-}
-
+#include <ioam/lib-trace/trace.api.c>
static clib_error_t *
trace_init (vlib_main_t * vm)
{
trace_main_t *sm = &trace_main;
- clib_error_t *error = 0;
- u8 *name;
bzero (sm, sizeof (trace_main));
(void) trace_util_init ();
@@ -167,20 +106,10 @@ trace_init (vlib_main_t * vm)
sm->vlib_main = vm;
sm->vnet_main = vnet_get_main ();
- name = format (0, "ioam_trace_%08x%c", api_version, 0);
-
/* Ask for a correctly-sized block of API message decode slots */
- sm->msg_id_base = vl_msg_api_get_msg_ids
- ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
- error = trace_plugin_api_hookup (vm);
-
- /* Add our API messages to the global name_crc hash table */
- setup_message_id_table (sm, &api_main);
+ sm->msg_id_base = setup_message_id_table ();
- vec_free (name);
-
- return error;
+ return 0;
}
VLIB_INIT_FUNCTION (trace_init);