aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-09-27 09:46:08 +0200
committerNeale Ranns <nranns@cisco.com>2019-09-27 09:05:55 +0000
commit83a49e12fdd26e8d395aa0e926d9ef12214c3310 (patch)
tree9d0774c384cfd2a82d670e99a59400a9ac642768
parent49228efce444d372140215c6364734683410c2b2 (diff)
http_static: remove api boilerplate
Type: refactor Signed-off-by: Ole Troan <ot@cisco.com> Change-Id: Ie1f0cccf0c9dc4c0d8ae1e1b5d8e6a75c325d1ce
-rw-r--r--src/plugins/http_static/CMakeLists.txt4
-rw-r--r--src/plugins/http_static/http_static.c75
-rw-r--r--src/plugins/http_static/http_static_all_api_h.h19
-rw-r--r--src/plugins/http_static/http_static_msg_enum.h31
-rw-r--r--src/plugins/http_static/http_static_test.c90
5 files changed, 8 insertions, 211 deletions
diff --git a/src/plugins/http_static/CMakeLists.txt b/src/plugins/http_static/CMakeLists.txt
index 5e0344cd858..f9ccb15beae 100644
--- a/src/plugins/http_static/CMakeLists.txt
+++ b/src/plugins/http_static/CMakeLists.txt
@@ -21,10 +21,6 @@ add_vpp_plugin(http_static
API_FILES
http_static.api
- INSTALL_HEADERS
- http_static_all_api_h.h
- http_static_msg_enum.h
-
API_TEST_SOURCES
http_static_test.c
)
diff --git a/src/plugins/http_static/http_static.c b/src/plugins/http_static/http_static.c
index 6000cf62219..48ae593718a 100644
--- a/src/plugins/http_static/http_static.c
+++ b/src/plugins/http_static/http_static.c
@@ -24,41 +24,18 @@
#include <vpp/app/version.h>
/* define message IDs */
-#include <http_static/http_static_msg_enum.h>
+#include <http_static/http_static.api_enum.h>
+#include <http_static/http_static.api_types.h>
#include <vpp/api/types.h>
-/* define message structures */
-#define vl_typedefs
-#include <http_static/http_static_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <http_static/http_static_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 <http_static/http_static_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <http_static/http_static_all_api_h.h>
-#undef vl_api_version
#define REPLY_MSG_ID_BASE hmp->msg_id_base
#include <vlibapi/api_helper_macros.h>
http_static_main_t http_static_main;
-/* List of message types that this plugin understands */
-
-#define foreach_http_static_plugin_api_msg \
-_(HTTP_STATIC_ENABLE, http_static_enable)
-
/* API message handler */
static void vl_api_http_static_enable_t_handler
(vl_api_http_static_enable_t * mp)
@@ -79,61 +56,19 @@ static void vl_api_http_static_enable_t_handler
REPLY_MACRO (VL_API_HTTP_STATIC_ENABLE_REPLY);
}
-/* Set up the API message handling tables */
-static clib_error_t *
-http_static_plugin_api_hookup (vlib_main_t * vm)
-{
- http_static_main_t *hmp = &http_static_main;
-#define _(N,n) \
- vl_msg_api_set_handlers((VL_API_##N + hmp->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_http_static_plugin_api_msg;
-#undef _
-
- return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <http_static/http_static_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (http_static_main_t * hmp, api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + hmp->msg_id_base);
- foreach_vl_msg_name_crc_http_static;
-#undef _
-}
-
+#include <http_static/http_static.api.c>
static clib_error_t *
http_static_init (vlib_main_t * vm)
{
http_static_main_t *hmp = &http_static_main;
- clib_error_t *error = 0;
- u8 *name;
hmp->vlib_main = vm;
hmp->vnet_main = vnet_get_main ();
- name = format (0, "http_static_%08x%c", api_version, 0);
-
/* Ask for a correctly-sized block of API message decode slots */
- hmp->msg_id_base = vl_msg_api_get_msg_ids
- ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
- error = http_static_plugin_api_hookup (vm);
-
- /* Add our API messages to the global name_crc hash table */
- setup_message_id_table (hmp, &api_main);
+ hmp->msg_id_base = setup_message_id_table ();
- vec_free (name);
-
- return error;
+ return 0;
}
VLIB_INIT_FUNCTION (http_static_init);
diff --git a/src/plugins/http_static/http_static_all_api_h.h b/src/plugins/http_static/http_static_all_api_h.h
deleted file mode 100644
index 8a02549f21b..00000000000
--- a/src/plugins/http_static/http_static_all_api_h.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/*
- * http_static_all_api_h.h - skeleton vpp engine 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 <http_static/http_static.api.h>
diff --git a/src/plugins/http_static/http_static_msg_enum.h b/src/plugins/http_static/http_static_msg_enum.h
deleted file mode 100644
index 3939b8ff6c5..00000000000
--- a/src/plugins/http_static/http_static_msg_enum.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-/*
- * http_static_msg_enum.h - skeleton 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_http_static_msg_enum_h
-#define included_http_static_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <http_static/http_static_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_http_static_msg_enum_h */
diff --git a/src/plugins/http_static/http_static_test.c b/src/plugins/http_static/http_static_test.c
index 545980b38dd..023d78a4f0d 100644
--- a/src/plugins/http_static/http_static_test.c
+++ b/src/plugins/http_static/http_static_test.c
@@ -22,30 +22,8 @@
uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
/* Declare message IDs */
-#include <http_static/http_static_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <http_static/http_static_all_api_h.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun /* define message structures */
-#include <http_static/http_static_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <http_static/http_static_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number. */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <http_static/http_static_all_api_h.h>
-#undef vl_api_version
-
+#include <http_static/http_static.api_enum.h>
+#include <http_static/http_static.api_types.h>
typedef struct
{
@@ -59,33 +37,6 @@ http_static_test_main_t http_static_test_main;
#define __plugin_msg_base http_static_test_main.msg_id_base
#include <vlibapi/vat_helper_macros.h>
-#define foreach_standard_reply_retval_handler \
-_(http_static_enable_reply)
-
-#define _(n) \
- static void vl_api_##n##_t_handler \
- (vl_api_##n##_t * mp) \
- { \
- vat_main_t * vam = http_static_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 _
-
-/*
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-#define foreach_vpe_api_reply_msg \
-_(HTTP_STATIC_ENABLE_REPLY, http_static_enable_reply)
-
-
static int
api_http_static_enable (vat_main_t * vam)
{
@@ -173,42 +124,7 @@ api_http_static_enable (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 \
-_(http_static_enable, "www-root <path> [prealloc-fios <nn>]\n" \
-"[private-segment-size <nnMG>] [fifo-size <nbytes>] [uri <uri>]\n")
-
-static void
-http_static_api_hookup (vat_main_t * vam)
-{
- http_static_test_main_t *htmp = &http_static_test_main;
- /* Hook up handlers for replies from the data plane plug-in */
-#define _(N,n) \
- vl_msg_api_set_handlers((VL_API_##N + htmp->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 _
-}
-
-VAT_PLUGIN_REGISTER (http_static);
+#include <http_static/http_static.api_test.c>
/*
* fd.io coding-style-patch-verification: ON