From 1ae40fdb8aed54eb9fe45977833fcc1abcb225ab Mon Sep 17 00:00:00 2001 From: Dharmik Thakkar Date: Tue, 26 Feb 2019 17:02:29 -0600 Subject: [PATCH] test/timer: replace config macro with runtime log level This patch replaces macro with log-level based approach to print debug information. Need to set timer log type to debug using the following eal parameter: --log-level=test.timer:debug Suggested-by: Thomas Monjalon Signed-off-by: Dharmik Thakkar Reviewed-by: Honnappa Nagarahalli Reviewed-by: Gavin Hu Reviewed-by: Phil Yang Reviewed-by: Ferruh Yigit --- app/test/test_timer_racecond.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/app/test/test_timer_racecond.c b/app/test/test_timer_racecond.c index 1edb44444f..a9e1daf16b 100644 --- a/app/test/test_timer_racecond.c +++ b/app/test/test_timer_racecond.c @@ -44,8 +44,6 @@ #include #include -#undef TEST_TIMER_RACECOND_VERBOSE - #ifdef RTE_EXEC_ENV_LINUX #define usec_delay(us) usleep(us) #else @@ -65,18 +63,23 @@ static volatile unsigned stop_slaves; static int reload_timer(struct rte_timer *tim); +int timer_logtype_test; + +RTE_INIT(test_timer_init_log) +{ + timer_logtype_test = rte_log_register("test.timer"); +} + static void timer_cb(struct rte_timer *tim, void *arg __rte_unused) { /* Simulate slow callback function, 100 us. */ rte_delay_us(100); - -#ifdef TEST_TIMER_RACECOND_VERBOSE if (tim == &timer[0]) - printf("------------------------------------------------\n"); - printf("timer_cb: core %u timer %lu\n", - rte_lcore_id(), tim - timer); -#endif + rte_log(RTE_LOG_DEBUG, timer_logtype_test, + "------------------------------------------------\n"); + rte_log(RTE_LOG_DEBUG, timer_logtype_test, "%s: core %u timer %" + PRIuPTR "\n", __func__, rte_lcore_id(), tim - timer); (void)reload_timer(tim); } @@ -96,10 +99,9 @@ reload_timer(struct rte_timer *tim) ret = rte_timer_reset(tim, ticks, PERIODICAL, master, timer_cb, NULL); if (ret != 0) { -#ifdef TEST_TIMER_RACECOND_VERBOSE - printf("- core %u failed to reset timer %lu (OK)\n", + rte_log(RTE_LOG_DEBUG, timer_logtype_test, + "- core %u failed to reset timer %" PRIuPTR " (OK)\n", rte_lcore_id(), tim - timer); -#endif RTE_PER_LCORE(n_reset_collisions) += 1; } return ret; -- 2.20.1