EAL logtype should be reserved for EAL library.
This example is already has a log wrapper so use it.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
Acked-by: Huisong Li <lihuis...@huawei.com>
Acked-by: Morten Brørup <m...@smartsharesystems.com>
---
examples/l2fwd-keepalive/main.c | 2 --
examples/l2fwd-keepalive/shm.c | 29 ++++++++++++-----------------
examples/l2fwd-keepalive/shm.h | 5 +++++
3 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c
index 1463cef0fc2e..dca944fc173f 100644
--- a/examples/l2fwd-keepalive/main.c
+++ b/examples/l2fwd-keepalive/main.c
@@ -41,8 +41,6 @@
#include "shm.h"
-#define RTE_LOGTYPE_L2FWD RTE_LOGTYPE_USER1
-
#define NB_MBUF_PER_PORT 3000
#define MAX_PKT_BURST 32
diff --git a/examples/l2fwd-keepalive/shm.c b/examples/l2fwd-keepalive/shm.c
index 7c7a9ea8ea3c..8e8c9c9c4e83 100644
--- a/examples/l2fwd-keepalive/shm.c
+++ b/examples/l2fwd-keepalive/shm.c
@@ -5,7 +5,6 @@
#include <time.h>
#include <rte_common.h>
-#include <rte_log.h>
#include <rte_keepalive.h>
#include "shm.h"
@@ -22,34 +21,30 @@ struct rte_keepalive_shm *rte_keepalive_shm_create(void)
* will get the new block mapped below.
*/
if (shm_unlink(RTE_KEEPALIVE_SHM_NAME) == -1 && errno != ENOENT)
- printf("Warning: Error unlinking stale %s (%s)\n",
+ RTE_LOG(NOTICE, L2FWD,
+ "Warning: Error unlinking stale %s (%s)\n",
RTE_KEEPALIVE_SHM_NAME, strerror(errno));
fd = shm_open(RTE_KEEPALIVE_SHM_NAME,
O_CREAT | O_TRUNC | O_RDWR, 0666);
if (fd < 0)
- RTE_LOG(INFO, EAL,
- "Failed to open %s as SHM (%s)\n",
- RTE_KEEPALIVE_SHM_NAME,
- strerror(errno));
+ RTE_LOG(ERR, L2FWD, "Failed to open %s as SHM (%s)\n",
+ RTE_KEEPALIVE_SHM_NAME, strerror(errno));
else if (ftruncate(fd, sizeof(struct rte_keepalive_shm)) != 0)
- RTE_LOG(INFO, EAL,
- "Failed to resize SHM (%s)\n", strerror(errno));
+ RTE_LOG(ERR, L2FWD, "Failed to resize SHM (%s)\n",
strerror(errno));
else {
ka_shm = (struct rte_keepalive_shm *) mmap(
0, sizeof(struct rte_keepalive_shm),
PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
close(fd);
if (ka_shm == MAP_FAILED)
- RTE_LOG(INFO, EAL,
- "Failed to mmap SHM (%s)\n", strerror(errno));
+ RTE_LOG(ERR, L2FWD, "Failed to mmap SHM (%s)\n",
strerror(errno));
else {
memset(ka_shm, 0, sizeof(struct rte_keepalive_shm));
/* Initialize the semaphores for IPC/SHM use */
if (sem_init(&ka_shm->core_died, 1, 0) != 0) {
- RTE_LOG(INFO, EAL,
- "Failed to setup SHM semaphore (%s)\n",
+ RTE_LOG(ERR, L2FWD, "Failed to setup SHM
semaphore (%s)\n",
strerror(errno));
munmap(ka_shm,
sizeof(struct rte_keepalive_shm));
@@ -87,7 +82,7 @@ void rte_keepalive_relayed_state(struct rte_keepalive_shm
*shm,
* ka_agent is not active.
*/
if (sem_getvalue(&shm->core_died, &count) == -1) {
- RTE_LOG(INFO, EAL, "Semaphore check failed(%s)\n",
+ RTE_LOG(ERR, L2FWD, "Semaphore check failed(%s)\n",
strerror(errno));
return;
}
@@ -95,8 +90,7 @@ void rte_keepalive_relayed_state(struct rte_keepalive_shm
*shm,
return;
if (sem_post(&shm->core_died) != 0)
- RTE_LOG(INFO, EAL,
- "Failed to increment semaphore (%s)\n",
+ RTE_LOG(ERR, L2FWD, "Failed to increment semaphore
(%s)\n",
strerror(errno));
}
}
@@ -104,9 +98,10 @@ void rte_keepalive_relayed_state(struct rte_keepalive_shm
*shm,
void rte_keepalive_shm_cleanup(struct rte_keepalive_shm *ka_shm)
{
if (shm_unlink(RTE_KEEPALIVE_SHM_NAME) == -1 && errno != ENOENT)
- printf("Warning: Error unlinking %s (%s)\n",
+ RTE_LOG(NOTICE, L2FWD, "Warning: Error unlinking %s (%s)\n",
RTE_KEEPALIVE_SHM_NAME, strerror(errno));
if (ka_shm && munmap(ka_shm, sizeof(struct rte_keepalive_shm)) != 0)
- printf("Warning: munmap() failed\n");
+ RTE_LOG(ERR, L2FWD, "Warning: munmap() failed: %s \n",
+ strerror(errno));
}
diff --git a/examples/l2fwd-keepalive/shm.h b/examples/l2fwd-keepalive/shm.h
index 7a9d597295e0..d6941e25b3d7 100644
--- a/examples/l2fwd-keepalive/shm.h
+++ b/examples/l2fwd-keepalive/shm.h
@@ -7,13 +7,18 @@
#define RTE_KEEPALIVE_SHM_ALIVE 1
#define RTE_KEEPALIVE_SHM_DEAD 2
+
#include <fcntl.h>
#include <string.h>
#include <unistd.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <semaphore.h>
+
#include <rte_keepalive.h>
+#include <rte_log.h>
+
+#define RTE_LOGTYPE_L2FWD RTE_LOGTYPE_USER1
/**
* Keepalive SHM structure.
--
2.43.0
