From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id D9BB5A0096 for ; Wed, 8 May 2019 04:03:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D223D2BB8; Wed, 8 May 2019 04:03:12 +0200 (CEST) Received: from tama50.ecl.ntt.co.jp (tama50.ecl.ntt.co.jp [129.60.39.147]) by dpdk.org (Postfix) with ESMTP id B7DD91F28 for ; Wed, 8 May 2019 04:03:10 +0200 (CEST) Received: from vc1.ecl.ntt.co.jp (vc1.ecl.ntt.co.jp [129.60.86.153]) by tama50.ecl.ntt.co.jp (8.13.8/8.13.8) with ESMTP id x48239WZ016057; Wed, 8 May 2019 11:03:09 +0900 Received: from vc1.ecl.ntt.co.jp (localhost [127.0.0.1]) by vc1.ecl.ntt.co.jp (Postfix) with ESMTP id 4F6CBEA702A; Wed, 8 May 2019 11:03:09 +0900 (JST) Received: from localhost.localdomain (lobster.nslab.ecl.ntt.co.jp [129.60.13.95]) by vc1.ecl.ntt.co.jp (Postfix) with ESMTP id 3AE4EEA7089; Wed, 8 May 2019 11:03:09 +0900 (JST) From: ogawa.yasufumi@lab.ntt.co.jp To: spp@dpdk.org, ferruh.yigit@intel.com, ogawa.yasufumi@lab.ntt.co.jp Date: Wed, 8 May 2019 11:00:53 +0900 Message-Id: <1557280853-7872-3-git-send-email-ogawa.yasufumi@lab.ntt.co.jp> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1557280853-7872-1-git-send-email-ogawa.yasufumi@lab.ntt.co.jp> References: <1557280853-7872-1-git-send-email-ogawa.yasufumi@lab.ntt.co.jp> X-TM-AS-MML: disable Subject: [spp] [PATCH 2/2] spp_mirror: remove dependency from common libs X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spp-bounces@dpdk.org Sender: "spp" From: Yasufumi Ogawa 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 --- 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 #include +#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 #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