Skip to content

Commit

Permalink
lib: remove redundant newline from logs
Browse files Browse the repository at this point in the history
[ upstream commit ae282b0611c33aa73a01ee6137d116155053b835 ]

Fix places where two newline characters may be logged.

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Chengwen Feng <fengchengwen@huawei.com>
Acked-by: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
  • Loading branch information
david-marchand authored and bluca committed Feb 27, 2024
1 parent 31a09fa commit d0ec6c1
Show file tree
Hide file tree
Showing 21 changed files with 59 additions and 59 deletions.
2 changes: 1 addition & 1 deletion drivers/crypto/ipsec_mb/ipsec_mb_ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ ipsec_mb_ipc_request(const struct rte_mp_msg *mp_msg, const void *peer)
resp_param->result = ipsec_mb_qp_release(dev, qp_id);
break;
default:
CDEV_LOG_ERR("invalid mp request type\n");
CDEV_LOG_ERR("invalid mp request type");
}

out:
Expand Down
6 changes: 3 additions & 3 deletions lib/bbdev/rte_bbdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -1102,12 +1102,12 @@ rte_bbdev_queue_intr_ctl(uint16_t dev_id, uint16_t queue_id, int epfd, int op,

intr_handle = dev->intr_handle;
if (intr_handle == NULL) {
rte_bbdev_log(ERR, "Device %u intr handle unset\n", dev_id);
rte_bbdev_log(ERR, "Device %u intr handle unset", dev_id);
return -ENOTSUP;
}

if (queue_id >= RTE_MAX_RXTX_INTR_VEC_ID) {
rte_bbdev_log(ERR, "Device %u queue_id %u is too big\n",
rte_bbdev_log(ERR, "Device %u queue_id %u is too big",
dev_id, queue_id);
return -ENOTSUP;
}
Expand All @@ -1116,7 +1116,7 @@ rte_bbdev_queue_intr_ctl(uint16_t dev_id, uint16_t queue_id, int epfd, int op,
ret = rte_intr_rx_ctl(intr_handle, epfd, op, vec, data);
if (ret && (ret != -EEXIST)) {
rte_bbdev_log(ERR,
"dev %u q %u int ctl error op %d epfd %d vec %u\n",
"dev %u q %u int ctl error op %d epfd %d vec %u",
dev_id, queue_id, op, epfd, vec);
return ret;
}
Expand Down
14 changes: 7 additions & 7 deletions lib/cfgfile/rte_cfgfile.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ rte_cfgfile_check_params(const struct rte_cfgfile_parameters *params)
unsigned int i;

if (!params) {
CFG_LOG(ERR, "missing cfgfile parameters\n");
CFG_LOG(ERR, "missing cfgfile parameters");
return -EINVAL;
}

Expand All @@ -148,7 +148,7 @@ rte_cfgfile_check_params(const struct rte_cfgfile_parameters *params)
}

if (valid_comment == 0) {
CFG_LOG(ERR, "invalid comment characters %c\n",
CFG_LOG(ERR, "invalid comment characters %c",
params->comment_character);
return -ENOTSUP;
}
Expand Down Expand Up @@ -186,7 +186,7 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
lineno++;
if ((len >= sizeof(buffer) - 1) && (buffer[len-1] != '\n')) {
CFG_LOG(ERR, " line %d - no \\n found on string. "
"Check if line too long\n", lineno);
"Check if line too long", lineno);
goto error1;
}
/* skip parsing if comment character found */
Expand All @@ -207,7 +207,7 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
char *end = memchr(buffer, ']', len);
if (end == NULL) {
CFG_LOG(ERR,
"line %d - no terminating ']' character found\n",
"line %d - no terminating ']' character found",
lineno);
goto error1;
}
Expand All @@ -223,7 +223,7 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
split[1] = memchr(buffer, '=', len);
if (split[1] == NULL) {
CFG_LOG(ERR,
"line %d - no '=' character found\n",
"line %d - no '=' character found",
lineno);
goto error1;
}
Expand All @@ -247,7 +247,7 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
if (!(flags & CFG_FLAG_EMPTY_VALUES) &&
(*split[1] == '\0')) {
CFG_LOG(ERR,
"line %d - cannot use empty values\n",
"line %d - cannot use empty values",
lineno);
goto error1;
}
Expand Down Expand Up @@ -412,7 +412,7 @@ int rte_cfgfile_set_entry(struct rte_cfgfile *cfg, const char *sectionname,
return 0;
}

CFG_LOG(ERR, "entry name doesn't exist\n");
CFG_LOG(ERR, "entry name doesn't exist");
return -EINVAL;
}

Expand Down
4 changes: 2 additions & 2 deletions lib/compressdev/rte_compressdev_pmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@ rte_compressdev_pmd_create(const char *name,
struct rte_compressdev *compressdev;

if (params->name[0] != '\0') {
COMPRESSDEV_LOG(INFO, "User specified device name = %s\n",
COMPRESSDEV_LOG(INFO, "User specified device name = %s",
params->name);
name = params->name;
}

COMPRESSDEV_LOG(INFO, "Creating compressdev %s\n", name);
COMPRESSDEV_LOG(INFO, "Creating compressdev %s", name);

COMPRESSDEV_LOG(INFO, "Init parameters - name: %s, socket id: %d",
name, params->socket_id);
Expand Down
2 changes: 1 addition & 1 deletion lib/cryptodev/rte_cryptodev.c
Original file line number Diff line number Diff line change
Expand Up @@ -1969,7 +1969,7 @@ rte_cryptodev_sym_session_create(uint8_t dev_id,
}

if (xforms == NULL) {
CDEV_LOG_ERR("Invalid xform\n");
CDEV_LOG_ERR("Invalid xform");
rte_errno = EINVAL;
return NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/dmadev/rte_dmadev.c
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ rte_dma_vchan_status(int16_t dev_id, uint16_t vchan, enum rte_dma_vchan_status *
return -EINVAL;

if (vchan >= dev->data->dev_conf.nb_vchans) {
RTE_DMA_LOG(ERR, "Device %u vchan %u out of range\n", dev_id, vchan);
RTE_DMA_LOG(ERR, "Device %u vchan %u out of range", dev_id, vchan);
return -EINVAL;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/eal/windows/eal_memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ eal_mem_win32api_init(void)
VirtualAlloc2_ptr = (VirtualAlloc2_type)(
(void *)GetProcAddress(library, function));
if (VirtualAlloc2_ptr == NULL) {
RTE_LOG_WIN32_ERR("GetProcAddress(\"%s\", \"%s\")\n",
RTE_LOG_WIN32_ERR("GetProcAddress(\"%s\", \"%s\")",
library_name, function);

/* Contrary to the docs, Server 2016 is not supported. */
Expand Down
6 changes: 3 additions & 3 deletions lib/eventdev/eventdev_pmd.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,22 @@ extern "C" {
/* Macros to check for valid device */
#define RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, retval) do { \
if (!rte_event_pmd_is_valid_dev((dev_id))) { \
RTE_EDEV_LOG_ERR("Invalid dev_id=%d\n", dev_id); \
RTE_EDEV_LOG_ERR("Invalid dev_id=%d", dev_id); \
return retval; \
} \
} while (0)

#define RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, errno, retval) do { \
if (!rte_event_pmd_is_valid_dev((dev_id))) { \
RTE_EDEV_LOG_ERR("Invalid dev_id=%d\n", dev_id); \
RTE_EDEV_LOG_ERR("Invalid dev_id=%d", dev_id); \
rte_errno = errno; \
return retval; \
} \
} while (0)

#define RTE_EVENTDEV_VALID_DEVID_OR_RET(dev_id) do { \
if (!rte_event_pmd_is_valid_dev((dev_id))) { \
RTE_EDEV_LOG_ERR("Invalid dev_id=%d\n", dev_id); \
RTE_EDEV_LOG_ERR("Invalid dev_id=%d", dev_id); \
return; \
} \
} while (0)
Expand Down
8 changes: 4 additions & 4 deletions lib/eventdev/rte_event_crypto_adapter.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ static struct event_crypto_adapter **event_crypto_adapter;
/* Macros to check for valid adapter */
#define EVENT_CRYPTO_ADAPTER_ID_VALID_OR_ERR_RET(id, retval) do { \
if (!eca_valid_id(id)) { \
RTE_EDEV_LOG_ERR("Invalid crypto adapter id = %d\n", id); \
RTE_EDEV_LOG_ERR("Invalid crypto adapter id = %d", id); \
return retval; \
} \
} while (0)
Expand Down Expand Up @@ -298,7 +298,7 @@ eca_default_config_cb(uint8_t id, uint8_t dev_id,
dev_conf.nb_event_ports += 1;
ret = rte_event_dev_configure(dev_id, &dev_conf);
if (ret) {
RTE_EDEV_LOG_ERR("failed to configure event dev %u\n", dev_id);
RTE_EDEV_LOG_ERR("failed to configure event dev %u", dev_id);
if (started) {
if (rte_event_dev_start(dev_id))
return -EIO;
Expand All @@ -308,7 +308,7 @@ eca_default_config_cb(uint8_t id, uint8_t dev_id,

ret = rte_event_port_setup(dev_id, port_id, port_conf);
if (ret) {
RTE_EDEV_LOG_ERR("failed to setup event port %u\n", port_id);
RTE_EDEV_LOG_ERR("failed to setup event port %u", port_id);
return ret;
}

Expand Down Expand Up @@ -392,7 +392,7 @@ rte_event_crypto_adapter_create_ext(uint8_t id, uint8_t dev_id,
sizeof(struct crypto_device_info), 0,
socket_id);
if (adapter->cdevs == NULL) {
RTE_EDEV_LOG_ERR("Failed to get mem for crypto devices\n");
RTE_EDEV_LOG_ERR("Failed to get mem for crypto devices");
eca_circular_buffer_free(&adapter->ebuf);
rte_free(adapter);
return -ENOMEM;
Expand Down
24 changes: 12 additions & 12 deletions lib/eventdev/rte_event_eth_rx_adapter.c
Original file line number Diff line number Diff line change
Expand Up @@ -290,22 +290,22 @@ rxa_event_buf_get(struct event_eth_rx_adapter *rx_adapter, uint16_t eth_dev_id,

#define RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_ERR_RET(id, retval) do { \
if (!rxa_validate_id(id)) { \
RTE_EDEV_LOG_ERR("Invalid eth Rx adapter id = %d\n", id); \
RTE_EDEV_LOG_ERR("Invalid eth Rx adapter id = %d", id); \
return retval; \
} \
} while (0)

#define RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_GOTO_ERR_RET(id, retval) do { \
if (!rxa_validate_id(id)) { \
RTE_EDEV_LOG_ERR("Invalid eth Rx adapter id = %d\n", id); \
RTE_EDEV_LOG_ERR("Invalid eth Rx adapter id = %d", id); \
ret = retval; \
goto error; \
} \
} while (0)

#define RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, retval) do { \
if ((token) == NULL || strlen(token) == 0 || !isdigit(*token)) { \
RTE_EDEV_LOG_ERR("Invalid eth Rx adapter token\n"); \
RTE_EDEV_LOG_ERR("Invalid eth Rx adapter token"); \
ret = retval; \
goto error; \
} \
Expand Down Expand Up @@ -1534,7 +1534,7 @@ rxa_default_conf_cb(uint8_t id, uint8_t dev_id,
dev_conf.nb_event_ports += 1;
ret = rte_event_dev_configure(dev_id, &dev_conf);
if (ret) {
RTE_EDEV_LOG_ERR("failed to configure event dev %u\n",
RTE_EDEV_LOG_ERR("failed to configure event dev %u",
dev_id);
if (started) {
if (rte_event_dev_start(dev_id))
Expand All @@ -1545,7 +1545,7 @@ rxa_default_conf_cb(uint8_t id, uint8_t dev_id,

ret = rte_event_port_setup(dev_id, port_id, port_conf);
if (ret) {
RTE_EDEV_LOG_ERR("failed to setup event port %u\n",
RTE_EDEV_LOG_ERR("failed to setup event port %u",
port_id);
return ret;
}
Expand Down Expand Up @@ -1622,7 +1622,7 @@ rxa_create_intr_thread(struct event_eth_rx_adapter *rx_adapter)
if (!err)
return 0;

RTE_EDEV_LOG_ERR("Failed to create interrupt thread err = %d\n", err);
RTE_EDEV_LOG_ERR("Failed to create interrupt thread err = %d", err);
rte_free(rx_adapter->epoll_events);
error:
rte_ring_free(rx_adapter->intr_ring);
Expand All @@ -1638,12 +1638,12 @@ rxa_destroy_intr_thread(struct event_eth_rx_adapter *rx_adapter)

err = pthread_cancel(rx_adapter->rx_intr_thread);
if (err)
RTE_EDEV_LOG_ERR("Can't cancel interrupt thread err = %d\n",
RTE_EDEV_LOG_ERR("Can't cancel interrupt thread err = %d",
err);

err = pthread_join(rx_adapter->rx_intr_thread, NULL);
if (err)
RTE_EDEV_LOG_ERR("Can't join interrupt thread err = %d\n", err);
RTE_EDEV_LOG_ERR("Can't join interrupt thread err = %d", err);

rte_free(rx_adapter->epoll_events);
rte_ring_free(rx_adapter->intr_ring);
Expand Down Expand Up @@ -1909,7 +1909,7 @@ rxa_init_service(struct event_eth_rx_adapter *rx_adapter, uint8_t id)
if (rte_mbuf_dyn_rx_timestamp_register(
&event_eth_rx_timestamp_dynfield_offset,
&event_eth_rx_timestamp_dynflag) != 0) {
RTE_EDEV_LOG_ERR("Error registering timestamp field in mbuf\n");
RTE_EDEV_LOG_ERR("Error registering timestamp field in mbuf");
return -rte_errno;
}

Expand Down Expand Up @@ -2439,7 +2439,7 @@ rxa_create(uint8_t id, uint8_t dev_id,
RTE_DIM(default_rss_key));

if (rx_adapter->eth_devices == NULL) {
RTE_EDEV_LOG_ERR("failed to get mem for eth devices\n");
RTE_EDEV_LOG_ERR("failed to get mem for eth devices");
rte_free(rx_adapter);
return -ENOMEM;
}
Expand Down Expand Up @@ -3449,7 +3449,7 @@ handle_rxa_stats(const char *cmd __rte_unused,
/* Get Rx adapter stats */
if (rte_event_eth_rx_adapter_stats_get(rx_adapter_id,
&rx_adptr_stats)) {
RTE_EDEV_LOG_ERR("Failed to get Rx adapter stats\n");
RTE_EDEV_LOG_ERR("Failed to get Rx adapter stats");
return -1;
}

Expand Down Expand Up @@ -3486,7 +3486,7 @@ handle_rxa_stats_reset(const char *cmd __rte_unused,

/* Reset Rx adapter stats */
if (rte_event_eth_rx_adapter_stats_reset(rx_adapter_id)) {
RTE_EDEV_LOG_ERR("Failed to reset Rx adapter stats\n");
RTE_EDEV_LOG_ERR("Failed to reset Rx adapter stats");
return -1;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/eventdev/rte_event_eth_tx_adapter.c
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ txa_service_conf_cb(uint8_t __rte_unused id, uint8_t dev_id,

ret = rte_event_port_setup(dev_id, port_id, pc);
if (ret) {
RTE_EDEV_LOG_ERR("failed to setup event port %u\n",
RTE_EDEV_LOG_ERR("failed to setup event port %u",
port_id);
if (started) {
if (rte_event_dev_start(dev_id))
Expand Down
4 changes: 2 additions & 2 deletions lib/eventdev/rte_event_timer_adapter.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ default_port_conf_cb(uint16_t id, uint8_t event_dev_id, uint8_t *event_port_id,
dev_conf.nb_event_ports += 1;
ret = rte_event_dev_configure(dev_id, &dev_conf);
if (ret < 0) {
EVTIM_LOG_ERR("failed to configure event dev %u\n", dev_id);
EVTIM_LOG_ERR("failed to configure event dev %u", dev_id);
if (started)
if (rte_event_dev_start(dev_id))
return -EIO;
Expand All @@ -112,7 +112,7 @@ default_port_conf_cb(uint16_t id, uint8_t event_dev_id, uint8_t *event_port_id,

ret = rte_event_port_setup(dev_id, port_id, port_conf);
if (ret < 0) {
EVTIM_LOG_ERR("failed to setup event port %u on event dev %u\n",
EVTIM_LOG_ERR("failed to setup event port %u on event dev %u",
port_id, dev_id);
return ret;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/eventdev/rte_eventdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
dev = &rte_eventdevs[dev_id];

if (*dev->dev_ops->port_link == NULL) {
RTE_EDEV_LOG_ERR("Function not supported\n");
RTE_EDEV_LOG_ERR("Function not supported");
rte_errno = ENOTSUP;
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/metrics/rte_metrics_telemetry.c
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ rte_metrics_tel_stat_names_to_ids(const char * const *stat_names,
}
}
if (j == num_metrics) {
METRICS_LOG_WARN("Invalid stat name %s\n",
METRICS_LOG_WARN("Invalid stat name %s",
stat_names[i]);
free(names);
return -EINVAL;
Expand Down
6 changes: 3 additions & 3 deletions lib/net/rte_net_crc.c
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ avx512_vpclmulqdq_get_handlers(void)
max_simd_bitwidth >= RTE_VECT_SIMD_512)
return handlers_avx512;
#endif
NET_LOG(INFO, "Requirements not met, can't use AVX512\n");
NET_LOG(INFO, "Requirements not met, can't use AVX512");
return NULL;
}

Expand All @@ -205,7 +205,7 @@ sse42_pclmulqdq_get_handlers(void)
max_simd_bitwidth >= RTE_VECT_SIMD_128)
return handlers_sse42;
#endif
NET_LOG(INFO, "Requirements not met, can't use SSE\n");
NET_LOG(INFO, "Requirements not met, can't use SSE");
return NULL;
}

Expand All @@ -231,7 +231,7 @@ neon_pmull_get_handlers(void)
max_simd_bitwidth >= RTE_VECT_SIMD_128)
return handlers_neon;
#endif
NET_LOG(INFO, "Requirements not met, can't use NEON\n");
NET_LOG(INFO, "Requirements not met, can't use NEON");
return NULL;
}

Expand Down
4 changes: 2 additions & 2 deletions lib/node/ethdev_rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,13 @@ ethdev_ptype_setup(uint16_t port, uint16_t queue)

if (!l3_ipv4 || !l3_ipv6) {
node_info("ethdev_rx",
"Enabling ptype callback for required ptypes on port %u\n",
"Enabling ptype callback for required ptypes on port %u",
port);

if (!rte_eth_add_rx_callback(port, queue, eth_pkt_parse_cb,
NULL)) {
node_err("ethdev_rx",
"Failed to add rx ptype cb: port=%d, queue=%d\n",
"Failed to add rx ptype cb: port=%d, queue=%d",
port, queue);
return -EINVAL;
}
Expand Down

0 comments on commit d0ec6c1

Please sign in to comment.