Use RTE_LOG_LINE_PREFIX instead of RTE_LOG_LINE 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 <roret...@linux.microsoft.com>
---
lib/eventdev/eventdev_pmd.h | 10 ++++------
lib/eventdev/rte_event_timer_adapter.c | 5 ++---
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h
index c415624..2ad8802 100644
--- a/lib/eventdev/eventdev_pmd.h
+++ b/lib/eventdev/eventdev_pmd.h
@@ -36,15 +36,13 @@
/* Logging Macros */
#define RTE_EDEV_LOG_ERR(...) \
- RTE_LOG_LINE(ERR, EVENTDEV, \
- RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,), \
- __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,)))
+ RTE_LOG_LINE_PREFIX(ERR, EVENTDEV, \
+ "%s() line %u: ", __func__ RTE_LOG_COMMA __LINE__, __VA_ARGS__)
#ifdef RTE_LIBRTE_EVENTDEV_DEBUG
#define RTE_EDEV_LOG_DEBUG(...) \
- RTE_LOG_LINE(DEBUG, EVENTDEV, \
- RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,), \
- __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,)))
+ RTE_LOG_LINE_PREFIX(DEBUG, EVENTDEV, \
+ "%s() line %u: ", __func__ RTE_LOG_COMMA __LINE__, __VA_ARGS__)
#else
#define RTE_EDEV_LOG_DEBUG(...) (void)0
#endif
diff --git a/lib/eventdev/rte_event_timer_adapter.c
b/lib/eventdev/rte_event_timer_adapter.c
index e6d3492..a3c6fb7 100644
--- a/lib/eventdev/rte_event_timer_adapter.c
+++ b/lib/eventdev/rte_event_timer_adapter.c
@@ -41,9 +41,8 @@
static const struct event_timer_adapter_ops swtim_ops;
#define EVTIM_LOG(level, logtype, ...) \
- RTE_LOG_LINE(level, logtype, \
- RTE_FMT("EVTIMER: %s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,), \
- __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,)))
+ RTE_LOG_LINE_PREFIX(level, logtype, \
+ "EVTIMER: %s() line %u: ", __func__ RTE_LOG_COMMA __LINE__,
__VA_ARGS__)
#define EVTIM_LOG_ERR(...) EVTIM_LOG(ERR, EVTIM, __VA_ARGS__)
--
1.8.3.1
