Skip to contentSkip to conversation

service: print errors to rte log

PATCH In review Stephen Hemminger 3 participants 4 messages Aug 20, 2019 – Oct 15, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 service: print errors to rte log

EAL should always use rte_log instead of putting errors to stderr (which maybe redirected to /dev/null in a daemon).

Also checks for null before rte_free are unnecessary.

---
 lib/librte_eal/common/rte_service.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)
lib/librte_eal/common/rte_service.c +11 -12
index c3653ebae46c..aa2f8f3ef4b1 100644
@@ -70,10 +70,12 @@ static struct rte_service_spec_impl *rte_services;
 static struct core_state *lcore_states;
 static uint32_t rte_service_library_initialized;
 
+
 int32_t rte_service_init(void)
 {
 	if (rte_service_library_initialized) {
-		printf("service library init() called, init flag %d\n",
+		RTE_LOG(NOTICE, EAL,
+			"service library init() called, init flag %d\n",
 			rte_service_library_initialized);
 		return -EALREADY;
 	}
@@ -82,14 +84,16 @@ int32_t rte_service_init(void)
 			sizeof(struct rte_service_spec_impl),
 			RTE_CACHE_LINE_SIZE);
 	if (!rte_services) {
-		printf("error allocating rte services array\n");
+		RTE_LOG(ERR, EAL,
+			"error allocating rte services array\n");
 		goto fail_mem;
 	}
 
 	lcore_states = rte_calloc("rte_service_core_states", RTE_MAX_LCORE,
 			sizeof(struct core_state), RTE_CACHE_LINE_SIZE);
 	if (!lcore_states) {
-		printf("error allocating core states array\n");
+		RTE_LOG(ERR, EAL,
+			"error allocating core states array\n");
 		goto fail_mem;
 	}
 
@@ -108,10 +112,8 @@ int32_t rte_service_init(void)
 	rte_service_library_initialized = 1;
 	return 0;
 fail_mem:
-	if (rte_services)
-		rte_free(rte_services);
-	if (lcore_states)
-		rte_free(lcore_states);
+	rte_free(rte_services);
+	rte_free(lcore_states);
 	return -ENOMEM;
 }
 
@@ -121,11 +123,8 @@ rte_service_finalize(void)
 	if (!rte_service_library_initialized)
 		return;
 
-	if (rte_services)
-		rte_free(rte_services);
-
-	if (lcore_states)
-		rte_free(lcore_states);
+	rte_free(rte_services);
+	rte_free(lcore_states);
 
 	rte_service_library_initialized = 0;
 }
Signature · 1 line
2.20.1
#1 lore raw
Quoted 7 lines

-----Original Message-----
From: Stephen Hemminger [mailto:[email protected]]
Sent: Wednesday, August 21, 2019 12:33 AM
To: Van Haaren, Harry <[email protected]>
Cc: [email protected]; Stephen Hemminger <[email protected]>
Subject: [PATCH] service: print errors to rte log

Quoted 6 lines

EAL should always use rte_log instead of putting errors to stderr (which maybe redirected to /dev/null in a daemon).

Also checks for null before rte_free are unnecessary.

Thanks - good improvements.

A few nit-picks, I'll send a v2 based on your changes here with the below notes implemented.

I'll add my Sign-off for code changes, and Acked-by for the whole, hope that's OK, if you'd prefer two different patches just let me know.

-H

Quoted 10 lines
---
 lib/librte_eal/common/rte_service.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)
lib/librte_eal/common/rte_service.c +0 -0
index c3653ebae46c..aa2f8f3ef4b1 100644

lib/librte_eal/common/rte_service.c static struct rte_service_spec_impl *rte_services; · line 75

Quoted 6 lines
lib/librte_eal/common/rte_service.c +1 -0
@@ -70,10 +70,12 @@ static struct rte_service_spec_impl *rte_services;
 static struct core_state *lcore_states;
 static uint32_t rte_service_library_initialized;
 
