[v4,3/3] test/timer: enable unit test compilation always

Message ID 20190226230229.25450-4-dharmik.thakkar@arm.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series Replace compilation time options with log level |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Dharmik Thakkar Feb. 26, 2019, 11:02 p.m. UTC
  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 <thomas@monjalon.net>
Signed-off-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Reviewed-by: Gavin Hu <gavin.hu@arm.com>
Reviewed-by: Phil Yang <phil.yang@arm.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
v4:
 * change to dynamic logging (Stephen Hemminger)
---
v3:
 * Resolve coding style issues
---
v2:
 * Add Reviewed-by tag
---
 test/test/test_timer_racecond.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)
  

Patch

diff --git a/test/test/test_timer_racecond.c b/test/test/test_timer_racecond.c
index d29048eaf1bf..62b73f886a1f 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
@@ -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 %lu\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 %lu (OK)\n",
 			rte_lcore_id(), tim - timer);
-#endif
 		RTE_PER_LCORE(n_reset_collisions) += 1;
 	}
 	return ret;