From patchwork Thu Oct 26 10:47:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Iremonger, Bernard" X-Patchwork-Id: 30968 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7492C1BABD; Thu, 26 Oct 2017 12:47:38 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 2D9D41BAB6 for ; Thu, 26 Oct 2017 12:47:36 +0200 (CEST) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Oct 2017 03:47:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,434,1503385200"; d="scan'208";a="167343207" Received: from sivswdev01.ir.intel.com (HELO localhost.localdomain) ([10.237.217.45]) by fmsmga005.fm.intel.com with ESMTP; 26 Oct 2017 03:47:33 -0700 From: Bernard Iremonger To: dev@dpdk.org, jasvinder.singh@intel.com Cc: Bernard Iremonger Date: Thu, 26 Oct 2017 11:47:30 +0100 Message-Id: <1509014850-17368-1-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.0.7 Subject: [dpdk-dev] [PATCH] flow_classify: fix logging X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Set log_level to RTE_LOG_INFO. The RTE_LIBRTE_CLASSIFY_DEBUG macro has been removed from the config file, use the log_level instead. Fixes: be41ac2a330f ("flow_classify: introduce flow classify library") Signed-off-by: Bernard Iremonger Acked-by: Jasvinder Singh --- lib/librte_flow_classify/rte_flow_classify.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/librte_flow_classify/rte_flow_classify.c b/lib/librte_flow_classify/rte_flow_classify.c index f4a95d4..e6f4486 100644 --- a/lib/librte_flow_classify/rte_flow_classify.c +++ b/lib/librte_flow_classify/rte_flow_classify.c @@ -155,7 +155,7 @@ struct rte_flow_classify_rule { return ret; } -#ifdef RTE_LIBRTE_CLASSIFY_DEBUG + #define uint32_t_to_char(ip, a, b, c, d) do {\ *a = (unsigned char)(ip >> 24 & 0xff);\ *b = (unsigned char)(ip >> 16 & 0xff);\ @@ -216,7 +216,6 @@ struct rte_flow_classify_rule { key->field_value[DSTP_FIELD_IPV4].value.u16, key->field_value[DSTP_FIELD_IPV4].mask_range.u16); } -#endif static int rte_flow_classifier_check_params(struct rte_flow_classifier_params *params) @@ -418,6 +417,7 @@ struct rte_flow_classifier * allocate_acl_ipv4_5tuple_rule(void) { struct rte_flow_classify_rule *rule; + int log_level; rule = malloc(sizeof(struct rte_flow_classify_rule)); if (!rule) @@ -467,18 +467,19 @@ struct rte_flow_classifier * rule->rules.u.ipv4_5tuple.dst_port_mask = ntuple_filter.dst_port_mask; rule->rules.u.ipv4_5tuple.dst_port = ntuple_filter.dst_port; -#ifdef RTE_LIBRTE_CLASSIFY_DEBUG - print_acl_ipv4_key_add(&rule->u.key.key_add); -#endif + log_level = rte_log_get_level(librte_flow_classify_logtype); + + if (log_level == RTE_LOG_DEBUG) + print_acl_ipv4_key_add(&rule->u.key.key_add); /* key delete values */ memcpy(&rule->u.key.key_del.field_value[PROTO_FIELD_IPV4], &rule->u.key.key_add.field_value[PROTO_FIELD_IPV4], NUM_FIELDS_IPV4 * sizeof(struct rte_acl_field)); -#ifdef RTE_LIBRTE_CLASSIFY_DEBUG - print_acl_ipv4_key_delete(&rule->u.key.key_del); -#endif + if (log_level == RTE_LOG_DEBUG) + print_acl_ipv4_key_delete(&rule->u.key.key_del); + return rule; } @@ -686,5 +687,5 @@ struct rte_flow_classify_rule * librte_flow_classify_logtype = rte_log_register("librte.flow_classify"); if (librte_flow_classify_logtype >= 0) - rte_log_set_level(librte_flow_classify_logtype, RTE_LOG_DEBUG); + rte_log_set_level(librte_flow_classify_logtype, RTE_LOG_INFO); }