+
 int32_t rte_service_init(void)
 {

Added line here should really split return-value and function into two lines. Found another instance of this, splitting that too to make the whole file consistent.

Rest of file uses 1 line to split variable declarations and functions, so one line will do.

<snip>

lib/librte_eal/common/rte_service.c int32_t rte_service_init(void) · line 89

Quoted 5 lines
lib/librte_eal/common/rte_service.c +2 -1
 	if (!rte_services) {
-		printf("error allocating rte services array\n");
+		RTE_LOG(ERR, EAL,
+			"error allocating rte services array\n");
 		goto fail_mem;

Some of these "strings" can be on the same line as RTE_LOG and stay inside the 80 char limit, moving them up a line for consistency.

#2 lore raw

PATCH v2 1/1 service: print errors to rte log

In reply to Stephen Hemminger

From: Stephen Hemminger <[email protected]>

EAL should always use rte_log instead of putting errors to stderr (which maybe redirected to /dev/null in a daemon).

Also checks for null before rte_free are unnecessary. Minor code consistency improvements.

---
 lib/librte_eal/common/rte_service.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)
lib/librte_eal/common/rte_service.c +12 -15
index c3653ebae..fe0907720 100644
@@ -70,10 +70,12 @@ static struct rte_service_spec_impl *rte_services;
 static struct core_state *lcore_states;
 static uint32_t rte_service_library_initialized;
 
-int32_t rte_service_init(void)
+int32_t
+rte_service_init(void)
 {
 	if (rte_service_library_initialized) {
-		printf("service library init() called, init flag %d\n",
+		RTE_LOG(NOTICE, EAL,
+			"service library init() called, init flag %d\n",
 			rte_service_library_initialized);
 		return -EALREADY;
 	}
@@ -82,14 +84,14 @@ int32_t rte_service_init(void)
 			sizeof(struct rte_service_spec_impl),
 			RTE_CACHE_LINE_SIZE);
 	if (!rte_services) {
-		printf("error allocating rte services array\n");
+		RTE_LOG(ERR, EAL, "error allocating rte services array\n");
 		goto fail_mem;
 	}
 
 	lcore_states = rte_calloc("rte_service_core_states", RTE_MAX_LCORE,
 			sizeof(struct core_state), RTE_CACHE_LINE_SIZE);
 	if (!lcore_states) {
-		printf("error allocating core states array\n");
+		RTE_LOG(ERR, EAL, "error allocating core states array\n");
 		goto fail_mem;
 	}
 
@@ -108,10 +110,8 @@ int32_t rte_service_init(void)
 	rte_service_library_initialized = 1;
 	return 0;
 fail_mem:
-	if (rte_services)
-		rte_free(rte_services);
-	if (lcore_states)
-		rte_free(lcore_states);
+	rte_free(rte_services);
+	rte_free(lcore_states);
 	return -ENOMEM;
 }
 
@@ -121,11 +121,8 @@ rte_service_finalize(void)
 	if (!rte_service_library_initialized)
 		return;
 
-	if (rte_services)
-		rte_free(rte_services);
-
-	if (lcore_states)
-		rte_free(lcore_states);
+	rte_free(rte_services);
+	rte_free(lcore_states);
 
 	rte_service_library_initialized = 0;
 }
@@ -397,8 +394,8 @@ rte_service_may_be_active(uint32_t id)
 	return 0;
 }
 
-int32_t rte_service_run_iter_on_app_lcore(uint32_t id,
-		uint32_t serialize_mt_unsafe)
+int32_t
+rte_service_run_iter_on_app_lcore(uint32_t id, uint32_t serialize_mt_unsafe)
 {
 	/* run service on calling core, using all-ones as the service mask */
 	if (!service_valid(id))
Signature · 1 line
2.17.1
#3 lore raw
Quoted 8 lines · Harry van Haaren

From: Stephen Hemminger <[email protected]>

EAL should always use rte_log instead of putting errors to stderr (which maybe redirected to /dev/null in a daemon).

Also checks for null before rte_free are unnecessary. Minor code consistency improvements.

Fixes 21698354c832 ("service: introduce service cores concept")
Quoted 4 lines

Applied, thanks.

Signature · 1 line
David Marchand