From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 159C4439B5; Wed, 24 Jan 2024 13:17:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CBF8540294; Wed, 24 Jan 2024 13:17:16 +0100 (CET) Received: from dkmailrelay1.smartsharesystems.com (smartserver.smartsharesystems.com [77.243.40.215]) by mails.dpdk.org (Postfix) with ESMTP id 9144D4026F for ; Wed, 24 Jan 2024 13:17:15 +0100 (CET) Received: from smartserver.smartsharesystems.com (smartserver.smartsharesys.local [192.168.4.10]) by dkmailrelay1.smartsharesystems.com (Postfix) with ESMTP id 57EC5205F3; Wed, 24 Jan 2024 13:17:15 +0100 (CET) Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Subject: RE: [PATCH] lib: remove duplicate prefix in logs X-MimeOLE: Produced By Microsoft Exchange V6.5 Date: Wed, 24 Jan 2024 13:17:13 +0100 Message-ID: <98CBD80474FA8B44BF855DF32C47DC35E9F18F@smartserver.smartshare.dk> In-Reply-To: <20240124120450.546364-1-david.marchand@redhat.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: [PATCH] lib: remove duplicate prefix in logs Thread-Index: AdpOvZtu+50D+37yQIenETcP8lh+EgAAJ/Vg References: <20240124120450.546364-1-david.marchand@redhat.com> From: =?iso-8859-1?Q?Morten_Br=F8rup?= To: "David Marchand" , Cc: "Thomas Monjalon" , "Chengwen Feng" , "Kevin Laatz" , "Bruce Richardson" , "Elena Agostini" , "Jerin Jacob" , "Kiran Kumar K" , "Nithin Dabilpuram" , "Zhirun Yan" , "Pavan Nikhilesh" , "Ciara Power" , "Maxime Coquelin" , "Chenbo Xia" , "Andrew Rybchenko" X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org > From: David Marchand [mailto:david.marchand@redhat.com] > Sent: Wednesday, 24 January 2024 13.05 >=20 > RTE_LOG() macros prefixe the log messages based on the logtype. > This results in logs like: >=20 > TMTY: TELEMETRY: Attempting socket bind to path '/run/user/...' > TMTY: TELEMETRY: Socket creation and binding ok > TMTY: TELEMETRY: Telemetry initialized ok >=20 > Remove redundancy in some libraries following their conversion to > RTE_LOG/RTE_LOG_LINE. >=20 > Fixes: 97433132c2ed ("lib: use per line logging in helpers") > Fixes: 0e21c7c07d62 ("lib: replace logging helpers") >=20 > Reported-by: Thomas Monjalon > Signed-off-by: David Marchand > --- > lib/dmadev/rte_dmadev.c | 3 +-- > lib/gpudev/gpudev.c | 3 +-- > lib/graph/graph_private.h | 2 +- > lib/node/node_private.h | 2 +- > lib/telemetry/telemetry.c | 4 ++-- > lib/vhost/vhost.h | 6 +++--- > 6 files changed, 9 insertions(+), 11 deletions(-) >=20 > diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c > index 5953a77bd6..dbaa14f262 100644 > --- a/lib/dmadev/rte_dmadev.c > +++ b/lib/dmadev/rte_dmadev.c > @@ -35,8 +35,7 @@ RTE_LOG_REGISTER_DEFAULT(rte_dma_logtype, INFO); > #define RTE_LOGTYPE_DMA rte_dma_logtype >=20 > #define RTE_DMA_LOG(level, ...) \ > - RTE_LOG_LINE(level, DMA, RTE_FMT("dma: " RTE_FMT_HEAD(__VA_ARGS__ > ,), \ > - RTE_FMT_TAIL(__VA_ARGS__ ,))) > + RTE_LOG_LINE(level, DMA, "" __VA_ARGS__) >=20 > int > rte_dma_dev_max(size_t dev_max) > diff --git a/lib/gpudev/gpudev.c b/lib/gpudev/gpudev.c > index de8291151f..1c2011b856 100644 > --- a/lib/gpudev/gpudev.c > +++ b/lib/gpudev/gpudev.c > @@ -20,8 +20,7 @@ RTE_LOG_REGISTER_DEFAULT(gpu_logtype, NOTICE); > #define RTE_LOGTYPE_GPUDEV gpu_logtype >=20 > #define GPU_LOG(level, ...) \ > - RTE_LOG_LINE(level, GPUDEV, RTE_FMT("gpu: " > RTE_FMT_HEAD(__VA_ARGS__ ,), \ > - RTE_FMT_TAIL(__VA_ARGS__ ,))) > + RTE_LOG_LINE(level, GPUDEV, "" __VA_ARGS__) Suggestion: GPUDEV -> GPU, like DMA, not DMADEV. >=20 > /* Set any driver error as EPERM */ > #define GPU_DRV_RET(function) \ > diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h > index f9274ce96c..fb88d4bc84 100644 > --- a/lib/graph/graph_private.h > +++ b/lib/graph/graph_private.h > @@ -22,7 +22,7 @@ extern int rte_graph_logtype; >=20 > #define GRAPH_LOG(level, ...) > \ > RTE_LOG_LINE(level, GRAPH, > \ > - RTE_FMT("GRAPH: %s():%u " RTE_FMT_HEAD(__VA_ARGS__ ,), > \ > + RTE_FMT("%s():%u " RTE_FMT_HEAD(__VA_ARGS__ ,), > \ > __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,))) >=20 > #define graph_err(...) GRAPH_LOG(ERR, __VA_ARGS__) > diff --git a/lib/node/node_private.h b/lib/node/node_private.h > index 845fdaa12e..73563e4cd2 100644 > --- a/lib/node/node_private.h > +++ b/lib/node/node_private.h > @@ -15,7 +15,7 @@ extern int rte_node_logtype; >=20 > #define NODE_LOG(level, node_name, ...) > \ > RTE_LOG_LINE(level, NODE, > \ > - RTE_FMT("NODE %s: %s():%u " RTE_FMT_HEAD(__VA_ARGS__ ,), > \ > + RTE_FMT("%s: %s():%u " RTE_FMT_HEAD(__VA_ARGS__ ,), > \ > node_name, __func__, __LINE__, > \ > RTE_FMT_TAIL(__VA_ARGS__ ,))) >=20 > diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c > index 31e2391867..47846ef868 100644 > --- a/lib/telemetry/telemetry.c > +++ b/lib/telemetry/telemetry.c > @@ -56,8 +56,8 @@ static const char *socket_dir; /* runtime > directory */ > static rte_cpuset_t *thread_cpuset; >=20 > RTE_LOG_REGISTER_DEFAULT(logtype, WARNING); > -#define RTE_LOGTYPE_TMTY logtype > -#define TMTY_LOG_LINE(l, ...) RTE_LOG_LINE(l, TMTY, "TELEMETRY: " > __VA_ARGS__) > +#define RTE_LOGTYPE_TELEMETRY logtype > +#define TMTY_LOG_LINE(l, ...) RTE_LOG_LINE(l, TELEMETRY, "" +1 for TELEMETRY instead of TMTY. > __VA_ARGS__) >=20 > /* list of command callbacks, with one command registered by default > */ > static struct cmd_callback *callbacks; > diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h > index 470dadbba6..0b13374980 100644 > --- a/lib/vhost/vhost.h > +++ b/lib/vhost/vhost.h > @@ -678,10 +678,10 @@ extern int vhost_data_log_level; > #define RTE_LOGTYPE_VHOST_DATA vhost_data_log_level >=20 > #define VHOST_CONFIG_LOG(prefix, level, fmt, args...) \ > - RTE_LOG_LINE(level, VHOST_CONFIG, "VHOST_CONFIG: (%s) " fmt, > prefix, ##args) > + RTE_LOG_LINE(level, VHOST_CONFIG, "(%s) " fmt, prefix, ##args) >=20 > #define VHOST_DATA_LOG(prefix, level, fmt, args...) \ > - RTE_LOG_DP_LINE(level, VHOST_DATA, "VHOST_DATA: (%s) " fmt, > prefix, ##args) > + RTE_LOG_DP_LINE(level, VHOST_DATA, "(%s) " fmt, prefix, ##args) >=20 > #ifdef RTE_LIBRTE_VHOST_DEBUG > #define VHOST_MAX_PRINT_BUFF 6072 > @@ -700,7 +700,7 @@ extern int vhost_data_log_level; > } \ > snprintf(packet + strnlen(packet, VHOST_MAX_PRINT_BUFF), > VHOST_MAX_PRINT_BUFF - strnlen(packet, VHOST_MAX_PRINT_BUFF), "\n"); \ > \ > - RTE_LOG_DP(DEBUG, VHOST_DATA, "VHOST_DATA: (%s) %s", dev->ifname, > packet); \ > + RTE_LOG_DP(DEBUG, VHOST_DATA, "(%s) %s", dev->ifname, packet); \ > } while (0) > #else > #define PRINT_PACKET(device, addr, size, header) do {} while (0) > -- > 2.43.0 Thank you for cleaning this up, David. Acked-by: Morten Br=F8rup