service: use id in service stats functions

This commit reworks the statistics functions to use integer ids
for services instead of pointers. Passing UINT32_MAX to the dump
function prints all info, similar to passing NULL previously.

Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
Acked-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>

diff --git a/lib/librte_eal/common/include/rte_service.h b/lib/librte_eal/common/include/rte_service.h
index 446557b..59b21c6 100644 (file)
--- a/lib/librte_eal/common/include/rte_service.h
+++ b/lib/librte_eal/common/include/rte_service.h
@@ -318,13 +318,12 @@ int32_t rte_service_lcore_reset_all(void);
  * Enable or disable statistics collection for *service*.
  *
  * This function enables per core, per-service cycle count collection.
- * @param service The service to enable statistics gathering on.
+ * @param id The service to enable statistics gathering on.
  * @param enable Zero to disable statistics, non-zero to enable.
  * @retval 0 Success
  * @retval -EINVAL Invalid service pointer passed
  */
-int32_t rte_service_set_stats_enable(struct rte_service_spec *service,
-                                 int32_t enable);
+int32_t rte_service_set_stats_enable(uint32_t id, int32_t enable);
 
 /**
  * @warning
@@ -364,10 +363,13 @@ int32_t rte_service_lcore_count_services(uint32_t lcore);
  * @warning
  * @b EXPERIMENTAL: this API may change without prior notice
  *
- * Dumps any information available about the service. If service is NULL,
- * dumps info for all services.
+ * Dumps any information available about the service. When id is UINT32_MAX,
+ * this function dumps info for all services.
+ *
+ * @retval 0 Statistics have been successfully dumped
+ * @retval -EINVAL Invalid service id provided
  */
-int32_t rte_service_dump(FILE *f, struct rte_service_spec *service);
+int32_t rte_service_dump(FILE *f, uint32_t id);
 
 #ifdef __cplusplus
 }

diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c
index b045e20..bf2fd4b 100644 (file)
--- a/lib/librte_eal/common/rte_service.c
+++ b/lib/librte_eal/common/rte_service.c
@@ -166,18 +166,15 @@ service_mt_safe(struct rte_service_spec_impl *s)
        return s->spec.capabilities & RTE_SERVICE_CAP_MT_SAFE;
 }
 
-int32_t rte_service_set_stats_enable(struct rte_service_spec *service,
-                                 int32_t enabled)
+int32_t rte_service_set_stats_enable(uint32_t id, int32_t enabled)
 {
-       struct rte_service_spec_impl *impl =
-               (struct rte_service_spec_impl *)service;
-       if (!impl)
-               return -EINVAL;
+       struct rte_service_spec_impl *s;
+       SERVICE_VALID_GET_OR_ERR_RET(id, s, 0);
 
        if (enabled)
-               impl->internal_flags |= SERVICE_F_STATS_ENABLED;
+               s->internal_flags |= SERVICE_F_STATS_ENABLED;
        else
-               impl->internal_flags &= ~(SERVICE_F_STATS_ENABLED);
+               s->internal_flags &= ~(SERVICE_F_STATS_ENABLED);
 
        return 0;
 }
@@ -683,9 +680,10 @@ service_dump_calls_per_lcore(FILE *f, uint32_t lcore, uint32_t reset)
        fprintf(f, "\n");
 }
 
-int32_t rte_service_dump(FILE *f, struct rte_service_spec *service)
+int32_t rte_service_dump(FILE *f, uint32_t id)
 {
        uint32_t i;
+       int print_one = (id != UINT32_MAX);
 
        uint64_t total_cycles = 0;
        for (i = 0; i < rte_service_count; i++) {
@@ -694,15 +692,17 @@ int32_t rte_service_dump(FILE *f, struct rte_service_spec *service)
                total_cycles += rte_services[i].cycles_spent;
        }
 
-       if (service) {
-               struct rte_service_spec_impl *s =
-                       (struct rte_service_spec_impl *)service;
+       /* print only the specified service */
+       if (print_one) {
+               struct rte_service_spec_impl *s;
+               SERVICE_VALID_GET_OR_ERR_RET(id, s, -EINVAL);
                fprintf(f, "Service %s Summary\n", s->spec.name);
                uint32_t reset = 0;
                rte_service_dump_one(f, s, total_cycles, reset);
                return 0;
        }
 
+       /* print all services, as UINT32_MAX was passed as id */
        fprintf(f, "Services Summary\n");
        for (i = 0; i < rte_service_count; i++) {
                uint32_t reset = 1;

diff --git a/test/test/test_service_cores.c b/test/test/test_service_cores.c
index 196277b..d52fe49 100644 (file)
--- a/test/test/test_service_cores.c
+++ b/test/test/test_service_cores.c
@@ -265,11 +265,11 @@ service_name(void)
 static int
 service_dump(void)
 {
-       struct rte_service_spec *service = rte_service_get_by_id(0);
-       rte_service_set_stats_enable(service, 1);
-       rte_service_dump(stdout, service);
-       rte_service_set_stats_enable(service, 0);
-       rte_service_dump(stdout, service);
+       const uint32_t sid = 0;
+       rte_service_set_stats_enable(sid, 1);
+       rte_service_dump(stdout, 0);
+       rte_service_set_stats_enable(sid, 0);
+       rte_service_dump(stdout, 0);
        return unregister_all();
 }