Retire io threads and main-thread-io mode

Change-Id: I64f5ec5e32f200834c63ec3b304f9f20cef332a7
Signed-off-by: Damjan Marion <damarion@cisco.com>

1 files changed, 1 insertions, 12 deletions

diff --git a/vnet/vnet/devices/dpdk/dpdk.h b/vnet/vnet/devices/dpdk/dpdk.h
index 1e7d36846cd..ded9d2db709 100644
--- a/vnet/vnet/devices/dpdk/dpdk.h
+++ b/vnet/vnet/devices/dpdk/dpdk.h
@@ -67,7 +67,6 @@
 
 extern vnet_device_class_t dpdk_device_class;
 extern vlib_node_registration_t dpdk_input_node;
-extern vlib_node_registration_t dpdk_io_input_node;
 extern vlib_node_registration_t handoff_dispatch_node;
 
 typedef enum {
@@ -391,7 +390,7 @@ typedef struct {
   u32 ethernet_input_node_index;
 
   /* dpdk i/o thread initialization barrier */
-  volatile u32 io_thread_release;
+  volatile u32 worker_thread_release;
 
   /* pcap tracing [only works if (CLIB_DEBUG > 0)] */
   int tx_pcap_enable;
@@ -417,7 +416,6 @@ typedef struct {
    */
   u8 admin_up_down_in_progress;
 
-  u8 have_io_threads;
   u8 use_rss;
 
   /* which cpus are running dpdk-input */
@@ -479,13 +477,6 @@ clib_error_t * dpdk_set_mac_address (vnet_hw_interface_t * hi, char * address);
 clib_error_t * dpdk_set_mc_filter (vnet_hw_interface_t * hi,
                                    struct ether_addr mc_addr_vec[], int naddr);
 
-typedef void (*dpdk_io_thread_callback_t) (vlib_main_t *vm);
-
-void dpdk_io_thread (vlib_worker_thread_t * w,
-                     u32 instances,
-                     u32 instance_id,
-                     char *worker_name,
-                     dpdk_io_thread_callback_t callback);
 void dpdk_thread_input (dpdk_main_t * dm, dpdk_device_t * xd);
 
 clib_error_t * dpdk_port_setup (dpdk_main_t * dm, dpdk_device_t * xd);
@@ -607,8 +598,6 @@ u32 dpdk_get_admin_up_down_in_progress (void);
 
 u32 dpdk_num_mbufs (void);
 
-int dpdk_io_thread_release (void);
-
 dpdk_pmd_t dpdk_get_pmd_type (vnet_hw_interface_t *hi);
 
 i8 dpdk_get_cpu_socket (vnet_hw_interface_t *hi);