[spp] [PATCH 0/2] Remove depencency of spp_mirror from common lib

[spp] [PATCH 0/2] Remove depencency of spp_mirror from common lib

[ogawa.yasufumi]

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

As spp_vf, some of common libs depend on spp_mirror specific libs under
`src/mirror` and it should be cleaned. This series of patches is to
update spp_mirror and common functions for the purpose.

Yasufumi Ogawa (2):
  spp_mirror: add specific libs in shared dir
  spp_mirror: remove dependency from common libs

 src/mirror/spp_mirror.c                       | 11 +++--
 src/mirror/spp_mirror.h                       | 32 +--------------
 .../secondary/spp_worker_th/mirror_deps.h     | 40 +++++++++++++++++++
 src/shared/secondary/spp_worker_th/spp_proc.c |  5 +--
 4 files changed, 48 insertions(+), 40 deletions(-)
 create mode 100644 src/shared/secondary/spp_worker_th/mirror_deps.h

-- 
2.17.1

[spp] [PATCH 1/2] spp_mirror: add specific libs in shared dir

[ogawa.yasufumi]

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

This patch is same as previous oen for spp_vf.

Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
 .../secondary/spp_worker_th/mirror_deps.h     | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 src/shared/secondary/spp_worker_th/mirror_deps.h

diff --git a/src/shared/secondary/spp_worker_th/mirror_deps.h b/src/shared/secondary/spp_worker_th/mirror_deps.h
new file mode 100644
index 0000000..31d64b7
--- /dev/null
+++ b/src/shared/secondary/spp_worker_th/mirror_deps.h
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2019 Nippon Telegraph and Telephone Corporation
+ */
+
+#ifndef __SPP_WORKER_TH_MIRROR_DEPS_H__
+#define __SPP_WORKER_TH_MIRROR_DEPS_H__
+
+#include "spp_proc.h"
+
+/**
+ * Update Mirror info
+ *
+ * @param component
+ *  The pointer to struct spp_component_info.@n
+ *  The data for updating the internal data of mirror.
+ *
+ * @retval SPP_RET_OK succeeded.
+ * @retval SPP_RET_NG failed.
+ */
+int spp_mirror_update(struct spp_component_info *component);
+
+/**
+ * Mirror get component status
+ *
+ * @param lcore_id
+ *  The logical core ID for forwarder and merger.
+ * @param id
+ *  The unique component ID.
+ * @param params
+ *  The pointer to struct spp_iterate_core_params.@n
+ *  Detailed data of mirror status.
+ *
+ * @retval SPP_RET_OK succeeded.
+ * @retval SPP_RET_NG failed.
+ */
+int spp_mirror_get_component_status(
+		unsigned int lcore_id, int id,
+		struct spp_iterate_core_params *params);
+
+#endif  /* __SPP_WORKER_TH_MIRROR_DEPS_H__ */
-- 
2.17.1

[spp] [PATCH 2/2] spp_mirror: remove dependency from common libs

[ogawa.yasufumi]

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

Some of functions in `src/shared` depend on spp_mirror's functions
under `src/mirror`. This update is to resolve the dependency for cleanup
codes for maintainance.

Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
 src/mirror/spp_mirror.c                       | 11 +++----
 src/mirror/spp_mirror.h                       | 32 ++-----------------
 src/shared/secondary/spp_worker_th/spp_proc.c |  5 +--
 3 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/src/mirror/spp_mirror.c b/src/mirror/spp_mirror.c
index 4835d55..ba0919a 100644
--- a/src/mirror/spp_mirror.c
+++ b/src/mirror/spp_mirror.c
@@ -9,14 +9,13 @@
 #include <rte_common.h>
 #include <rte_cycles.h>
 
+#include "shared/secondary/spp_worker_th/mirror_deps.h"
 #include "shared/common.h"
 #include "shared/secondary/utils.h"
-
-#include "spp_proc.h"
-#include "spp_mirror.h"
-#include "command_proc.h"
-#include "command_dec.h"
-#include "spp_port.h"
+#include "shared/secondary/spp_worker_th/command_proc.h"
+#include "shared/secondary/spp_worker_th/command_dec.h"
+#include "shared/secondary/spp_worker_th/spp_proc.h"
+#include "shared/secondary/spp_worker_th/spp_port.h"
 
 /* Declare global variables */
 #define RTE_LOGTYPE_MIRROR RTE_LOGTYPE_USER1
diff --git a/src/mirror/spp_mirror.h b/src/mirror/spp_mirror.h
index eec2537..17fa522 100644
--- a/src/mirror/spp_mirror.h
+++ b/src/mirror/spp_mirror.h
@@ -5,6 +5,8 @@
 #ifndef __SPP_MIRROR_H__
 #define __SPP_MIRROR_H__
 
+#include "shared/secondary/spp_worker_th/spp_proc.h"
+
 /**
  * @file
  * SPP_MIRROR main
@@ -21,34 +23,4 @@
  *  I do not do the deletion of the VLAN tag, the addition.
  */
 
-/**
- * Update Mirror info
- *
- * @param component
- *  The pointer to struct spp_component_info.@n
- *  The data for updating the internal data of mirror.
- *
- * @retval SPP_RET_OK succeeded.
- * @retval SPP_RET_NG failed.
- */
-int spp_mirror_update(struct spp_component_info *component);
-
-/**
- * Mirror get component status
- *
- * @param lcore_id
- *  The logical core ID for forwarder and merger.
- * @param id
- *  The unique component ID.
- * @param params
- *  The pointer to struct spp_iterate_core_params.@n
- *  Detailed data of mirror status.
- *
- * @retval SPP_RET_OK succeeded.
- * @retval SPP_RET_NG failed.
- */
-int spp_mirror_get_component_status(
-		unsigned int lcore_id, int id,
-		struct spp_iterate_core_params *params);
-
 #endif /* __SPP_MIRROR_H__ */
diff --git a/src/shared/secondary/spp_worker_th/spp_proc.c b/src/shared/secondary/spp_worker_th/spp_proc.c
index 8009527..1d39e89 100644
--- a/src/shared/secondary/spp_worker_th/spp_proc.c
+++ b/src/shared/secondary/spp_worker_th/spp_proc.c
@@ -12,16 +12,13 @@
 #include <rte_branch_prediction.h>
 
 #include "vf_deps.h"
+#include "mirror_deps.h"
 #include "spp_proc.h"
 #include "spp_port.h"
 
 #include "shared/secondary/add_port.h"
 #include "shared/secondary/utils.h"
 
-#ifdef SPP_MIRROR_MODULE
-#include "../../mirror/spp_mirror.h"
-#endif /* SPP_MIRROR_MODULE */
-
 #define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1
 
 /* Manage data to addoress */
-- 
2.17.1