From 1fa2c9e1080f09e2b1a07697b6949ed7a30001e0 Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Fri, 12 Jan 2018 10:27:17 +0000 Subject: [PATCH] service: add reset all attributes for service This commit introduces a new API, allowing the application to reset attributes of a service like the cycle count. Given this functionality is now exposed to the user, remove the resetting of stats during a dump() call. Signed-off-by: Harry van Haaren --- lib/librte_eal/common/include/rte_service.h | 12 +++++++++++ lib/librte_eal/common/rte_service.c | 24 +++++++++++++++------ lib/librte_eal/rte_eal_version.map | 1 + test/test/test_service_cores.c | 11 ++++++++++ 4 files changed, 42 insertions(+), 6 deletions(-) diff --git a/lib/librte_eal/common/include/rte_service.h b/lib/librte_eal/common/include/rte_service.h index 4898e76194..460dbbfe54 100644 --- a/lib/librte_eal/common/include/rte_service.h +++ b/lib/librte_eal/common/include/rte_service.h @@ -411,6 +411,18 @@ int32_t rte_service_dump(FILE *f, uint32_t id); int32_t rte_service_attr_get(uint32_t id, uint32_t attr_id, uint32_t *attr_value); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * Reset all attribute values of a service. + * + * @param id The service to reset all statistics of + * @retval 0 Successfully reset attributes + * -EINVAL Invalid service id provided + */ +int32_t rte_service_attr_reset_all(uint32_t id); + #ifdef __cplusplus } #endif diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c index 63db475970..1b54b7ec00 100644 --- a/lib/librte_eal/common/rte_service.c +++ b/lib/librte_eal/common/rte_service.c @@ -712,15 +712,27 @@ rte_service_dump_one(FILE *f, struct rte_service_spec_impl *s, if (s->calls != 0) calls = s->calls; + if (reset) { + s->cycles_spent = 0; + s->calls = 0; + return; + } + fprintf(f, " %s: stats %d\tcalls %"PRIu64"\tcycles %" PRIu64"\tavg: %"PRIu64"\n", s->spec.name, service_stats_enabled(s), s->calls, s->cycles_spent, s->cycles_spent / calls); +} - if (reset) { - s->cycles_spent = 0; - s->calls = 0; - } +int32_t +rte_service_attr_reset_all(uint32_t id) +{ + struct rte_service_spec_impl *s; + SERVICE_VALID_GET_OR_ERR_RET(id, s, -EINVAL); + + int reset = 1; + rte_service_dump_one(NULL, s, 0, reset); + return 0; } static void @@ -768,7 +780,7 @@ int32_t rte_service_dump(FILE *f, uint32_t id) for (i = 0; i < RTE_SERVICE_NUM_MAX; i++) { if (!service_valid(i)) continue; - uint32_t reset = 1; + uint32_t reset = 0; rte_service_dump_one(f, &rte_services[i], total_cycles, reset); } @@ -777,7 +789,7 @@ int32_t rte_service_dump(FILE *f, uint32_t id) if (lcore_config[i].core_role != ROLE_SERVICE) continue; - uint32_t reset = 1; + uint32_t reset = 0; service_dump_calls_per_lcore(f, i, reset); } diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map index 744de04694..3fa1e13244 100644 --- a/lib/librte_eal/rte_eal_version.map +++ b/lib/librte_eal/rte_eal_version.map @@ -217,6 +217,7 @@ EXPERIMENTAL { rte_eal_hotplug_add; rte_eal_hotplug_remove; rte_service_attr_get; + rte_service_attr_reset_all; rte_service_component_register; rte_service_component_unregister; rte_service_component_runstate_set; diff --git a/test/test/test_service_cores.c b/test/test/test_service_cores.c index a0768c967a..e510643f5e 100644 --- a/test/test/test_service_cores.c +++ b/test/test/test_service_cores.c @@ -242,6 +242,9 @@ service_name(void) static int service_attr_get(void) { + /* ensure all services unregistered so cycle counts are zero */ + unregister_all(); + struct rte_service_spec service; memset(&service, 0, sizeof(struct rte_service_spec)); service.callback = dummy_cb; @@ -295,6 +298,14 @@ service_attr_get(void) rte_service_lcore_stop(slcore_id); + TEST_ASSERT_EQUAL(0, rte_service_attr_reset_all(id), + "Valid attr_reset_all() return success"); + + TEST_ASSERT_EQUAL(0, rte_service_attr_get(id, attr_id, &attr_value), + "Valid attr_get() call didn't return success"); + TEST_ASSERT_EQUAL(0, attr_value, + "attr_get() call didn't set correct cycles (zero)"); + return unregister_all(); } -- 2.20.1