Libraries should not be reusing RTE_LOGTYPE_USER1 instead
of doing proper logtype registration.
Fixes: b70b56032bff ("reorder: new library")
Cc: sergio.gonzalez.mon...@intel.com
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
lib/reorder/rte_reorder.c | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/lib/reorder/rte_reorder.c b/lib/reorder/rte_reorder.c
index 385ee479da42..c9ae42e71783 100644
--- a/lib/reorder/rte_reorder.c
+++ b/lib/reorder/rte_reorder.c
@@ -27,7 +27,11 @@ EAL_REGISTER_TAILQ(rte_reorder_tailq)
#define RTE_REORDER_NAMESIZE 32
/* Macros for printing using RTE_LOG */
-#define RTE_LOGTYPE_REORDER RTE_LOGTYPE_USER1
+RTE_LOG_REGISTER_DEFAULT(reorder_logtype, INFO);
+
+#define REORDER_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, reorder_logtype, \
+ "%s(): " fmt "\n", __func__, ##args)
#define RTE_REORDER_SEQN_DYNFIELD_NAME "rte_reorder_seqn_dynfield"
int rte_reorder_seqn_dynfield_offset = -1;
@@ -62,26 +66,25 @@ rte_reorder_init(struct rte_reorder_buffer *b, unsigned int
bufsize,
(2 * size * sizeof(struct rte_mbuf *));
if (b == NULL) {
- RTE_LOG(ERR, REORDER, "Invalid reorder buffer parameter:"
- " NULL\n");
+ REORDER_LOG(ERR, "Invalid reorder buffer parameter: NULL");
rte_errno = EINVAL;
return NULL;
}
if (!rte_is_power_of_2(size)) {
- RTE_LOG(ERR, REORDER, "Invalid reorder buffer size"
- " - Not a power of 2\n");
+ REORDER_LOG(ERR,
+ "Invalid reorder buffer size - Not a power of 2");
rte_errno = EINVAL;
return NULL;
}
if (name == NULL) {
- RTE_LOG(ERR, REORDER, "Invalid reorder buffer name ptr:"
- " NULL\n");
+ REORDER_LOG(ERR, "Invalid reorder buffer name ptr: NULL");
rte_errno = EINVAL;
return NULL;
}
if (bufsize < min_bufsize) {
- RTE_LOG(ERR, REORDER, "Invalid reorder buffer memory size: %u, "
- "minimum required: %u\n", bufsize, min_bufsize);
+ REORDER_LOG(ERR,
+ "Invalid reorder buffer memory size: %u, minimum
required: %u",
+ bufsize, min_bufsize);
rte_errno = EINVAL;
return NULL;
}
@@ -116,14 +119,13 @@ rte_reorder_create(const char *name, unsigned socket_id,
unsigned int size)
/* Check user arguments. */
if (!rte_is_power_of_2(size)) {
- RTE_LOG(ERR, REORDER, "Invalid reorder buffer size"
- " - Not a power of 2\n");
+ REORDER_LOG(ERR,
+ "Invalid reorder buffer size - Not a power of 2");
rte_errno = EINVAL;
return NULL;
}
if (name == NULL) {
- RTE_LOG(ERR, REORDER, "Invalid reorder buffer name ptr:"
- " NULL\n");
+ REORDER_LOG(ERR, "Invalid reorder buffer name ptr: NULL");
rte_errno = EINVAL;
return NULL;
}
@@ -131,7 +133,8 @@ rte_reorder_create(const char *name, unsigned socket_id,
unsigned int size)
rte_reorder_seqn_dynfield_offset =
rte_mbuf_dynfield_register(&reorder_seqn_dynfield_desc);
if (rte_reorder_seqn_dynfield_offset < 0) {
- RTE_LOG(ERR, REORDER, "Failed to register mbuf field for
reorder sequence number\n");
+ REORDER_LOG(ERR,
+ "Failed to register mbuf field for reorder sequence
number");
rte_errno = ENOMEM;
return NULL;
}
@@ -150,7 +153,7 @@ rte_reorder_create(const char *name, unsigned socket_id,
unsigned int size)
/* allocate tailq entry */
te = rte_zmalloc("REORDER_TAILQ_ENTRY", sizeof(*te), 0);
if (te == NULL) {
- RTE_LOG(ERR, REORDER, "Failed to allocate tailq entry\n");
+ REORDER_LOG(ERR, "Failed to allocate tailq entry");
rte_errno = ENOMEM;
b = NULL;
goto exit;
@@ -159,7 +162,7 @@ rte_reorder_create(const char *name, unsigned socket_id,
unsigned int size)
/* Allocate memory to store the reorder buffer structure. */
b = rte_zmalloc_socket("REORDER_BUFFER", bufsize, 0, socket_id);
if (b == NULL) {
- RTE_LOG(ERR, REORDER, "Memzone allocation failed\n");
+ REORDER_LOG(ERR, "Memzone allocation failed");
rte_errno = ENOMEM;
rte_free(te);
} else {
--
2.39.1
