From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by dpdk.org (Postfix) with ESMTP id B70342C5 for ; Thu, 18 May 2017 11:40:59 +0200 (CEST) Received: by mail-wm0-f42.google.com with SMTP id 70so39874922wmq.1 for ; Thu, 18 May 2017 02:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=I3tZf8rKAcJFsnJFFnySGcKh8WSAMkbymKI6x9XUtGQ=; b=SoITQCC83zeSWXOpN187gq91Ln3qlW1CkNOXwaDTfuCkUkQiH/Mcuc3xacPpIxCXmi f7SAUEjkUlBkPi8427gbKsugYq7zYTQaQ6pibmR0UPF0pnU4SbhMGdwDgW2lTlmy1Dd1 aeriwQJFEA6m2cVQ9e9XjMImxB41K59u5zXR5ON5KMPjV3P8uUBWZS5NZzminGTuaLb4 vA//CJoQ2lLDm84frleXPC3+0Cqr/zOMzPOmbYV4W8fUl2CM4UI9ntLWPkitcoftbZWd 9UODb51qIqrQ4TPv+ikEf76DRdr7k01z34yK8tSycSlhuX64Py40oYiXycydoH5gJsus eBCw== 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=I3tZf8rKAcJFsnJFFnySGcKh8WSAMkbymKI6x9XUtGQ=; b=cMEA+LjLzq1eJ0Om4NBezj/0isLro0+mQgtDgeD04hx2j7pTh7C2h6PUywq+8vXQzi DznbNJcXHB5x546chr7GospMVKDqD2788pH3Q7voJRcssd7uIl/5L33nM9dREzSAbZBD pXBR2bKdmk5ws2j9cJEV3Uuq73wu4Tu1cq4jhIa4MVwQCGIp0Og9EOLqsekZCcV6Anci ryUytpr2szURDo5mZYbWZM6RAjlFBQy91OCQZa9qVJu1ql4QE0WuGrtfR1X+/OG8a/pY ZD1kOjCoL6Tq8dHuykohK/zjWHjaGo4Yu5gogyZjvDxVplKvOV4py9oWTX7DdJGJ/vx5 2PRA== X-Gm-Message-State: AODbwcDVnq+lo/5lSTbEO6WKBJp2dy9fhwHq9alwQWvj3x46HKl+/cs/ qQSMfeNpDz7PLRh+LGs= X-Received: by 10.28.31.16 with SMTP id f16mr13423755wmf.118.1495100459390; Thu, 18 May 2017 02:40:59 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id a73sm6204653wrc.58.2017.05.18.02.40.58 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 18 May 2017 02:40:58 -0700 (PDT) From: Adrien Mazarguil To: stable@dpdk.org Date: Thu, 18 May 2017 11:40:46 +0200 Message-Id: <1495100446-5345-1-git-send-email-adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 Subject: [dpdk-stable] [PATCH] eal: fix debug macro redefinition X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 May 2017 09:41:01 -0000 [ backported from upstream commit 37aa3a47a296dc17caca1f637afaf4d8f3a065bc ] The RTE_FUNC_*_RET() and RTE_PROC_*_RET() macro definitions in rte_dev.h require RTE_PMD_DEBUG_TRACE(). This macro is defined as needed by users of rte_dev.h since its value depends on their own debug settings. It may be defined multiple times as a result when including files from various components simultaneously. Worse, these redefinitions may be inconsistent. This causes the following compilation errors: In file included from /tmp/check-includes.sh.13890.c:27:0: build/include/rte_eventdev_pmd.h:58:0: error: "RTE_PMD_DEBUG_TRACE" redefined [-Werror] [...] In file included from build/include/rte_ethdev_pci.h:39:0, from /tmp/check-includes.sh.13890.c:13: build/include/rte_ethdev.h:1042:0: note: this is the location of the previous definition [...] In file included from /tmp/check-includes.sh.13890.c:83:0: build/include/rte_cryptodev_pmd.h:65:0: error: "RTE_PMD_DEBUG_TRACE" redefined [-Werror] [...] In file included from /tmp/check-includes.sh.13890.c:27:0: build/include/rte_eventdev_pmd.h:58:0: note: this is the location of the previous definition [...] This commit moves the RTE_PMD_DEBUG_TRACE() definition to rte_dev.h where it is enabled consistently depending on global configuration settings and removes redundant definitions. Also when disabled, RTE_PMD_DEBUG_TRACE() is now defined as (void)0 to avoid empty statements warnings if used outside { } blocks. Fixes: b974e4a40cb5 ("ethdev: make error checking macros public") Signed-off-by: Adrien Mazarguil --- lib/librte_cryptodev/rte_cryptodev_pmd.h | 8 -------- lib/librte_eal/common/include/rte_dev.h | 14 ++++++++++++++ lib/librte_ether/rte_ethdev.h | 9 --------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/librte_cryptodev/rte_cryptodev_pmd.h index c6a5794..e82dcf0 100644 --- a/lib/librte_cryptodev/rte_cryptodev_pmd.h +++ b/lib/librte_cryptodev/rte_cryptodev_pmd.h @@ -57,14 +57,6 @@ extern "C" { #include "rte_crypto.h" #include "rte_cryptodev.h" - -#ifdef RTE_LIBRTE_CRYPTODEV_DEBUG -#define RTE_PMD_DEBUG_TRACE(...) \ - rte_pmd_debug_trace(__func__, __VA_ARGS__) -#else -#define RTE_PMD_DEBUG_TRACE(...) -#endif - struct rte_cryptodev_session { RTE_STD_C11 struct { diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h index 8840380..dcf33d0 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -49,6 +49,7 @@ extern "C" { #include #include +#include #include __attribute__((format(printf, 2, 0))) @@ -70,6 +71,19 @@ rte_pmd_debug_trace(const char *func_name, const char *fmt, ...) rte_log(RTE_LOG_ERR, RTE_LOGTYPE_PMD, "%s: %s", func_name, buffer); } +/* + * Enable RTE_PMD_DEBUG_TRACE() when at least one component relying on the + * RTE_*_RET() macros defined below is compiled in debug mode. + */ +#if defined(RTE_LIBRTE_ETHDEV_DEBUG) || \ + defined(RTE_LIBRTE_CRYPTODEV_DEBUG) || \ + defined(RTE_LIBRTE_EVENTDEV_DEBUG) +#define RTE_PMD_DEBUG_TRACE(...) \ + rte_pmd_debug_trace(__func__, __VA_ARGS__) +#else +#define RTE_PMD_DEBUG_TRACE(...) (void)0 +#endif + /* Macros for checking for restricting functions to primary instance only */ #define RTE_PROC_PRIMARY_OR_ERR_RET(retval) do { \ if (rte_eal_process_type() != RTE_PROC_PRIMARY) { \ diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 9678179..11ec1fa 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1001,15 +1001,6 @@ struct rte_eth_dev_callback; /** @internal Structure to keep track of registered callbacks */ TAILQ_HEAD(rte_eth_dev_cb_list, rte_eth_dev_callback); - -#ifdef RTE_LIBRTE_ETHDEV_DEBUG -#define RTE_PMD_DEBUG_TRACE(...) \ - rte_pmd_debug_trace(__func__, __VA_ARGS__) -#else -#define RTE_PMD_DEBUG_TRACE(...) -#endif - - /* Macros to check for valid port */ #define RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, retval) do { \ if (!rte_eth_dev_is_valid_port(port_id)) { \ -- 2.1.4