ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lacp: remove api boilerplate

Browse Source 
Type: refactor
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: I5b77da8e9c476bd784be087a53b2eafb2d1a4831
This commit is contained in:
Ole Troan
2019-09-27 14:14:38 +02:00
committed by Neale Ranns
parent 941185ae65
commit 4540b2f8cd
5 changed files with 8 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/lacp/CMakeLists.txt
-2
View File
@@ -35,8 +35,6 @@ add_vpp_plugin(lacp
mux_machine.h
ptx_machine.h
node.h
lacp_all_api_h.h
lacp_msg_enum.h
API_TEST_SOURCES
lacp_test.c
src/plugins/lacp/lacp_all_api_h.h
-18
View File
@@ -1,18 +0,0 @@
/*
* lacp_all_api_h.h - plug-in api #include file
*
* Copyright (c) <current-year> <your-organization>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* Include the generated file, see BUILT_SOURCES in Makefile.am */
#include <lacp/lacp.api.h>
src/plugins/lacp/lacp_api.c
+4 -79
View File
@@ -27,26 +27,11 @@
/* define message IDs */
#include <lacp/lacp_msg_enum.h>
#include <lacp/lacp.api_enum.h>
#include <lacp/lacp.api_types.h>
/* define message structures */
#define vl_typedefs
#include <lacp/lacp_all_api_h.h>
#undef vl_typedefs
/* define generated endian-swappers */
#define vl_endianfun
#include <lacp/lacp_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__)
/* Get the API version number */
#define vl_api_version(n,v) static u32 api_version=(v);
#include <lacp/lacp_all_api_h.h>
#undef vl_api_version
/* Macro to finish up custom dump fns */
#define FINISH \
vec_add1 (s, 0); \
@@ -57,9 +42,6 @@
#define REPLY_MSG_ID_BASE lm->msg_id_base
#include <vlibapi/api_helper_macros.h>
#define foreach_lacp_plugin_api_msg \
_(SW_INTERFACE_LACP_DUMP, sw_interface_lacp_dump)
static void
lacp_send_sw_interface_details (vl_api_registration_t * reg,
lacp_interface_details_t * lacp_if,
@@ -130,78 +112,21 @@ vl_api_sw_interface_lacp_dump_t_handler (vl_api_sw_interface_lacp_dump_t * mp)
vec_free (lacpifs);
}
static void *
vl_api_sw_interface_lacp_dump_t_print (vl_api_sw_interface_lacp_dump_t * mp,
void *handle)
{
u8 *s;
s = format (0, "SCRIPT: sw_interface_lacp_dump ");
FINISH;
}
#define vl_msg_name_crc_list
#include <lacp/lacp_all_api_h.h>
#undef vl_msg_name_crc_list
static void
setup_message_id_table (lacp_main_t * lm, api_main_t * am)
{
#define _(id,n,crc) \
vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + lm->msg_id_base);
foreach_vl_msg_name_crc_lacp;
#undef _
}
static void
plugin_custom_dump_configure (lacp_main_t * lm)
{
#define _(n,f) api_main.msg_print_handlers \
[VL_API_##n + lm->msg_id_base] \
= (void *) vl_api_##f##_t_print;
foreach_lacp_plugin_api_msg;
#undef _
}
/* Set up the API message handling tables */
#include <lacp/lacp.api.c>
clib_error_t *
lacp_plugin_api_hookup (vlib_main_t * vm)
{
lacp_main_t *lm = &lacp_main;
api_main_t *am = &api_main;
u8 *name;
/* Construct the API name */
name = format (0, "lacp_%08x%c", api_version, 0);
/* Ask for a correctly-sized block of API message decode slots */
lm->msg_id_base = vl_msg_api_get_msg_ids
((char *) name, VL_MSG_FIRST_AVAILABLE);
#define _(N,n) \
vl_msg_api_set_handlers((VL_API_##N + lm->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_lacp_plugin_api_msg;
#undef _
lm->msg_id_base = setup_message_id_table ();
/* Mark these APIs as mp safe */
am->is_mp_safe[VL_API_SW_INTERFACE_LACP_DUMP] = 1;
am->is_mp_safe[VL_API_SW_INTERFACE_LACP_DETAILS] = 1;
/*
* Set up the (msg_name, crc, message-id) table
*/
setup_message_id_table (lm, am);
plugin_custom_dump_configure (lm);
vec_free (name);
return 0;
}
src/plugins/lacp/lacp_msg_enum.h
-31
View File
@@ -1,31 +0,0 @@
/*
* lacp_msg_enum.h - vpp engine plug-in message enumeration
*
* Copyright (c) <current-year> <your-organization>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef included_lacp_msg_enum_h
#define included_lacp_msg_enum_h
#include <vppinfra/byte_order.h>
#define vl_msg_id(n,h) n,
typedef enum
{
#include <lacp/lacp_all_api_h.h>
/* We'll want to know how many messages IDs we need... */
VL_MSG_FIRST_AVAILABLE,
} vl_msg_id_t;
#undef vl_msg_id
#endif /* included_lacp_msg_enum_h */
src/plugins/lacp/lacp_test.c
+4 -99
View File
@@ -28,35 +28,9 @@
#include <vlibapi/vat_helper_macros.h>
/* declare message IDs */
#include <lacp/lacp_msg_enum.h>
/* Get CRC codes of the messages defined outside of this plugin */
#define vl_msg_name_crc_list
#include <vpp/api/vpe_all_api_h.h>
#undef vl_msg_name_crc_list
/* define message structures */
#define vl_typedefs
#include <vpp/api/vpe_all_api_h.h>
#include <lacp/lacp_all_api_h.h>
#undef vl_typedefs
/* declare message handlers for each api */
#define vl_endianfun /* define message structures */
#include <lacp/lacp_all_api_h.h>
#undef vl_endianfun
/* instantiate all the print functions we know about */
#define vl_print(handle, ...)
#define vl_printfun
#include <lacp/lacp_all_api_h.h>
#undef vl_printfun
/* Get the API version number. */
#define vl_api_version(n,v) static u32 api_version=(v);
#include <lacp/lacp_all_api_h.h>
#undef vl_api_version
#include <lacp/lacp.api_enum.h>
#include <lacp/lacp.api_types.h>
#include <vpp/api/vpe.api_types.h>
typedef struct
{
@@ -68,13 +42,6 @@ typedef struct
lacp_test_main_t lacp_test_main;
/*
* Table of message reply handlers, must include boilerplate handlers
* we just generated
*/
#define foreach_vpe_api_reply_msg \
_(SW_INTERFACE_LACP_DETAILS, sw_interface_lacp_details)
/* lacp-dump API */
static void vl_api_sw_interface_lacp_details_t_handler
(vl_api_sw_interface_lacp_details_t * mp)
@@ -160,69 +127,7 @@ api_sw_interface_lacp_dump (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 \
_(sw_interface_lacp_dump, "")
static void
lacp_vat_api_hookup (vat_main_t * vam)
{
lacp_test_main_t *lm __attribute__ ((unused)) = &lacp_test_main;
/* Hook up handlers for replies from the data plane plug-in */
#define _(N,n) \
vl_msg_api_set_handlers((VL_API_##N + lm->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 _
}
clib_error_t *
vat_plugin_register (vat_main_t * vam)
{
lacp_test_main_t *lm = &lacp_test_main;
u8 *name;
lm->vat_main = vam;
/* Ask the vpp engine for the first assigned message-id */
name = format (0, "lacp_%08x%c", api_version, 0);
lm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
vec_free (name);
if (lm->msg_id_base == (u16) ~ 0)
return clib_error_return (0, "lacp plugin not loaded...");
/* Get the control ping ID */
#define _(id,n,crc) \
const char *id ## _CRC __attribute__ ((unused)) = #n "_" #crc;
foreach_vl_msg_name_crc_vpe;
#undef _
lm->ping_id = vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC));
if (lm->msg_id_base != (u16) ~ 0)
lacp_vat_api_hookup (vam);
return 0;
}
#include <lacp/lacp.api_test.c>
/*
* fd.io coding-style-patch-verification: ON