The logtype for ring only used in library.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h | 2 +-
lib/ring/rte_ring.c | 31 +++++++++++++++++++------------
3 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 7dbf1df3b979..04c9d43351da 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -349,7 +349,6 @@ struct logtype {
static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL, "lib.eal"},
- {RTE_LOGTYPE_RING, "lib.ring"},
{RTE_LOGTYPE_MEMPOOL, "lib.mempool"},
{RTE_LOGTYPE_PMD, "pmd"},
{RTE_LOGTYPE_HASH, "lib.hash"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 5b7850af4e2b..a99fe383c89b 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -28,7 +28,7 @@ extern "C" {
/* SDK log type */
#define RTE_LOGTYPE_EAL 0 /**< Log related to eal. */
/* was RTE_LOGTYPE_MALLOC */
-#define RTE_LOGTYPE_RING 2 /**< Log related to ring. */
+ /* was RTE_LOGTYPE_RING */
#define RTE_LOGTYPE_MEMPOOL 3 /**< Log related to mempool. */
/* was RTE_LOGTYPE_TIMER */
#define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver. */
diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c
index cddaf6b2876f..1b4633468a2a 100644
--- a/lib/ring/rte_ring.c
+++ b/lib/ring/rte_ring.c
@@ -26,6 +26,13 @@
#include "rte_ring.h"
#include "rte_ring_elem.h"
+RTE_LOG_REGISTER_DEFAULT(ring_logtype, INFO);
+
+#define RING_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, ring_logtype, \
+ "%s(): " fmt "\n", __func__, ##args)
+
+
TAILQ_HEAD(rte_ring_list, rte_tailq_entry);
static struct rte_tailq_elem rte_ring_tailq = {
@@ -52,15 +59,15 @@ rte_ring_get_memsize_elem(unsigned int esize, unsigned int
count)
/* Check if element size is a multiple of 4B */
if (esize % 4 != 0) {
- RTE_LOG(ERR, RING, "element size is not a multiple of 4\n");
+ RING_LOG(ERR, "element size is not a multiple of 4");
return -EINVAL;
}
/* count must be a power of 2 */
if ((!POWEROF2(count)) || (count > RTE_RING_SZ_MASK )) {
- RTE_LOG(ERR, RING,
- "Requested number of elements is invalid, must be power
of 2, and not exceed %u\n",
+ RING_LOG(ERR,
+ "Requested number of elements is invalid, must be power
of 2, and not exceed %u",
RTE_RING_SZ_MASK);
return -EINVAL;
@@ -195,8 +202,8 @@ rte_ring_init(struct rte_ring *r, const char *name,
unsigned int count,
/* future proof flags, only allow supported values */
if (flags & ~RING_F_MASK) {
- RTE_LOG(ERR, RING,
- "Unsupported flags requested %#x\n", flags);
+ RING_LOG(ERR,
+ "Unsupported flags requested %#x", flags);
return -EINVAL;
}
@@ -216,8 +223,8 @@ rte_ring_init(struct rte_ring *r, const char *name,
unsigned int count,
r->capacity = count;
} else {
if ((!POWEROF2(count)) || (count > RTE_RING_SZ_MASK)) {
- RTE_LOG(ERR, RING,
- "Requested size is invalid, must be power of 2,
and not exceed the size limit %u\n",
+ RING_LOG(ERR,
+ "Requested size is invalid, must be power of 2,
and not exceed the size limit %u",
RTE_RING_SZ_MASK);
return -EINVAL;
}
@@ -271,7 +278,7 @@ rte_ring_create_elem(const char *name, unsigned int esize,
unsigned int count,
te = rte_zmalloc("RING_TAILQ_ENTRY", sizeof(*te), 0);
if (te == NULL) {
- RTE_LOG(ERR, RING, "Cannot reserve memory for tailq\n");
+ RING_LOG(ERR, "Cannot reserve memory for tailq");
rte_errno = ENOMEM;
return NULL;
}
@@ -295,7 +302,7 @@ rte_ring_create_elem(const char *name, unsigned int esize,
unsigned int count,
TAILQ_INSERT_TAIL(ring_list, te, next);
} else {
r = NULL;
- RTE_LOG(ERR, RING, "Cannot reserve memory\n");
+ RING_LOG(ERR, "Cannot reserve memory");
rte_free(te);
}
rte_mcfg_tailq_write_unlock();
@@ -327,13 +334,13 @@ rte_ring_free(struct rte_ring *r)
* therefore, there is no memzone to free.
*/
if (r->memzone == NULL) {
- RTE_LOG(ERR, RING,
- "Cannot free ring, not created with
rte_ring_create()\n");
+ RING_LOG(ERR,
+ "Cannot free ring, not created with
rte_ring_create()");
return;
}
if (rte_memzone_free(r->memzone) != 0) {
- RTE_LOG(ERR, RING, "Cannot free memory\n");
+ RING_LOG(ERR, "Cannot free memory");
return;
}
--
2.39.1
