@@ -4,5 +4,5 @@
extern int acl_logtype;
#define RTE_LOGTYPE_ACL acl_logtype
-#define ACL_LOG(level, fmt, ...) \
- RTE_LOG(level, ACL, fmt "\n", ## __VA_ARGS__)
+#define ACL_LOG(level, ...) \
+ RTE_LOG_LINE(level, ACL, "" __VA_ARGS__)
@@ -28,10 +28,11 @@
/* BBDev library logging ID */
RTE_LOG_REGISTER_DEFAULT(bbdev_logtype, NOTICE);
+#define RTE_LOGTYPE_BBDEV bbdev_logtype
/* Helper macro for logging */
-#define rte_bbdev_log(level, fmt, ...) \
- rte_log(RTE_LOG_ ## level, bbdev_logtype, fmt "\n", ##__VA_ARGS__)
+#define rte_bbdev_log(level, ...) \
+ RTE_LOG_LINE(level, BBDEV, "" __VA_ARGS__)
#define rte_bbdev_log_debug(fmt, ...) \
rte_bbdev_log(DEBUG, RTE_STR(__LINE__) ":%s() " fmt, __func__, \
@@ -30,7 +30,7 @@ extern int rte_bpf_logtype;
#define RTE_LOGTYPE_BPF rte_bpf_logtype
#define RTE_BPF_LOG_LINE(lvl, fmt, args...) \
- RTE_LOG(lvl, BPF, fmt "\n", ##args)
+ RTE_LOG_LINE(lvl, BPF, fmt, ##args)
static inline size_t
bpf_size(uint32_t bpf_op_sz)
@@ -29,10 +29,10 @@ struct rte_cfgfile {
/* Setting up dynamic logging 8< */
RTE_LOG_REGISTER_DEFAULT(cfgfile_logtype, INFO);
+#define RTE_LOGTYPE_CFGFILE cfgfile_logtype
#define CFG_LOG(level, fmt, args...) \
- rte_log(RTE_LOG_ ## level, cfgfile_logtype, "%s(): " fmt "\n", \
- __func__, ## args)
+ RTE_LOG_LINE(level, CFGFILE, "%s(): " fmt, __func__, ## args)
/* >8 End of setting up dynamic logging */
/** when we resize a file structure, how many extra entries
@@ -21,9 +21,10 @@ extern "C" {
/* Logging Macros */
extern int compressdev_logtype;
+#define RTE_LOGTYPE_COMPRESSDEV compressdev_logtype
+
#define COMPRESSDEV_LOG(level, fmt, args...) \
- rte_log(RTE_LOG_ ## level, compressdev_logtype, "%s(): " fmt "\n", \
- __func__, ##args)
+ RTE_LOG_LINE(level, COMPRESSDEV, "%s(): " fmt, __func__, ## args)
/**
* Dequeue processed packets from queue pair of a device.
@@ -36,24 +36,22 @@ extern int rte_cryptodev_logtype;
/* Logging Macros */
#define CDEV_LOG_ERR(...) \
- RTE_LOG(ERR, CRYPTODEV, \
- RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
- __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,)))
+ RTE_LOG_LINE(ERR, CRYPTODEV, \
+ RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,), \
+ __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,)))
#define CDEV_LOG_INFO(...) \
- RTE_LOG(INFO, CRYPTODEV, \
- RTE_FMT(RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
- RTE_FMT_TAIL(__VA_ARGS__,)))
+ RTE_LOG_LINE(INFO, CRYPTODEV, "" __VA_ARGS__)
#define CDEV_LOG_DEBUG(...) \
- RTE_LOG(DEBUG, CRYPTODEV, \
- RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
- __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,)))
+ RTE_LOG_LINE(DEBUG, CRYPTODEV, \
+ RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,), \
+ __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,)))
#define CDEV_PMD_TRACE(...) \
- RTE_LOG(DEBUG, CRYPTODEV, \
- RTE_FMT("[%s] %s: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
- dev, __func__, RTE_FMT_TAIL(__VA_ARGS__,)))
+ RTE_LOG_LINE(DEBUG, CRYPTODEV, \
+ RTE_FMT("[%s] %s: " RTE_FMT_HEAD(__VA_ARGS__ ,), \
+ dev, __func__, RTE_FMT_TAIL(__VA_ARGS__ ,)))
/**
* A macro that points to an offset from the start
@@ -32,9 +32,11 @@ static struct {
} *dma_devices_shared_data;
RTE_LOG_REGISTER_DEFAULT(rte_dma_logtype, INFO);
+#define RTE_LOGTYPE_DMA rte_dma_logtype
+
#define RTE_DMA_LOG(level, ...) \
- rte_log(RTE_LOG_ ## level, rte_dma_logtype, RTE_FMT("dma: " \
- RTE_FMT_HEAD(__VA_ARGS__,) "\n", RTE_FMT_TAIL(__VA_ARGS__,)))
+ RTE_LOG_LINE(level, DMA, RTE_FMT("dma: " RTE_FMT_HEAD(__VA_ARGS__ ,), \
+ RTE_FMT_TAIL(__VA_ARGS__ ,)))
int
rte_dma_dev_max(size_t dev_max)
@@ -748,7 +748,7 @@ int eal_asprintf(char **buffer, const char *format, ...);
eal_asprintf(buffer, format, ##__VA_ARGS__)
#endif
-#define EAL_LOG(level, fmt, ...) \
- RTE_LOG(level, EAL, fmt "\n", ## __VA_ARGS__)
+#define EAL_LOG(level, ...) \
+ RTE_LOG_LINE(level, EAL, "" __VA_ARGS__)
#endif /* _EAL_PRIVATE_H_ */
@@ -48,9 +48,9 @@ extern "C" {
* Log GetLastError() with context, usually a Win32 API function and arguments.
*/
#define RTE_LOG_WIN32_ERR(...) \
- RTE_LOG(DEBUG, EAL, RTE_FMT("GetLastError()=%lu: " \
- RTE_FMT_HEAD(__VA_ARGS__,) "\n", GetLastError(), \
- RTE_FMT_TAIL(__VA_ARGS__,)))
+ RTE_LOG_LINE(DEBUG, EAL, RTE_FMT("GetLastError()=%lu: " \
+ RTE_FMT_HEAD(__VA_ARGS__ ,), GetLastError(), \
+ RTE_FMT_TAIL(__VA_ARGS__ ,)))
#ifdef __cplusplus
}
@@ -31,8 +31,8 @@
RTE_LOG_REGISTER_DEFAULT(efd_logtype, INFO);
#define RTE_LOGTYPE_EFD efd_logtype
-#define EFD_LOG(level, fmt, ...) \
- RTE_LOG(level, EFD, fmt "\n", ## __VA_ARGS__)
+#define EFD_LOG(level, ...) \
+ RTE_LOG_LINE(level, EFD, "" __VA_ARGS__)
#define EFD_KEY(key_idx, table) (table->keys + ((key_idx) * table->key_len))
/** Hash function used to determine chunk_id and bin_id for a group */
@@ -179,8 +179,7 @@ extern int rte_eth_dev_logtype;
#define RTE_LOGTYPE_ETHDEV rte_eth_dev_logtype
#define RTE_ETHDEV_LOG_LINE(level, ...) \
- RTE_LOG(level, ETHDEV, RTE_FMT(RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
- RTE_FMT_TAIL(__VA_ARGS__ ,)))
+ RTE_LOG_LINE(level, ETHDEV, "" __VA_ARGS__)
struct rte_mbuf;
@@ -33,15 +33,15 @@ extern "C" {
/* Logging Macros */
#define RTE_EDEV_LOG_ERR(...) \
- RTE_LOG(ERR, EVENTDEV, \
- RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
- __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,)))
+ RTE_LOG_LINE(ERR, EVENTDEV, \
+ RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,), \
+ __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,)))
#ifdef RTE_LIBRTE_EVENTDEV_DEBUG
#define RTE_EDEV_LOG_DEBUG(...) \
- RTE_LOG(DEBUG, EVENTDEV, \
- RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
- __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,)))
+ RTE_LOG_LINE(DEBUG, EVENTDEV, \
+ RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,), \
+ __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,)))
#else
#define RTE_EDEV_LOG_DEBUG(...) (void)0
#endif
@@ -30,27 +30,30 @@
#define DATA_MZ_NAME_FORMAT "rte_event_timer_adapter_data_%d"
RTE_LOG_REGISTER_SUFFIX(evtim_logtype, adapter.timer, NOTICE);
+#define RTE_LOGTYPE_EVTIM evtim_logtype
RTE_LOG_REGISTER_SUFFIX(evtim_buffer_logtype, adapter.timer, NOTICE);
+#define RTE_LOGTYPE_EVTIM_BUF evtim_buffer_logtype
RTE_LOG_REGISTER_SUFFIX(evtim_svc_logtype, adapter.timer.svc, NOTICE);
+#define RTE_LOGTYPE_EVTIM_SVC evtim_svc_logtype
static struct rte_event_timer_adapter *adapters;
static const struct event_timer_adapter_ops swtim_ops;
#define EVTIM_LOG(level, logtype, ...) \
- rte_log(RTE_LOG_ ## level, logtype, \
- RTE_FMT("EVTIMER: %s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) \
- "\n", __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,)))
+ RTE_LOG_LINE(level, logtype, \
+ RTE_FMT("EVTIMER: %s() line %u: " RTE_FMT_HEAD(__VA_ARGS__ ,), \
+ __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,)))
-#define EVTIM_LOG_ERR(...) EVTIM_LOG(ERR, evtim_logtype, __VA_ARGS__)
+#define EVTIM_LOG_ERR(...) EVTIM_LOG(ERR, EVTIM, __VA_ARGS__)
#ifdef RTE_LIBRTE_EVENTDEV_DEBUG
#define EVTIM_LOG_DBG(...) \
- EVTIM_LOG(DEBUG, evtim_logtype, __VA_ARGS__)
+ EVTIM_LOG(DEBUG, EVTIM, __VA_ARGS__)
#define EVTIM_BUF_LOG_DBG(...) \
- EVTIM_LOG(DEBUG, evtim_buffer_logtype, __VA_ARGS__)
+ EVTIM_LOG(DEBUG, EVTIM_BUF, __VA_ARGS__)
#define EVTIM_SVC_LOG_DBG(...) \
- EVTIM_LOG(DEBUG, evtim_svc_logtype, __VA_ARGS__)
+ EVTIM_LOG(DEBUG, EVTIM_SVC, __VA_ARGS__)
#else
#define EVTIM_LOG_DBG(...) (void)0
#define EVTIM_BUF_LOG_DBG(...) (void)0
@@ -2,5 +2,5 @@
extern int fib_logtype;
#define RTE_LOGTYPE_FIB fib_logtype
-#define FIB_LOG(level, fmt, ...) \
- RTE_LOG(level, FIB, fmt "\n", ## __VA_ARGS__)
+#define FIB_LOG(level, ...) \
+ RTE_LOG_LINE(level, FIB, "" __VA_ARGS__)
@@ -17,9 +17,11 @@
/* Logging */
RTE_LOG_REGISTER_DEFAULT(gpu_logtype, NOTICE);
+#define RTE_LOGTYPE_GPUDEV gpu_logtype
+
#define GPU_LOG(level, ...) \
- rte_log(RTE_LOG_ ## level, gpu_logtype, RTE_FMT("gpu: " \
- RTE_FMT_HEAD(__VA_ARGS__, ) "\n", RTE_FMT_TAIL(__VA_ARGS__, )))
+ RTE_LOG_LINE(level, GPUDEV, RTE_FMT("gpu: " RTE_FMT_HEAD(__VA_ARGS__ ,), \
+ RTE_FMT_TAIL(__VA_ARGS__ ,)))
/* Set any driver error as EPERM */
#define GPU_DRV_RET(function) \
@@ -18,11 +18,12 @@
#include "rte_graph_worker.h"
extern int rte_graph_logtype;
+#define RTE_LOGTYPE_GRAPH rte_graph_logtype
#define GRAPH_LOG(level, ...) \
- rte_log(RTE_LOG_##level, rte_graph_logtype, \
- RTE_FMT("GRAPH: %s():%u " RTE_FMT_HEAD(__VA_ARGS__, ) "\n", \
- __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__, )))
+ RTE_LOG_LINE(level, GRAPH, \
+ RTE_FMT("GRAPH: %s():%u " RTE_FMT_HEAD(__VA_ARGS__ ,), \
+ __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,)))
#define graph_err(...) GRAPH_LOG(ERR, __VA_ARGS__)
#define graph_warn(...) GRAPH_LOG(WARNING, __VA_ARGS__)
@@ -28,8 +28,8 @@
/* needs to be before rte_cuckoo_hash.h */
RTE_LOG_REGISTER_DEFAULT(hash_logtype, INFO);
#define RTE_LOGTYPE_HASH hash_logtype
-#define HASH_LOG(level, fmt, ...) \
- RTE_LOG(level, HASH, fmt "\n", ## __VA_ARGS__)
+#define HASH_LOG(level, ...) \
+ RTE_LOG_LINE(level, HASH, "" __VA_ARGS__)
#include "rte_cuckoo_hash.h"
@@ -21,8 +21,8 @@
RTE_LOG_REGISTER_SUFFIX(fbk_hash_logtype, fbk, INFO);
#define RTE_LOGTYPE_HASH fbk_hash_logtype
-#define HASH_LOG(level, fmt, ...) \
- RTE_LOG(level, HASH, fmt "\n", ## __VA_ARGS__)
+#define HASH_LOG(level, ...) \
+ RTE_LOG_LINE(level, HASH, "" __VA_ARGS__)
TAILQ_HEAD(rte_fbk_hash_list, rte_tailq_entry);
@@ -9,8 +9,8 @@
RTE_LOG_REGISTER_SUFFIX(hash_crc_logtype, crc, INFO);
#define RTE_LOGTYPE_HASH_CRC hash_crc_logtype
-#define HASH_CRC_LOG(level, fmt, ...) \
- RTE_LOG(level, HASH_CRC, fmt "\n", ## __VA_ARGS__)
+#define HASH_CRC_LOG(level, ...) \
+ RTE_LOG_LINE(level, HASH_CRC, "" __VA_ARGS__)
uint8_t rte_hash_crc32_alg = CRC32_SW;
@@ -15,8 +15,8 @@
RTE_LOG_REGISTER_SUFFIX(thash_logtype, thash, INFO);
#define RTE_LOGTYPE_HASH thash_logtype
-#define HASH_LOG(level, fmt, ...) \
- RTE_LOG(level, HASH, fmt "\n", ## __VA_ARGS__)
+#define HASH_LOG(level, ...) \
+ RTE_LOG_LINE(level, HASH, "" __VA_ARGS__)
#define THASH_NAME_LEN 64
#define TOEPLITZ_HASH_LEN 32
@@ -11,8 +11,8 @@
RTE_LOG_REGISTER_SUFFIX(hash_gfni_logtype, gfni, INFO);
#define RTE_LOGTYPE_HASH hash_gfni_logtype
-#define HASH_LOG(level, fmt, ...) \
- RTE_LOG(level, HASH, fmt "\n", ## __VA_ARGS__)
+#define HASH_LOG(level, ...) \
+ RTE_LOG_LINE(level, HASH, "" __VA_ARGS__)
uint32_t
rte_thash_gfni(const uint64_t *mtrx __rte_unused,
@@ -22,8 +22,8 @@ extern int ipfrag_logtype;
#define RTE_LOGTYPE_IPFRAG ipfrag_logtype
/* logging macros. */
-#define IP_FRAG_LOG_LINE(level, fmt, ...) \
- RTE_LOG(level, IPFRAG, fmt "\n", ## __VA_ARGS__)
+#define IP_FRAG_LOG_LINE(level, ...) \
+ RTE_LOG_LINE(level, IPFRAG, "" __VA_ARGS__)
#ifdef RTE_LIBRTE_IP_FRAG_DEBUG
#define IP_FRAG_LOG(lvl, fmt, args...) RTE_LOG(lvl, IPFRAG, fmt, ##args)
@@ -27,8 +27,8 @@ latencystat_cycles_per_ns(void)
RTE_LOG_REGISTER_DEFAULT(latencystat_logtype, INFO);
#define RTE_LOGTYPE_LATENCY_STATS latencystat_logtype
-#define LATENCY_STATS_LOG(level, fmt, ...) \
- RTE_LOG(level, LATENCY_STATS, fmt "\n", ## __VA_ARGS__)
+#define LATENCY_STATS_LOG(level, ...) \
+ RTE_LOG_LINE(level, LATENCY_STATS, "" __VA_ARGS__)
static uint64_t timestamp_dynflag;
static int timestamp_dynfield_offset = -1;
@@ -2,5 +2,5 @@
extern int lpm_logtype;
#define RTE_LOGTYPE_LPM lpm_logtype
-#define LPM_LOG(level, fmt, ...) \
- RTE_LOG(level, LPM, fmt "\n", ## __VA_ARGS__)
+#define LPM_LOG(level, ...) \
+ RTE_LOG_LINE(level, LPM, "" __VA_ARGS__)
@@ -2,5 +2,5 @@
extern int mbuf_logtype;
#define RTE_LOGTYPE_MBUF mbuf_logtype
-#define MBUF_LOG(level, fmt, ...) \
- RTE_LOG(level, MBUF, fmt "\n", ## __VA_ARGS__)
+#define MBUF_LOG(level, ...) \
+ RTE_LOG_LINE(level, MBUF, "" __VA_ARGS__)
@@ -8,7 +8,7 @@ extern int librte_member_logtype;
#define RTE_LOGTYPE_MEMBER librte_member_logtype
#define MEMBER_LOG(level, ...) \
- RTE_LOG(level, MEMBER, \
- RTE_FMT("%s(): " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
+ RTE_LOG_LINE(level, MEMBER, \
+ RTE_FMT("%s(): " RTE_FMT_HEAD(__VA_ARGS__ ,), \
__func__, RTE_FMT_TAIL(__VA_ARGS__ ,)))
@@ -182,8 +182,8 @@ struct rte_mempool_objtlr {
*/
extern int rte_mempool_logtype;
#define RTE_LOGTYPE_MEMPOOL rte_mempool_logtype
-#define RTE_MEMPOOL_LOG(level, fmt, ...) \
- RTE_LOG(level, MEMPOOL, fmt "\n", ## __VA_ARGS__)
+#define RTE_MEMPOOL_LOG(level, ...) \
+ RTE_LOG_LINE(level, MEMPOOL, "" __VA_ARGS__)
/**
* A list of memory where objects are stored
@@ -16,11 +16,11 @@
struct telemetry_metrics_data tel_met_data;
int metrics_log_level;
+#define RTE_LOGTYPE_METRICS metrics_log_level
/* Logging Macros */
#define METRICS_LOG(level, fmt, args...) \
- rte_log(RTE_LOG_ ##level, metrics_log_level, "%s(): "fmt "\n", \
- __func__, ##args)
+ RTE_LOG_LINE(level, METRICS, "%s(): "fmt, __func__, ## args)
#define METRICS_LOG_ERR(fmt, args...) \
METRICS_LOG(ERR, fmt, ## args)
@@ -144,9 +144,10 @@ extern "C" {
/* Logging Macro */
extern int rte_ml_dev_logtype;
+#define RTE_LOGTYPE_MLDEV rte_ml_dev_logtype
-#define RTE_MLDEV_LOG(level, fmt, args...) \
- rte_log(RTE_LOG_##level, rte_ml_dev_logtype, "%s(): " fmt "\n", __func__, ##args)
+#define RTE_MLDEV_LOG(level, fmt, args...) \
+ RTE_LOG_LINE(level, MLDEV, "%s(): " fmt, __func__, ##args)
#define RTE_ML_STR_MAX 128
/**< Maximum length of name string */
@@ -70,11 +70,11 @@ static const rte_net_crc_handler handlers_neon[] = {
static uint16_t max_simd_bitwidth;
-#define NET_LOG(level, fmt, args...) \
- rte_log(RTE_LOG_ ## level, libnet_logtype, "%s(): " fmt "\n", \
- __func__, ## args)
-
RTE_LOG_REGISTER_DEFAULT(libnet_logtype, INFO);
+#define RTE_LOGTYPE_NET libnet_logtype
+
+#define NET_LOG(level, fmt, args...) \
+ RTE_LOG_LINE(level, NET, "%s(): " fmt, __func__, ## args)
/* Scalar handling */
@@ -11,11 +11,13 @@
#include <rte_mbuf_dyn.h>
extern int rte_node_logtype;
+#define RTE_LOGTYPE_NODE rte_node_logtype
+
#define NODE_LOG(level, node_name, ...) \
- rte_log(RTE_LOG_##level, rte_node_logtype, \
- RTE_FMT("NODE %s: %s():%u " RTE_FMT_HEAD(__VA_ARGS__, ) "\n", \
+ RTE_LOG_LINE(level, NODE, \
+ RTE_FMT("NODE %s: %s():%u " RTE_FMT_HEAD(__VA_ARGS__ ,), \
node_name, __func__, __LINE__, \
- RTE_FMT_TAIL(__VA_ARGS__, )))
+ RTE_FMT_TAIL(__VA_ARGS__ ,)))
#define node_err(node_name, ...) NODE_LOG(ERR, node_name, __VA_ARGS__)
#define node_info(node_name, ...) NODE_LOG(INFO, node_name, __VA_ARGS__)
@@ -18,9 +18,8 @@
RTE_LOG_REGISTER_DEFAULT(pdump_logtype, NOTICE);
#define RTE_LOGTYPE_PDUMP pdump_logtype
-#define PDUMP_LOG_LINE(level, fmt, args...) \
- RTE_LOG(level, PDUMP, "%s(): " fmt "\n", \
- __func__, ## args)
+#define PDUMP_LOG_LINE(level, fmt, args...) \
+ RTE_LOG_LINE(level, PDUMP, "%s(): " fmt, __func__, ## args)
/* Used for the multi-process communication */
#define PDUMP_MP "mp_pdump"
@@ -12,8 +12,8 @@
#include "rte_pipeline.h"
-#define PIPELINE_LOG(level, fmt, ...) \
- RTE_LOG(level, PIPELINE, fmt "\n", ## __VA_ARGS__)
+#define PIPELINE_LOG(level, ...) \
+ RTE_LOG_LINE(level, PIPELINE, "" __VA_ARGS__)
#define RTE_TABLE_INVALID UINT32_MAX
@@ -4,6 +4,6 @@
#include <rte_log.h>
-#define PORT_LOG(level, fmt, ...) \
- RTE_LOG(level, PORT, fmt "\n", ## __VA_ARGS__)
+#define PORT_LOG(level, ...) \
+ RTE_LOG_LINE(level, PORT, "" __VA_ARGS__)
@@ -19,8 +19,8 @@
RTE_LOG_REGISTER_SUFFIX(guest_channel_logtype, guest_channel, INFO);
#define RTE_LOGTYPE_GUEST_CHANNEL guest_channel_logtype
-#define GUEST_CHANNEL_LOG(level, fmt, ...) \
- RTE_LOG(level, GUEST_CHANNEL, fmt "\n", ## __VA_ARGS__)
+#define GUEST_CHANNEL_LOG(level, ...) \
+ RTE_LOG_LINE(level, GUEST_CHANNEL, "" __VA_ARGS__)
/* Timeout for incoming message in milliseconds. */
#define TIMEOUT 10
@@ -12,12 +12,12 @@
extern int power_logtype;
#define RTE_LOGTYPE_POWER power_logtype
-#define POWER_LOG(level, fmt, ...) \
- RTE_LOG(level, POWER, fmt "\n", ## __VA_ARGS__)
+#define POWER_LOG(level, ...) \
+ RTE_LOG_LINE(level, POWER, "" __VA_ARGS__)
#ifdef RTE_LIBRTE_POWER_DEBUG
#define POWER_DEBUG_LOG(fmt, args...) \
- RTE_LOG(ERR, POWER, "%s: " fmt "\n", __func__, ## args)
+ RTE_LOG_LINE(ERR, POWER, "%s: " fmt, __func__, ## args)
#else
#define POWER_DEBUG_LOG(fmt, args...)
#endif
@@ -27,11 +27,11 @@ extern "C" {
#include "rte_rawdev.h"
extern int librawdev_logtype;
+#define RTE_LOGTYPE_RAWDEV librawdev_logtype
/* Logging Macros */
#define RTE_RDEV_LOG(level, fmt, args...) \
- rte_log(RTE_LOG_ ## level, librawdev_logtype, "%s(): " fmt "\n", \
- __func__, ##args)
+ RTE_LOG_LINE(level, RAWDEV, "%s(): " fmt, __func__, ##args)
#define RTE_RDEV_ERR(fmt, args...) \
RTE_RDEV_LOG(ERR, fmt, ## args)
@@ -20,7 +20,7 @@
#include "rcu_qsbr_pvt.h"
#define RCU_LOG(level, fmt, args...) \
- RTE_LOG(level, RCU, "%s(): " fmt "\n", __func__, ## args)
+ RTE_LOG_LINE(level, RCU, "%s(): " fmt, __func__, ## args)
/* Get the memory size of QSBR variable */
size_t
@@ -40,17 +40,15 @@ extern int rte_rcu_log_type;
#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
#define __RTE_RCU_DP_LOG(level, fmt, args...) \
- rte_log(RTE_LOG_ ## level, rte_rcu_log_type, \
- "%s(): " fmt "\n", __func__, ## args)
+ RTE_LOG_LINE(level, RCU, "%s(): " fmt, __func__, ## args)
#else
#define __RTE_RCU_DP_LOG(level, fmt, args...)
#endif
#if defined(RTE_LIBRTE_RCU_DEBUG)
-#define __RTE_RCU_IS_LOCK_CNT_ZERO(v, thread_id, level, fmt, args...) do {\
+#define __RTE_RCU_IS_LOCK_CNT_ZERO(v, thread_id, level, fmt, args...) do { \
if (v->qsbr_cnt[thread_id].lock_cnt) \
- rte_log(RTE_LOG_ ## level, rte_rcu_log_type, \
- "%s(): " fmt "\n", __func__, ## args); \
+ RTE_LOG_LINE(level, RCU, "%s(): " fmt, __func__, ## args); \
} while (0)
#else
#define __RTE_RCU_IS_LOCK_CNT_ZERO(v, thread_id, level, fmt, args...)
@@ -209,8 +209,7 @@ extern int rte_regexdev_logtype;
#define RTE_LOGTYPE_REGEXDEV rte_regexdev_logtype
#define RTE_REGEXDEV_LOG_LINE(level, ...) \
- RTE_LOG(level, REGEXDEV, RTE_FMT(RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
- RTE_FMT_TAIL(__VA_ARGS__ ,)))
+ RTE_LOG_LINE(level, REGEXDEV, "" __VA_ARGS__)
/* Macros to check for valid port */
#define RTE_REGEXDEV_VALID_DEV_ID_OR_ERR_RET(dev_id, retval) do { \
@@ -18,8 +18,8 @@
RTE_LOG_REGISTER_DEFAULT(reorder_logtype, INFO);
#define RTE_LOGTYPE_REORDER reorder_logtype
-#define REORDER_LOG(level, fmt, ...) \
- RTE_LOG(level, REORDER, fmt "\n", ## __VA_ARGS__)
+#define REORDER_LOG(level, ...) \
+ RTE_LOG_LINE(level, REORDER, "" __VA_ARGS__)
TAILQ_HEAD(rte_reorder_list, rte_tailq_entry);
@@ -4,5 +4,5 @@
extern int rib_logtype;
#define RTE_LOGTYPE_RIB rib_logtype
-#define RIB_LOG(level, fmt, ...) \
- RTE_LOG(level, RIB, fmt "\n", ## __VA_ARGS__)
+#define RIB_LOG(level, ...) \
+ RTE_LOG_LINE(level, RIB, "" __VA_ARGS__)
@@ -28,8 +28,8 @@
RTE_LOG_REGISTER_DEFAULT(ring_logtype, INFO);
#define RTE_LOGTYPE_RING ring_logtype
-#define RING_LOG(level, fmt, ...) \
- RTE_LOG(level, RING, fmt "\n", ## __VA_ARGS__)
+#define RING_LOG(level, ...) \
+ RTE_LOG_LINE(level, RING, "" __VA_ARGS__)
TAILQ_HEAD(rte_ring_list, rte_tailq_entry);
@@ -2,5 +2,5 @@
extern int sched_logtype;
#define RTE_LOGTYPE_SCHED sched_logtype
-#define SCHED_LOG(level, fmt, ...) \
- RTE_LOG(level, SCHED, fmt "\n", ## __VA_ARGS__)
+#define SCHED_LOG(level, ...) \
+ RTE_LOG_LINE(level, SCHED, "" __VA_ARGS__)
@@ -8,10 +8,10 @@
#include <rte_log.h>
extern int stack_logtype;
+#define RTE_LOGTYPE_STACK stack_logtype
#define STACK_LOG(level, fmt, args...) \
- rte_log(RTE_LOG_ ##level, stack_logtype, "%s(): "fmt "\n", \
- __func__, ##args)
+ RTE_LOG_LINE(level, STACK, "%s(): "fmt, __func__, ##args)
#define STACK_LOG_ERR(fmt, args...) \
STACK_LOG(ERR, fmt, ## args)
@@ -4,6 +4,6 @@
#include <rte_log.h>
-#define TABLE_LOG(level, fmt, ...) \
- RTE_LOG(level, TABLE, fmt "\n", ## __VA_ARGS__)
+#define TABLE_LOG(level, ...) \
+ RTE_LOG_LINE(level, TABLE, "" __VA_ARGS__)
@@ -57,9 +57,7 @@ static rte_cpuset_t *thread_cpuset;
RTE_LOG_REGISTER_DEFAULT(logtype, WARNING);
#define RTE_LOGTYPE_TMTY logtype
-#define TMTY_LOG_LINE(l, ...) \
- RTE_LOG(l, TMTY, RTE_FMT("TELEMETRY: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
- RTE_FMT_TAIL(__VA_ARGS__ ,)))
+#define TMTY_LOG_LINE(l, ...) RTE_LOG_LINE(l, TMTY, "TELEMETRY: " __VA_ARGS__)
/* list of command callbacks, with one command registered by default */
static struct cmd_callback *callbacks;
@@ -12,8 +12,8 @@
RTE_LOG_REGISTER_SUFFIX(vhost_fdset_logtype, fdset, INFO);
#define RTE_LOGTYPE_VHOST_FDMAN vhost_fdset_logtype
-#define VHOST_FDMAN_LOG(level, fmt, ...) \
- RTE_LOG(level, VHOST_FDMAN, fmt "\n", ## __VA_ARGS__)
+#define VHOST_FDMAN_LOG(level, ...) \
+ RTE_LOG_LINE(level, VHOST_FDMAN, "" __VA_ARGS__)
#define FDPOLLERR (POLLERR | POLLHUP | POLLNVAL)
@@ -678,10 +678,10 @@ extern int vhost_data_log_level;
#define RTE_LOGTYPE_VHOST_DATA vhost_data_log_level
#define VHOST_CONFIG_LOG(prefix, level, fmt, args...) \
- RTE_LOG(level, VHOST_CONFIG, "VHOST_CONFIG: (%s) " fmt "\n", prefix, ##args)
+ RTE_LOG_LINE(level, VHOST_CONFIG, "VHOST_CONFIG: (%s) " fmt, prefix, ##args)
#define VHOST_DATA_LOG(prefix, level, fmt, args...) \
- RTE_LOG_DP(level, VHOST_DATA, "VHOST_DATA: (%s) " fmt "\n", prefix, ##args)
+ RTE_LOG_DP_LINE(level, VHOST_DATA, "VHOST_DATA: (%s) " fmt, prefix, ##args)
#ifdef RTE_LIBRTE_VHOST_DEBUG
#define VHOST_MAX_PRINT_BUFF 6072
@@ -21,15 +21,15 @@ RTE_LOG_REGISTER_SUFFIX(vhost_crypto_logtype, crypto, INFO);
#define RTE_LOGTYPE_VHOST_CRYPTO vhost_crypto_logtype
#define VC_LOG_ERR(fmt, args...) \
- RTE_LOG(ERR, VHOST_CRYPTO, "%s() line %u: " fmt "\n", \
+ RTE_LOG_LINE(ERR, VHOST_CRYPTO, "%s() line %u: " fmt, \
__func__, __LINE__, ## args)
#define VC_LOG_INFO(fmt, args...) \
- RTE_LOG(INFO, VHOST_CRYPTO, "%s() line %u: " fmt "\n", \
+ RTE_LOG_LINE(INFO, VHOST_CRYPTO, "%s() line %u: " fmt, \
__func__, __LINE__, ## args)
#ifdef RTE_LIBRTE_VHOST_DEBUG
#define VC_LOG_DBG(fmt, args...) \
- RTE_LOG(DEBUG, VHOST_CRYPTO, "%s() line %u: " fmt "\n", \
+ RTE_LOG_LINE(DEBUG, VHOST_CRYPTO, "%s() line %u: " fmt, \
__func__, __LINE__, ## args)
#else
#define VC_LOG_DBG(fmt, args...)