[dpdk-dev] [PATCH 3/3] test/timer: enable unit test compilation always

Dharmik Thakkar dharmik.thakkar at arm.com
Thu Nov 29 21:31:12 CET 2018


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=timer,8

Suggested-by: Thomas Monjalon <thomas at monjalon.net>
Signed-off-by: Dharmik Thakkar <dharmik.thakkar at arm.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
Reviewed-by: Gavin Hu <gavin.hu at arm.com>
Reviewed-by: Phil Yang <phil.yang at arm.com>
---
 test/test/test_timer_racecond.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/test/test/test_timer_racecond.c b/test/test/test_timer_racecond.c
index d29048eaf1bf..5ac248b2d90b 100644
--- a/test/test/test_timer_racecond.c
+++ b/test/test/test_timer_racecond.c
@@ -44,8 +44,6 @@
 #include <rte_malloc.h>
 #include <rte_pause.h>
 
-#undef TEST_TIMER_RACECOND_VERBOSE
-
 #ifdef RTE_EXEC_ENV_LINUXAPP
 #define usec_delay(us) usleep(us)
 #else
@@ -70,13 +68,12 @@ 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
+	if (rte_log_get_level(RTE_LOGTYPE_TIMER) == RTE_LOG_DEBUG) {
+		if (tim == &timer[0])
+			printf("------------------------------------------------\n");
+		printf("%s: core %u timer %lu\n", __func__,
+			rte_lcore_id(), tim - timer);
+	}
 	(void)reload_timer(tim);
 }
 
@@ -96,10 +93,10 @@ 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_lcore_id(), tim - timer);
-#endif
+		if (rte_log_get_level(RTE_LOGTYPE_TIMER) == RTE_LOG_DEBUG) {
+			printf("- core %u failed to reset timer %lu (OK)\n",
+				rte_lcore_id(), tim - timer);
+		}
 		RTE_PER_LCORE(n_reset_collisions) += 1;
 	}
 	return ret;
-- 
2.17.1



More information about the dev mailing list