From: x-fn-spp@sl.ntt-tx.co.jp
To: ferruh.yigit@intel.com, ogawa.yasufumi@lab.ntt.co.jp
Cc: spp@dpdk.org
Subject: [spp] [PATCH 23/23] spp_vf: add SPP_VF_MODULE preprocessor directive
Date: Wed, 21 Nov 2018 10:35:58 +0900 [thread overview]
Message-ID: <201811210136.wAL1a26B009720@imss03.silk.ntt-tx.co.jp> (raw)
In-Reply-To: <20181121013558.8869-1-x-fn-spp@sl.ntt-tx.co.jp>
From: Hideyuki Yamashita <yamashita.hideyuki@po.ntt-tx.co.jp>
Add `SPP_VF_MODULE` preprocessor directive to compile just spp_vf in
selective.
Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@po.ntt-tx.co.jp>
Signed-off-by: Naoki Takada <takada.naoki@lab.ntt.co.jp>
---
src/vf/common/command_dec.c | 2 ++
src/vf/common/command_proc.c | 13 ++++++++++++-
src/vf/common/spp_proc.c | 4 ++++
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/vf/common/command_dec.c b/src/vf/common/command_dec.c
index 82cd619..84268de 100644
--- a/src/vf/common/command_dec.c
+++ b/src/vf/common/command_dec.c
@@ -186,6 +186,7 @@ spp_convert_port_to_iface(const char *port,
static enum spp_component_type
spp_convert_component_type(const char *type_str)
{
+#ifdef SPP_VF_MODULE
if (strncmp(type_str, CORE_TYPE_CLASSIFIER_MAC_STR,
strlen(CORE_TYPE_CLASSIFIER_MAC_STR)+1) == 0) {
/* Classifier */
@@ -199,6 +200,7 @@ spp_convert_component_type(const char *type_str)
/* Forwarder */
return SPP_COMPONENT_FORWARD;
}
+#endif /* SPP_VF_MODULE */
return SPP_COMPONENT_UNUSE;
}
diff --git a/src/vf/common/command_proc.c b/src/vf/common/command_proc.c
index 0c62968..f274707 100644
--- a/src/vf/common/command_proc.c
+++ b/src/vf/common/command_proc.c
@@ -10,8 +10,10 @@
#include "spp_port.h"
#include "string_buffer.h"
+#ifdef SPP_VF_MODULE
#include "../classifier_mac.h"
#include "../spp_forward.h"
+#endif /* SPP_VF_MODULE */
#include "command_conn.h"
#include "command_dec.h"
#include "command_proc.h"
@@ -467,6 +469,7 @@ spp_iterate_core_info(struct spp_iterate_core_params *params)
}
for (cnt = 0; cnt < core->num; cnt++) {
+#ifdef SPP_VF_MODULE
if (core->type == SPP_COMPONENT_CLASSIFIER_MAC) {
ret = spp_classifier_get_component_status(
lcore_id,
@@ -478,6 +481,7 @@ spp_iterate_core_info(struct spp_iterate_core_params *params)
core->id[cnt],
params);
}
+#endif /* SPP_VF_MODULE */
if (unlikely(ret != 0)) {
RTE_LOG(ERR, APP, "Cannot iterate core "
"information. "
@@ -492,6 +496,7 @@ spp_iterate_core_info(struct spp_iterate_core_params *params)
}
/* Iterate classifier_table to create response to status command */
+#ifdef SPP_VF_MODULE
static int
spp_iterate_classifier_table(
struct spp_iterate_classifier_table_params *params)
@@ -506,6 +511,7 @@ spp_iterate_classifier_table(
return SPP_RET_OK;
}
+#endif /* SPP_VF_MODULE */
/* Get port number assigned by DPDK lib */
static int
@@ -1119,6 +1125,7 @@ append_core_value(const char *name, char **output,
}
/* append one element of classifier table for JSON format */
+#ifdef SPP_VF_MODULE
static int
append_classifier_element_value(
struct spp_iterate_classifier_table_params *params,
@@ -1171,8 +1178,10 @@ append_classifier_element_value(
params->output = buff;
return ret;
}
+#endif /* SPP_VF_MODULE */
/* append a list of classifier table for JSON format */
+#ifdef SPP_VF_MODULE
static int
append_classifier_table_value(const char *name, char **output,
void *tmp __attribute__ ((unused)))
@@ -1200,7 +1209,7 @@ append_classifier_table_value(const char *name, char **output,
spp_strbuf_free(itr_params.output);
return ret;
}
-
+#endif /* SPP_VF_MODULE */
/* append string of command response list for JSON format */
static int
append_response_list_value(char **output,
@@ -1276,7 +1285,9 @@ struct command_response_list response_info_list[] = {
{ "vhost", append_interface_value },
{ "ring", append_interface_value },
{ "core", append_core_value },
+#ifdef SPP_VF_MODULE
{ "classifier_table", append_classifier_table_value },
+#endif /* SPP_VF_MODULE */
COMMAND_RESP_TAG_LIST_EMPTY
};
diff --git a/src/vf/common/spp_proc.c b/src/vf/common/spp_proc.c
index 87fb9d3..5119612 100644
--- a/src/vf/common/spp_proc.c
+++ b/src/vf/common/spp_proc.c
@@ -14,8 +14,10 @@
#include "spp_proc.h"
#include "spp_port.h"
+#ifdef SPP_VF_MODULE
#include "../spp_forward.h"
#include "../classifier_mac.h"
+#endif /* SPP_VF_MODULE */
/* Manage data to addoress */
struct manage_data_addr_info {
@@ -880,10 +882,12 @@ flush_component(void)
component_info = (p_component_info + cnt);
spp_port_ability_update(component_info);
+#ifdef SPP_VF_MODULE
if (component_info->type == SPP_COMPONENT_CLASSIFIER_MAC)
ret = spp_classifier_mac_update(component_info);
else
ret = spp_forward_update(component_info);
+#endif /* SPP_VF_MODULE */
if (unlikely(ret < 0)) {
RTE_LOG(ERR, APP, "Flush error. "
"( component = %s, type = %d)\n",
--
2.18.0
prev parent reply other threads:[~2018-11-21 1:41 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20181121013558.8869-1-x-fn-spp@sl.ntt-tx.co.jp>
2018-11-21 1:35 ` [spp] [PATCH 01/23] spp_vf: fix invalid code for max chars x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 02/23] spp_vf: move common source and header files x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 03/23] spp_vf: change include path x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 04/23] spp_vf: update Makefile for common files x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 05/23] spp_vf: move functions to common directory x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 06/23] spp_vf: move defines to common dir x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 07/23] spp_vf: move functions for decode " x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 08/23] spp_vf: move defines " x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 09/23] spp_vf: move functions to command_proc.c x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 10/23] spp_vf: add management data registration x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 11/23] spp_vf: change reference of management data x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 12/23] spp_vf: change return values to explain result x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 13/23] spp_vf: define terms of commands as consts x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 14/23] spp_vf: remove unnecessary includes x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 15/23] spp_vf: add include header files x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 16/23] spp_vf: update comments for header file x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 17/23] spp_vf: update makefile of spp_vf x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 18/23] spp_vf: add check num of ports before forwarding x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 19/23] spp_vf: add flag for classifier table x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 20/23] spp_vf: add checking the number of ports x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 21/23] spp_vf: add vlantag command check flag x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 22/23] spp_vf: simplify changing VLAN tag x-fn-spp
2018-11-21 1:35 ` x-fn-spp [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201811210136.wAL1a26B009720@imss03.silk.ntt-tx.co.jp \
--to=x-fn-spp@sl.ntt-tx.co.jp \
--cc=ferruh.yigit@intel.com \
--cc=ogawa.yasufumi@lab.ntt.co.jp \
--cc=spp@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).