Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/23919/?format=api
https://patches.dpdk.org/api/patches/23919/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/a5aecdc2d1e9e43c32fab748cf1196dbfb65efe7.1493208189.git.adrien.mazarguil@6wind.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<a5aecdc2d1e9e43c32fab748cf1196dbfb65efe7.1493208189.git.adrien.mazarguil@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/a5aecdc2d1e9e43c32fab748cf1196dbfb65efe7.1493208189.git.adrien.mazarguil@6wind.com", "date": "2017-04-26T12:07:22", "name": "[dpdk-dev,v3,14/14] eal: fix debug macro redefinition", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "2dcbef4175f8fc1ce0c364fe7f4eea5afd21e731", "submitter": { "id": 165, "url": "https://patches.dpdk.org/api/people/165/?format=api", "name": "Adrien Mazarguil", "email": "adrien.mazarguil@6wind.com" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/a5aecdc2d1e9e43c32fab748cf1196dbfb65efe7.1493208189.git.adrien.mazarguil@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/23919/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/23919/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 0EB73D0C9;\n\tWed, 26 Apr 2017 14:08:28 +0200 (CEST)", "from mail-wm0-f42.google.com (mail-wm0-f42.google.com\n\t[74.125.82.42]) by dpdk.org (Postfix) with ESMTP id D2FFF69D4\n\tfor <dev@dpdk.org>; Wed, 26 Apr 2017 14:07:50 +0200 (CEST)", "by mail-wm0-f42.google.com with SMTP id u65so48250225wmu.1\n\tfor <dev@dpdk.org>; Wed, 26 Apr 2017 05:07:50 -0700 (PDT)", "from 6wind.com (host.78.145.23.62.rev.coltfrance.com.\n\t[62.23.145.78]) by smtp.gmail.com with ESMTPSA id\n\t75sm8875680wmp.2.2017.04.26.05.07.49\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tWed, 26 Apr 2017 05:07:49 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=1Le+OGKYDe+XrfmFCJAWTrqPpEbS23ZB75f+KkaMZDs=;\n\tb=WqmphnacByeqRaL9FiC35W6ynGtlESsCbAuFIfs/0spilhIZ3r5ZPPElj5YsF8kOwz\n\tGFq3cFbmeGK2pqocSryRZld45KGAor2qq3tj+QBMS7ujYVYXLDZXSbnNHbtS/KgeXWEf\n\tN077Jz22mKFPmnSiYvdWB58Fdy6NflrD1ssHY16zBA9U6+phS9Z8YPh3yInYRfNwm7EJ\n\tPy8TrElK68q2Ds/zlgyiTwU1JQz7xRenSDT8Eo8vbUY3hKs73HQwbvkgRUkOfpRbjr/t\n\tTQeptJs9p+0+gEinA6Z8KlEJ/xTpQfKKUq6nBCxhA2JUgpog4j40SdknoUBtAG6m3o+k\n\tlPhg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=1Le+OGKYDe+XrfmFCJAWTrqPpEbS23ZB75f+KkaMZDs=;\n\tb=oCUAE+MrbZE1gIEIfcXE6epyWRES1aim8DjEiG3cap6Tp08E6i0XhDKnP1Y4P/tUrJ\n\t84hvffXcpm0R55GShGxOdS3D9H6433tmXgdTGnLqlud4p7yuwvnoo2t0sgUVnidba49I\n\tWAPnpq42ETS0FjRGiqnEI0C6ytsl5k9fMkI5pSsp0v9ZzoD9IYvr1tB7QBJIHBddO2GM\n\tb0UB7RWq72x7VAPESVMrVxmIyjAvesLftaodDnR4hcRaIY1sycfVnf++bzKxYHBv9Ir8\n\tKQxO0b168PGejs6xjkPAlaqcn4sfaNUhykRxVhPW+KqAqS2Eck1+wtid/bmodeCaoh5z\n\t+a3Q==", "X-Gm-Message-State": "AN3rC/6j6MMXz72YDjcSNLBzF0aw9i2sI+D08nKCQT2yG2CQaCdTGVBX\n\tdfvzvwibYMjUZtuiiR0=", "X-Received": "by 10.28.47.23 with SMTP id v23mr608959wmv.50.1493208470356;\n\tWed, 26 Apr 2017 05:07:50 -0700 (PDT)", "From": "Adrien Mazarguil <adrien.mazarguil@6wind.com>", "To": "dev@dpdk.org", "Cc": "stable@dpdk.org, Thomas Monjalon <thomas@monjalon.net>,\n\tDeclan Doherty <declan.doherty@intel.com>,\n\tJerin Jacob <jerin.jacob@caviumnetworks.com>", "Date": "Wed, 26 Apr 2017 14:07:22 +0200", "Message-Id": "<a5aecdc2d1e9e43c32fab748cf1196dbfb65efe7.1493208189.git.adrien.mazarguil@6wind.com>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<cover.1493208189.git.adrien.mazarguil@6wind.com>", "References": "<cover.1493108423.git.adrien.mazarguil@6wind.com>\n\t<cover.1493208189.git.adrien.mazarguil@6wind.com>", "Subject": "[dpdk-dev] [PATCH v3 14/14] eal: fix debug macro redefinition", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The RTE_FUNC_*_RET() and RTE_PROC_*_RET() macro definitions in rte_dev.h\nrequire RTE_PMD_DEBUG_TRACE(). This macro is defined as needed by users of\nrte_dev.h since its value depends on their own debug settings.\n\nIt may be defined multiple times as a result when including files from\nvarious components simultaneously. Worse, these redefinitions may be\ninconsistent. This causes the following compilation errors:\n\n In file included from /tmp/check-includes.sh.13890.c:27:0:\n build/include/rte_eventdev_pmd.h:58:0: error: \"RTE_PMD_DEBUG_TRACE\"\n redefined [-Werror]\n [...]\n In file included from build/include/rte_ethdev_pci.h:39:0,\n from /tmp/check-includes.sh.13890.c:13:\n build/include/rte_ethdev.h:1042:0: note: this is the location of the\n previous definition\n [...]\n In file included from /tmp/check-includes.sh.13890.c:83:0:\n build/include/rte_cryptodev_pmd.h:65:0: error: \"RTE_PMD_DEBUG_TRACE\"\n redefined [-Werror]\n [...]\n In file included from /tmp/check-includes.sh.13890.c:27:0:\n build/include/rte_eventdev_pmd.h:58:0: note: this is the location of\n the previous definition\n [...]\n\nThis commit moves the RTE_PMD_DEBUG_TRACE() definition to rte_dev.h where\nit is enabled consistently depending on global configuration settings and\nremoves redundant definitions.\n\nAlso when disabled, RTE_PMD_DEBUG_TRACE() is now defined as (void)0 to\navoid empty statements warnings if used outside { } blocks.\n\nFixes: b974e4a40cb5 (\"ethdev: make error checking macros public\")\n\nCc: stable@dpdk.org\nCc: Thomas Monjalon <thomas@monjalon.net>\nCc: Declan Doherty <declan.doherty@intel.com>\nCc: Jerin Jacob <jerin.jacob@caviumnetworks.com>\nSigned-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>\n---\n lib/librte_cryptodev/rte_cryptodev_pmd.h | 8 --------\n lib/librte_eal/common/include/rte_dev.h | 14 ++++++++++++++\n lib/librte_ether/rte_ethdev.h | 9 ---------\n lib/librte_eventdev/rte_eventdev_pmd.h | 7 -------\n 4 files changed, 14 insertions(+), 24 deletions(-)", "diff": "diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/librte_cryptodev/rte_cryptodev_pmd.h\nindex 356b9dc..17ef37c 100644\n--- a/lib/librte_cryptodev/rte_cryptodev_pmd.h\n+++ b/lib/librte_cryptodev/rte_cryptodev_pmd.h\n@@ -57,14 +57,6 @@ extern \"C\" {\n #include \"rte_crypto.h\"\n #include \"rte_cryptodev.h\"\n \n-\n-#ifdef RTE_LIBRTE_CRYPTODEV_DEBUG\n-#define RTE_PMD_DEBUG_TRACE(...) \\\n-\trte_pmd_debug_trace(__func__, __VA_ARGS__)\n-#else\n-#define RTE_PMD_DEBUG_TRACE(...)\n-#endif\n-\n struct rte_cryptodev_session {\n \tRTE_STD_C11\n \tstruct {\ndiff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h\nindex 67c2b0c..d18e6b8 100644\n--- a/lib/librte_eal/common/include/rte_dev.h\n+++ b/lib/librte_eal/common/include/rte_dev.h\n@@ -49,6 +49,7 @@ extern \"C\" {\n #include <stdio.h>\n #include <sys/queue.h>\n \n+#include <rte_config.h>\n #include <rte_log.h>\n \n __attribute__((format(printf, 2, 0)))\n@@ -70,6 +71,19 @@ rte_pmd_debug_trace(const char *func_name, const char *fmt, ...)\n \trte_log(RTE_LOG_ERR, RTE_LOGTYPE_PMD, \"%s: %s\", func_name, buffer);\n }\n \n+/*\n+ * Enable RTE_PMD_DEBUG_TRACE() when at least one component relying on the\n+ * RTE_*_RET() macros defined below is compiled in debug mode.\n+ */\n+#if defined(RTE_LIBRTE_ETHDEV_DEBUG) || \\\n+\tdefined(RTE_LIBRTE_CRYPTODEV_DEBUG) || \\\n+\tdefined(RTE_LIBRTE_EVENTDEV_DEBUG)\n+#define RTE_PMD_DEBUG_TRACE(...) \\\n+\trte_pmd_debug_trace(__func__, __VA_ARGS__)\n+#else\n+#define RTE_PMD_DEBUG_TRACE(...) (void)0\n+#endif\n+\n /* Macros for checking for restricting functions to primary instance only */\n #define RTE_PROC_PRIMARY_OR_ERR_RET(retval) do { \\\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY) { \\\ndiff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h\nindex e0f7ee5..5f1d663 100644\n--- a/lib/librte_ether/rte_ethdev.h\n+++ b/lib/librte_ether/rte_ethdev.h\n@@ -1034,15 +1034,6 @@ struct rte_eth_dev_callback;\n /** @internal Structure to keep track of registered callbacks */\n TAILQ_HEAD(rte_eth_dev_cb_list, rte_eth_dev_callback);\n \n-\n-#ifdef RTE_LIBRTE_ETHDEV_DEBUG\n-#define RTE_PMD_DEBUG_TRACE(...) \\\n-\trte_pmd_debug_trace(__func__, __VA_ARGS__)\n-#else\n-#define RTE_PMD_DEBUG_TRACE(...)\n-#endif\n-\n-\n /* Macros to check for valid port */\n #define RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, retval) do { \\\n \tif (!rte_eth_dev_is_valid_port(port_id)) { \\\ndiff --git a/lib/librte_eventdev/rte_eventdev_pmd.h b/lib/librte_eventdev/rte_eventdev_pmd.h\nindex 988018f..4005b3c 100644\n--- a/lib/librte_eventdev/rte_eventdev_pmd.h\n+++ b/lib/librte_eventdev/rte_eventdev_pmd.h\n@@ -54,13 +54,6 @@ extern \"C\" {\n \n #include \"rte_eventdev.h\"\n \n-#ifdef RTE_LIBRTE_EVENTDEV_DEBUG\n-#define RTE_PMD_DEBUG_TRACE(...) \\\n-\trte_pmd_debug_trace(__func__, __VA_ARGS__)\n-#else\n-#define RTE_PMD_DEBUG_TRACE(...)\n-#endif\n-\n /* Logging Macros */\n #define RTE_EDEV_LOG_ERR(...) \\\n \tRTE_LOG(ERR, EVENTDEV, \\\n", "prefixes": [ "dpdk-dev", "v3", "14/14" ] }{ "id": 23919, "url": "