From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 056E943BAB;
Thu, 29 Feb 2024 20:55:32 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 1681E43283;
Thu, 29 Feb 2024 20:54:34 +0100 (CET)
Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182])
by mails.dpdk.org (Postfix) with ESMTP id C9B3342FC9
for <dev@dpdk.org>; Thu, 29 Feb 2024 20:53:56 +0100 (CET)
Received: by linux.microsoft.com (Postfix, from userid 1086)
id A5A7720B74CD; Thu, 29 Feb 2024 11:53:55 -0800 (PST)
DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com A5A7720B74CD
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;
s=default; t=1709236435;
bh=MrGFv7MZvkyFECLtVJ+R9AVl8Zfr0Ty4KpLktsdslYs=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=RUOlFYz4LB9KQ3Jo8dYrcZEcs5dgbxaNQ/Wzf46bOXEuAWphbjL7DZ0ohK1Xa4oTt
3AjUY9BfRVmVg5xN6eZ6FeRxppqg2ZHnvmmmPrp8isG+Z3584w/0LZOwvOS9C5HiA8
EppjpDpl1BBwYm3qh5cQVBIipitST2kDm5LFCSAE=
From: Tyler Retzlaff <roretzla@linux.microsoft.com>
To: dev@dpdk.org
Cc: Anatoly Burakov <anatoly.burakov@intel.com>,
Ashish Gupta <ashish.gupta@marvell.com>, Chenbo Xia <chenbox@nvidia.com>,
Cristian Dumitrescu <cristian.dumitrescu@intel.com>,
David Hunt <david.hunt@intel.com>, Fan Zhang <fanzhang.oss@gmail.com>,
Hemant Agrawal <hemant.agrawal@nxp.com>,
Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>,
Jasvinder Singh <jasvinder.singh@intel.com>,
Jerin Jacob <jerinj@marvell.com>,
Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>,
Maxime Coquelin <maxime.coquelin@redhat.com>,
Reshma Pattan <reshma.pattan@intel.com>,
Sachin Saxena <sachin.saxena@nxp.com>,
Sivaprasad Tummala <sivaprasad.tummala@amd.com>,
Srikanth Yalavarthi <syalavarthi@marvell.com>,
Stephen Hemminger <stephen@networkplumber.org>,
Sunil Kumar Kori <skori@marvell.com>, bruce.richardson@intel.com,
mb@smartsharesystems.com, thomas@monjalon.net,
Tyler Retzlaff <roretzla@linux.microsoft.com>
Subject: [PATCH v4 13/22] eal: stop using variadic argument pack extension
Date: Thu, 29 Feb 2024 11:53:44 -0800
Message-Id: <1709236433-15428-14-git-send-email-roretzla@linux.microsoft.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1709236433-15428-1-git-send-email-roretzla@linux.microsoft.com>
References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com>
<1709236433-15428-1-git-send-email-roretzla@linux.microsoft.com>
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Use RTE_LOG_LINE_PREFIX instead of EAL_LOG in macro expansions
which allow a prefix and arguments to be inserted into the log line
without the need to use the ## args variadic argument pack extension.
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
lib/eal/common/eal_trace.h | 8 ++++----
lib/eal/windows/include/rte_windows.h | 5 ++---
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/lib/eal/common/eal_trace.h b/lib/eal/common/eal_trace.h
index bd082a0..5526267 100644
--- a/lib/eal/common/eal_trace.h
+++ b/lib/eal/common/eal_trace.h
@@ -16,11 +16,11 @@
#include "eal_private.h"
#include "eal_thread.h"
-#define trace_err(fmt, args...) \
- EAL_LOG(ERR, "%s():%u " fmt, __func__, __LINE__, ## args)
+#define trace_err(...) \
+ RTE_LOG_LINE_PREFIX(ERR, EAL, "%s():%u ", __func__ RTE_LOG_COMMA __LINE__, __VA_ARGS__)
-#define trace_crit(fmt, args...) \
- EAL_LOG(CRIT, "%s():%u " fmt, __func__, __LINE__, ## args)
+#define trace_crit(...) \
+ RTE_LOG_LINE_PREFIX(CRIT, EAL, "%s():%u ", __func__ RTE_LOG_COMMA __LINE__, __VA_ARGS__)
#define TRACE_CTF_MAGIC 0xC1FC1FC1
#define TRACE_MAX_ARGS 32
diff --git a/lib/eal/windows/include/rte_windows.h b/lib/eal/windows/include/rte_windows.h
index 0b0d117..feca6bb 100644
--- a/lib/eal/windows/include/rte_windows.h
+++ b/lib/eal/windows/include/rte_windows.h
@@ -48,9 +48,8 @@
* Log GetLastError() with context, usually a Win32 API function and arguments.
*/
#define RTE_LOG_WIN32_ERR(...) \
- RTE_LOG_LINE(DEBUG, EAL, RTE_FMT("GetLastError()=%lu: " \
- RTE_FMT_HEAD(__VA_ARGS__ ,), GetLastError(), \
- RTE_FMT_TAIL(__VA_ARGS__ ,)))
+ RTE_LOG_LINE_PREFIX(DEBUG, EAL,
+ "GetLastError()=%lu: " GetLastError(), __VA_ARGS__)
#ifdef __cplusplus
}
--
1.8.3.1