diff options
author | Jim Gibson <gibson+fdio@cisco.com> | 2017-06-01 15:30:03 -0400 |
---|---|---|
committer | Jim Gibson <gibson+fdio@cisco.com> | 2017-06-02 16:51:22 -0400 |
commit | 716eb01c0b25f7b5bd74e91ec3a1c8d51d402c00 (patch) | |
tree | 919b6c07dd9a4a9bf6c430e382efed18e9162916 /cicn-plugin/cicn/cicn_api_test.c | |
parent | 2c8098d53b946eec9526dbb5cb4086efb6fa3366 (diff) |
Update cicn-plugin for vpp v17.04 (from v17.01)Vpp-plugin-v17.04
1. Changes for cicn-plugin to build under v17.04:
- update build files to v17.04, including
- no longer need/want plugin to include dpdk headers (though
still link in dpdk plugin)
- vpp include changes
- relocation of vpe.api.h
- relocation of pneum.h
- for modprobe, replace igb_uio with uio_pci_generic
- vnet/ip/udp.h => vnet/udp/udp.h
- update cicn vpp plugin registration per vpp changes
- use new VLIB_PLUGIN_REGISTER() macro
- delete no-loger-supported vlib_plugin_register() function,
moving contents of latter to cicn_init
- remove sm->ethernet_main, which was not used and is no longer part of
plugin boilerplate.
- cicn_api_test_plugin.so (plugin for vpp_api_test)
- update per 17.04 updated requirements:
vat_api_hookup => cicn_vat_api_hookup
- buffering/cloning changes needed for building
- CICN_FEATURE_VPP_VLIB_CLONING hard-coded enabled and removed,
- CICN_FEATURE_DPDK_RTEMBUF_CLONING removed
- Small indentation updates from vpp checkstyle.sh
2. Updates for new vlib_buffer_attach_clone() API now exported by vpp
- remove code to manage rte_mbuf: cicn plugin now longer depends
on dpdk being present.
- remove use of indirect header for cloned cs entry: new scheme
supports having hdr buffer point directly to shared buffer rather
that requiring hdr buffer to poitn to indirect header that
points to cs buffer
- cicn_rte_mbuf_inlines.h replaced by much smaller cicn_infra_inlines.h
- report new characteristic of whether cloning replication is enabled
- "cicn show internal" (dbg cli), "cicn_api_node_params_get"
(vpp_api_test)
- update output accordingly
- cicn_show: other tweaks to output
3. In node.c, in code for dropping possibly multiple buffers
- delete ifdef'd-out code block for dropping using the drop node
[this codepath possibly had buffer problems.]
- retain code that instead drops by freeing buffers directly.
[this codepath has been robust with respect to buffer management]
Change-Id: I6e3d18153f52d8b94773332a39cc452873589baf
Signed-off-by: Jim Gibson <gibson+fdio@cisco.com>
Diffstat (limited to 'cicn-plugin/cicn/cicn_api_test.c')
-rw-r--r-- | cicn-plugin/cicn/cicn_api_test.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cicn-plugin/cicn/cicn_api_test.c b/cicn-plugin/cicn/cicn_api_test.c index 40b6fdec..d3896f3b 100644 --- a/cicn-plugin/cicn/cicn_api_test.c +++ b/cicn-plugin/cicn/cicn_api_test.c @@ -21,7 +21,7 @@ #include <vlibmemory/api.h> #include <vlibsocket/api.h> #include <vppinfra/error.h> -#include <vnet/ip/udp.h> +#include <vnet/udp/udp.h> #include <cicn/cicn_api.h> uword unformat_sw_if_index (unformat_input_t * input, va_list * args); @@ -252,16 +252,14 @@ static void fformat (vam->ofp, "Enabled %d\n" - " Features: multithreading:%d, cs:%d, dpdk-cloning:%d, " - "vlib-cloning:%d\n", + " Features: multithreading:%d, cs:%d, clone-replication:%d\n" " Workers %d, FIB size %d PIT size %d\n" " PIT lifetime dflt %.3f, min %.3f, max %.3f\n" " CS size %d\n", mp->is_enabled, mp->feature_multithread, mp->feature_cs, - mp->feature_dpdk_rtembuf_cloning, - mp->feature_vpp_vlib_cloning, + mp->feature_clone_replication, clib_net_to_host_u32 (mp->worker_count), clib_net_to_host_u32 (mp->fib_max_size), clib_net_to_host_u32 (mp->pit_max_size), @@ -1047,7 +1045,7 @@ _(cicn_api_face_events_subscribe, "enable|disable") \ _(cicn_api_test_run_get, "testsuite <ID>") void -vat_api_hookup (vat_main_t * vam) +cicn_vat_api_hookup (vat_main_t * vam) { cicn_test_main_t *sm = &cicn_test_main; /* Hook up handlers for replies from the data plane plug-in */ @@ -1086,7 +1084,7 @@ vat_plugin_register (vat_main_t * vam) sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name); if (sm->msg_id_base != (u16) ~ 0) - vat_api_hookup (vam); + cicn_vat_api_hookup (vam); vec_free (name); |