[2/3] examples/l2fwd-keepalive: don't use EAL logtype

Message ID 20231211172437.61958-3-stephen@networkplumber.org (mailing list archive)
State Superseded, archived
Delegated to: David Marchand
Headers
Series replace use of EAL logtype |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Stephen Hemminger Dec. 11, 2023, 5:23 p.m. UTC
  EAL logtype should be reserved for EAL library.
This example is already using printf() so just print
errors to stderr.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 examples/l2fwd-keepalive/shm.c | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)
  

Comments

lihuisong (C) Dec. 12, 2023, 11:53 a.m. UTC | #1
Acked-by: Huisong Li <lihuisong@huawei.com>

在 2023/12/12 1:23, Stephen Hemminger 写道:
> EAL logtype should be reserved for EAL library.
> This example is already using printf() so just print
> errors to stderr.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
>   examples/l2fwd-keepalive/shm.c | 21 +++++++--------------
>   1 file changed, 7 insertions(+), 14 deletions(-)
>
> diff --git a/examples/l2fwd-keepalive/shm.c b/examples/l2fwd-keepalive/shm.c
> index 7c7a9ea8ea3c..cbeeb511ef07 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"
> @@ -28,28 +27,23 @@ struct rte_keepalive_shm *rte_keepalive_shm_create(void)
>   	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));
> +		fprintf(stderr, "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));
> +		fprintf(stderr, "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));
> +			fprintf(stderr, "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",
> +				fprintf(stderr, "Failed to setup SHM semaphore (%s)\n",
>   					strerror(errno));
>   				munmap(ka_shm,
>   					sizeof(struct rte_keepalive_shm));
> @@ -87,7 +81,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",
> +			fprintf(stderr, "Semaphore check failed(%s)\n",
>   				strerror(errno));
>   			return;
>   		}
> @@ -95,8 +89,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",
> +			fprintf(stderr, "Failed to increment semaphore (%s)\n",
>   				strerror(errno));
>   	}
>   }
  

Patch

diff --git a/examples/l2fwd-keepalive/shm.c b/examples/l2fwd-keepalive/shm.c
index 7c7a9ea8ea3c..cbeeb511ef07 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"
@@ -28,28 +27,23 @@  struct rte_keepalive_shm *rte_keepalive_shm_create(void)
 	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));
+		fprintf(stderr, "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));
+		fprintf(stderr, "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));
+			fprintf(stderr, "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",
+				fprintf(stderr, "Failed to setup SHM semaphore (%s)\n",
 					strerror(errno));
 				munmap(ka_shm,
 					sizeof(struct rte_keepalive_shm));
@@ -87,7 +81,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",
+			fprintf(stderr, "Semaphore check failed(%s)\n",
 				strerror(errno));
 			return;
 		}
@@ -95,8 +89,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",
+			fprintf(stderr, "Failed to increment semaphore (%s)\n",
 				strerror(errno));
 	}
 }