vlib: deprecate i2c and cj

i2c follows its only use case - the original 82599 driver - into
extras/deprecated.

cj is/was an emergency debug tool unused in several years. Move to
extras/deprecated/vlib

Type: refactor

Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: Ib55b65373f62630db295c562974bd8f2456c3107

diff --git a/src/vlib/i2c.c b/extras/deprecated/vlib/i2c.c
similarity index 100%
rename from src/vlib/i2c.c
rename to extras/deprecated/vlib/i2c.c

diff --git a/src/vlib/i2c.h b/extras/deprecated/vlib/i2c.h
similarity index 100%
rename from src/vlib/i2c.h
rename to extras/deprecated/vlib/i2c.h

diff --git a/src/vlib/unix/cj.c b/extras/deprecated/vlib/unix/cj.c
similarity index 100%
rename from src/vlib/unix/cj.c
rename to extras/deprecated/vlib/unix/cj.c

diff --git a/src/vlib/unix/cj.h b/extras/deprecated/vlib/unix/cj.h
similarity index 100%
rename from src/vlib/unix/cj.h
rename to extras/deprecated/vlib/unix/cj.h

diff --git a/src/plugins/dpdk/device/common.c b/src/plugins/dpdk/device/common.c
index f91e3bf..41b32a6 100644 (file)
--- a/src/plugins/dpdk/device/common.c
+++ b/src/plugins/dpdk/device/common.c
@@ -16,7 +16,6 @@
 #include <vnet/vnet.h>
 #include <vppinfra/vec.h>
 #include <vppinfra/format.h>
-#include <vlib/unix/cj.h>
 #include <assert.h>
 
 #include <vnet/ip/ip.h>

diff --git a/src/plugins/dpdk/device/device.c b/src/plugins/dpdk/device/device.c
index c355edf..d6a001b 100644 (file)
--- a/src/plugins/dpdk/device/device.c
+++ b/src/plugins/dpdk/device/device.c
@@ -15,7 +15,6 @@
 #include <vnet/vnet.h>
 #include <vppinfra/vec.h>
 #include <vppinfra/format.h>
-#include <vlib/unix/cj.h>
 #include <assert.h>
 
 #include <vnet/ethernet/ethernet.h>

diff --git a/src/plugins/dpdk/device/flow.c b/src/plugins/dpdk/device/flow.c
index dd62ba5..279468f 100644 (file)
--- a/src/plugins/dpdk/device/flow.c
+++ b/src/plugins/dpdk/device/flow.c
@@ -16,7 +16,6 @@
 #include <vnet/vnet.h>
 #include <vppinfra/vec.h>
 #include <vppinfra/format.h>
-#include <vlib/unix/cj.h>
 #include <assert.h>
 
 #include <vnet/ip/ip.h>

diff --git a/src/plugins/dpdk/device/format.c b/src/plugins/dpdk/device/format.c
index 0eb2726..3d6e80f 100644 (file)
--- a/src/plugins/dpdk/device/format.c
+++ b/src/plugins/dpdk/device/format.c
@@ -15,7 +15,6 @@
 #include <vnet/vnet.h>
 #include <vppinfra/vec.h>
 #include <vppinfra/format.h>
-#include <vlib/unix/cj.h>
 #include <assert.h>
 
 #define __USE_GNU

diff --git a/src/vlib/CMakeLists.txt b/src/vlib/CMakeLists.txt
index 67d1f6d..0085f64 100644 (file)
--- a/src/vlib/CMakeLists.txt
+++ b/src/vlib/CMakeLists.txt
@@ -61,7 +61,6 @@ add_vpp_library(vlib
   error.c
   format.c
   handoff_trace.c
-  i2c.c
   init.c
   linux/pci.c
   linux/vfio.c
@@ -78,7 +77,6 @@ add_vpp_library(vlib
   threads.c
   threads_cli.c
   trace.c
-  unix/cj.c
   unix/cli.c
   unix/input.c
   unix/main.c
@@ -103,7 +101,6 @@ add_vpp_library(vlib
   error.h
   format_funcs.h
   global_funcs.h
-  i2c.h
   init.h
   linux/vfio.h
   log.h
@@ -119,7 +116,6 @@ add_vpp_library(vlib
   threads.h
   trace_funcs.h
   trace.h
-  unix/cj.h
   unix/mc_socket.h
   unix/plugin.h
   unix/unix.h

diff --git a/src/vlib/main.c b/src/vlib/main.c
index fb3eb10..c3ca8b1 100644 (file)
--- a/src/vlib/main.c
+++ b/src/vlib/main.c
@@ -44,9 +44,6 @@
 #include <vppinfra/tw_timer_1t_3w_1024sl_ov.h>
 
 #include <vlib/unix/unix.h>
-#include <vlib/unix/cj.h>
-
-CJ_GLOBAL_LOG_PROTOTYPE;
 
 /* Actually allocate a few extra slots of vector data to support
    speculative vector enqueues which overflow vector data in next frame. */

diff --git a/src/vlib/threads.c b/src/vlib/threads.c
index 8226379..2f141f1 100644 (file)
--- a/src/vlib/threads.c
+++ b/src/vlib/threads.c
@@ -22,13 +22,9 @@
 #include <vlib/vlib.h>
 
 #include <vlib/threads.h>
-#include <vlib/unix/cj.h>
 
 #include <vlib/stat_weak_inlines.h>
 
-DECLARE_CJ_GLOBAL_LOG;
-
-
 u32
 vl (void *p)
 {