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.

Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
 lib/librte_eal/common/rte_service.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/librte_eal/common/rte_service.c 
b/lib/librte_eal/common/rte_service.c
index c3653ebae46c..aa2f8f3ef4b1 100644
--- a/lib/librte_eal/common/rte_service.c
+++ b/lib/librte_eal/common/rte_service.c
@@ -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;
 }
-- 
2.20.1

Reply via email to