Convert from RTE_LOGTYPE_MEMPOOL to logtype_mempool.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h | 2 +-
lib/mempool/rte_mempool.c | 2 ++
lib/mempool/rte_mempool.h | 8 ++++++++
lib/mempool/version.map | 3 +++
5 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 5f15e312f15b..4025d2039d55 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_MEMPOOL, "lib.mempool"},
{RTE_LOGTYPE_PMD, "pmd"},
{RTE_LOGTYPE_HASH, "lib.hash"},
{RTE_LOGTYPE_LPM, "lib.lpm"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 31a2ee2f6b6f..9f86bfdd0198 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -29,7 +29,7 @@ extern "C" {
#define RTE_LOGTYPE_EAL 0 /**< Log related to eal. */
/* was RTE_LOGTYPE_MALLOC */
/* was RTE_LOGTYPE_RING */
-#define RTE_LOGTYPE_MEMPOOL 3 /**< Log related to mempool. */
+ /* was RTE_LOGTYPE_MEMPOOL */
/* was RTE_LOGTYPE_TIMER */
#define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver. */
#define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */
diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
index cf5dea2304a7..b609a94fdf9d 100644
--- a/lib/mempool/rte_mempool.c
+++ b/lib/mempool/rte_mempool.c
@@ -31,6 +31,8 @@
#include "mempool_trace.h"
#include "rte_mempool.h"
+RTE_LOG_REGISTER_DEFAULT(rte_mempool_logtype, INFO);
+
TAILQ_HEAD(rte_mempool_list, rte_tailq_entry);
static struct rte_tailq_elem rte_mempool_tailq = {
diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
index 9f530db24ba1..db01acc19b02 100644
--- a/lib/mempool/rte_mempool.h
+++ b/lib/mempool/rte_mempool.h
@@ -43,6 +43,7 @@
#include <rte_spinlock.h>
#include <rte_debug.h>
#include <rte_lcore.h>
+#include <rte_log.h>
#include <rte_branch_prediction.h>
#include <rte_ring.h>
#include <rte_memcpy.h>
@@ -175,6 +176,13 @@ struct rte_mempool_objtlr {
#endif
+
+/**
+ * @internal Logtype used for mempool related messages.
+ */
+extern int rte_mempool_logtype;
+#define RTE_LOGTYPE_MEMPOOL rte_mempool_logtype
+
/**
* A list of memory where objects are stored
*/
diff --git a/lib/mempool/version.map b/lib/mempool/version.map
index dff2d1cb5555..eb2c12127560 100644
--- a/lib/mempool/version.map
+++ b/lib/mempool/version.map
@@ -57,4 +57,7 @@ INTERNAL {
# added in 21.11
rte_mempool_event_callback_register;
rte_mempool_event_callback_unregister;
+
+ # added in 23.07
+ rte_mempool_logtype;
};
--
2.39.2
