[spp] [PATCH 0/2] Update spp_pcap for removed vf/common

[spp] [PATCH 0/2] Update spp_pcap for removed vf/common

[ogawa.yasufumi]

From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>

As `vf/common` is removed and common libs are moved to under
`src/shared`, update spp_pcap for the changes.

Yasufumi Ogawa (2):
  spp_pcap: update makefile for moved common files
  spp_pcap: update include paths

 src/pcap/Makefile       | 12 +++++++++---
 src/pcap/command_proc.c |  4 ++--
 src/pcap/spp_pcap.c     |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

-- 
2.17.1

[spp] [PATCH 1/2] spp_pcap: update makefile for moved common files

[ogawa.yasufumi]

From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>

As common files are moved from `src/vf/common`, update include and
source paths.

Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
 src/pcap/Makefile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/pcap/Makefile b/src/pcap/Makefile
index 199a8ff..a58b79a 100644
--- a/src/pcap/Makefile
+++ b/src/pcap/Makefile
@@ -11,19 +11,25 @@ include $(RTE_SDK)/mk/rte.vars.mk
 # binary name
 APP = spp_pcap
 
+SPP_WKT_DIR = ../shared/secondary/spp_worker_th
+
 # all source are stored in SRCS-y
 SRCS-y := spp_pcap.c
 SRCS-y += spp_proc.c
 SRCS-y += command_proc.c command_dec.c
 SRCS-y += ../shared/common.c
-SRCS-y += ../vf/common/command_conn.c ../vf/common/spp_port.c
-SRCS-y += ../vf/common/ringlatencystats.c ../vf/common/string_buffer.c
+SRCS-y += $(SPP_WKT_DIR)/command_conn.c
+SRCS-y += $(SPP_WKT_DIR)/spp_port.c
+SRCS-y += $(SPP_WKT_DIR)/ringlatencystats.c
+SRCS-y += $(SPP_WKT_DIR)/string_buffer.c
 
 CFLAGS += -DALLOW_EXPERIMENTAL_API
 CFLAGS += $(WERROR_FLAGS) -O3 -MMD
 CFLAGS += -I$(SRCDIR)/../
-CFLAGS += -I$(SRCDIR)/../vf/common
+CFLAGS += -I$(SRCDIR)/../$(SPP_WKT_DIR)
 CFLAGS += -I$(SRCDIR)/../shared
+
+# Optional Settings
 #CFLAGS += -DSPP_DEMONIZE
 #CFLAGS += -DSPP_RINGLATENCYSTATS_ENABLE
 
-- 
2.17.1

[spp] [PATCH 2/2] spp_pcap: update include paths

[ogawa.yasufumi]

From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>

As Makefile is updated for `vf/common` is removed, update include paths
of following files.

* src/pcap/command_proc.c
* src/pcap/spp_pcap.c

Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
 src/pcap/command_proc.c | 4 ++--
 src/pcap/spp_pcap.c     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pcap/command_proc.c b/src/pcap/command_proc.c
index 96218c0..2987cad 100644
--- a/src/pcap/command_proc.c
+++ b/src/pcap/command_proc.c
@@ -7,9 +7,9 @@
 
 #include <rte_log.h>
 
-#include "string_buffer.h"
+#include "shared/secondary/spp_worker_th/string_buffer.h"
 #include "spp_pcap.h"
-#include "command_conn.h"
+#include "shared/secondary/spp_worker_th/command_conn.h"
 #include "command_dec.h"
 #include "command_proc.h"
 
diff --git a/src/pcap/spp_pcap.c b/src/pcap/spp_pcap.c
index 1fb6c32..f8f3f79 100644
--- a/src/pcap/spp_pcap.c
+++ b/src/pcap/spp_pcap.c
@@ -17,7 +17,7 @@
 #include "spp_pcap.h"
 #include "command_proc.h"
 #include "command_dec.h"
-#include "spp_port.h"
+#include "shared/secondary/spp_worker_th/spp_port.h"
 
 /* Declare global variables */
 #define RTE_LOGTYPE_SPP_PCAP RTE_LOGTYPE_USER2
-- 
2.17.1