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 5B87AA046B for ; Mon, 24 Jun 2019 08:22:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5356A1BF48; Mon, 24 Jun 2019 08:22:33 +0200 (CEST) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by dpdk.org (Postfix) with ESMTP id 92EF31BF48 for ; Mon, 24 Jun 2019 08:22:31 +0200 (CEST) Received: by mail-pf1-f193.google.com with SMTP id t16so6875971pfe.11 for ; Sun, 23 Jun 2019 23:22:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=UnHseczSDLKcHAcLbJBrtJ9fOIqiX0dqW55DNkTMOoI=; b=k+/q3oY7xNLppv8cGdQ8pMCkGO2xfIeIQ2StyIvbNTE3m9NfiOmg9Rf0tX1QKwUZ+d g5D3wJufx9Y+uu6PMEkCojCSmoODe8JpDKSZZwNvLH4CNBbeohgDXwr6aSexn2IQEvrL yX/7S4Acmp5zNKeD6GJltkj0+Vc9HlZOTsKABzoNsA9aG3YSk2BZmYOKpGKwnADAAIu0 G715r/csQbsQdYsdY5uyoT7D3pFSGseTXuW4Fjs4XPBAl8jnkBTFsNz2WogbEUkbRVfB Pjh66ig6ex2BwasFqnd76gi3YF/EADgBrfGjHF99rjR4UWPuqYglKqSEQOH9n0e8QL0v XhYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=UnHseczSDLKcHAcLbJBrtJ9fOIqiX0dqW55DNkTMOoI=; b=HIQz84r7J4CkrIvQuGIVZ+r0fzl6GI8Wyzr0qRMorXJ/INzzyb+6tUf44aBRRCHsoD IhjGMJoBAviCQh7t22nIvm4blRCwuZxvTm9+/ut5cE27pBT62NGv7pRLBsnIzrheKLWY HMq/3dptJedZNEnk0HSZzWbxK7KszYlQkiLmG/hnDvdoJYSV+94u38z9AKCIQGq41f1E tsL+OJKYLGqR2OAmfRKbTxU9Dtz5hFu7VfnLXnK15xVGwLtTlGWk7zU61He2QskXxHuU LwbcBzn3DsVgvBMHGwKoPxL7bPZ2mWv54CKbjVHKgKQpnWRBFBC4akznYe8VIlJvixl/ Pg1w== X-Gm-Message-State: APjAAAX+1Im6ncNaamJeAXe6K85DA0D8Pc/BVSuj0Fy5xMr1Boyfl+1U K0ViiQWPIUZWPU8T4fJpSFyO5TFQ X-Google-Smtp-Source: APXvYqxP78fLI/cwx//qZYOb6G8wx/xevpQOomdGYIBrkbAMM6t+F9/A1FGYaD0C3985RDNqTRArmQ== X-Received: by 2002:a17:90a:d587:: with SMTP id v7mr23436721pju.28.1561357350762; Sun, 23 Jun 2019 23:22:30 -0700 (PDT) Received: from localhost.localdomain ([192.47.164.146]) by smtp.gmail.com with ESMTPSA id j1sm1126788pfa.73.2019.06.23.23.22.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Jun 2019 23:22:30 -0700 (PDT) From: yasufum.o@gmail.com To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Mon, 24 Jun 2019 15:22:25 +0900 Message-Id: <20190624062225.22666-1-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [spp] [PATCH] shared/sec: add ifdef switch for deps headers 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 This update is to switch `vf_deps.h` and `mirror_deps.h` in shared dir for compiling each of worker processes. Signed-off-by: Yasufumi Ogawa --- src/shared/secondary/spp_worker_th/cmd_parser.c | 8 +++++++- .../secondary/spp_worker_th/cmd_res_formatter.c | 8 +++++++- src/shared/secondary/spp_worker_th/cmd_runner.c | 14 ++++++++++---- src/shared/secondary/spp_worker_th/cmd_utils.c | 10 ++++++++-- src/shared/secondary/spp_worker_th/vf_deps.h | 1 + 5 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/shared/secondary/spp_worker_th/cmd_parser.c b/src/shared/secondary/spp_worker_th/cmd_parser.c index fcec28b..5a2fb82 100644 --- a/src/shared/secondary/spp_worker_th/cmd_parser.c +++ b/src/shared/secondary/spp_worker_th/cmd_parser.c @@ -10,9 +10,15 @@ #include #include "cmd_parser.h" +#include "shared/secondary/return_codes.h" + +#ifdef SPP_VF_MODULE #include "vf_deps.h" +#endif + +#ifdef SPP_MIRROR_MODULE #include "mirror_deps.h" -#include "shared/secondary/return_codes.h" +#endif #define RTE_LOGTYPE_WK_CMD_PARSER RTE_LOGTYPE_USER1 diff --git a/src/shared/secondary/spp_worker_th/cmd_res_formatter.c b/src/shared/secondary/spp_worker_th/cmd_res_formatter.c index bfe13e5..f389939 100644 --- a/src/shared/secondary/spp_worker_th/cmd_res_formatter.c +++ b/src/shared/secondary/spp_worker_th/cmd_res_formatter.c @@ -4,9 +4,15 @@ #include "cmd_res_formatter.h" #include "cmd_utils.h" +#include "shared/secondary/json_helper.h" + +#ifdef SPP_VF_MODULE #include "vf_deps.h" +#endif + +#ifdef SPP_MIRROR_MODULE #include "mirror_deps.h" -#include "shared/secondary/json_helper.h" +#endif #define RTE_LOGTYPE_WK_CMD_RES_FMT RTE_LOGTYPE_USER1 diff --git a/src/shared/secondary/spp_worker_th/cmd_runner.c b/src/shared/secondary/spp_worker_th/cmd_runner.c index 68436f3..3684a2c 100644 --- a/src/shared/secondary/spp_worker_th/cmd_runner.c +++ b/src/shared/secondary/spp_worker_th/cmd_runner.c @@ -9,14 +9,20 @@ #include #include "cmd_runner.h" -#include "vf_deps.h" -#include "mirror_deps.h" #include "spp_port.h" -#include "shared/secondary/string_buffer.h" -#include "shared/secondary/json_helper.h" #include "cmd_res_formatter.h" #include "conn_spp_ctl.h" #include "cmd_parser.h" +#include "shared/secondary/string_buffer.h" +#include "shared/secondary/json_helper.h" + +#ifdef SPP_VF_MODULE +#include "vf_deps.h" +#endif + +#ifdef SPP_MIRROR_MODULE +#include "mirror_deps.h" +#endif #define RTE_LOGTYPE_WK_CMD_RUNNER RTE_LOGTYPE_USER1 diff --git a/src/shared/secondary/spp_worker_th/cmd_utils.c b/src/shared/secondary/spp_worker_th/cmd_utils.c index 5a089c6..e61f59c 100644 --- a/src/shared/secondary/spp_worker_th/cmd_utils.c +++ b/src/shared/secondary/spp_worker_th/cmd_utils.c @@ -11,12 +11,18 @@ #include #include -#include "vf_deps.h" -#include "mirror_deps.h" #include "shared/secondary/return_codes.h" #include "cmd_utils.h" #include "spp_port.h" +#ifdef SPP_VF_MODULE +#include "vf_deps.h" +#endif + +#ifdef SPP_MIRROR_MODULE +#include "mirror_deps.h" +#endif + #include "shared/secondary/add_port.h" #include "shared/secondary/utils.h" diff --git a/src/shared/secondary/spp_worker_th/vf_deps.h b/src/shared/secondary/spp_worker_th/vf_deps.h index 81fc18f..7d77e87 100644 --- a/src/shared/secondary/spp_worker_th/vf_deps.h +++ b/src/shared/secondary/spp_worker_th/vf_deps.h @@ -101,4 +101,5 @@ int add_classifier_table_val( int update_comp_info(struct sppwk_comp_info *p_comp_info, int *p_change_comp); enum sppwk_worker_type get_comp_type_from_str(const char *type_str); + #endif /* _SPPWK_TH_VF_DEPS_H_ */ -- 2.17.1