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>

1 files changed, 0 insertions, 69 deletions

diff --git a/cicn-plugin/cicn/cicn_rte_mbuf.h b/cicn-plugin/cicn/cicn_rte_mbuf.h
deleted file mode 100644
index 43b14506..00000000
--- a/cicn-plugin/cicn/cicn_rte_mbuf.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- * 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.
- */
-/*
- * Part of cicn plugin's  dpdk/rte shim layer for using dpdk/rte mechanisms
- * directly while hiding that fact from the bulk of the cicn plugin coce.
- * - cicn plugin should not be looking at dpdk headers and should not need
- *    to. As of v17.01, howeverhowever, buffer cloning to support 0-copy on
- *    - content message replication
- *    - content message transmission based on CS hits
- *      is only available with dpdk, hence those mechanisms are used
- *      by cicn plugin.)
- * - when vlib_buffer cloning support is provided, this shim layer
- *   can be deprecated/deleted, and cicn plugin will be simpler and will
- *   be able to run with a vpp that does not include dpdk.
- * This is a shim file for including dpdk (rte) headers
- * - The purpose of this header shimming includes (in addition to
- *   cicn_rte_mbuf_inlines.h that has the relevant code) is that
- *    as of v17.01, including dpdk rte headers works poorly due to conflicts
- *   between dpdk headers and vpp headers.
- */
-#ifndef _CICN_RTE_MBUF_H_
-#define _CICN_RTE_MBUF_H_ 1
-
-#include "cicn_params.h"
-
-#if !CICN_VPP_PLUGIN
-#error "cicn-internal file included externally"
-#endif
-
-#if !CICN_FEATURE_VPP_VLIB_CLONING	// waiting for this API to cut over
-#include <rte_config.h>
-
-#include <rte_common.h>
-#include <rte_log.h>
-#include <rte_memory.h>
-#include <rte_memzone.h>
-#include <rte_tailq.h>
-#include <rte_eal.h>
-#include <rte_per_lcore.h>
-#include <rte_launch.h>
-#include <rte_atomic.h>
-#include <rte_cycles.h>
-#include <rte_prefetch.h>
-#include <rte_lcore.h>
-#include <rte_per_lcore.h>
-#include <rte_branch_prediction.h>
-#include <rte_interrupts.h>
-#include <rte_pci.h>
-#include <rte_random.h>
-#include <rte_debug.h>
-#include <rte_ether.h>
-#include <rte_ethdev.h>
-#include <rte_ring.h>
-#include <rte_mempool.h>
-#include <rte_mbuf.h>
-#endif // CICN_FEATURE_VPP_VLIB_CLONING
-#endif // _CICN_RTE_MBUF_H_