X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=app%2Ftest%2Ftest_timer_racecond.c;h=a9e1daf16bf4922ffd2e885aed3691ee793deb0c;hb=e2157164410417d1f10d3fe003bc44122b17097f;hp=7824ec4bf6191f9b76300102e5f20d44d51811ba;hpb=26e09db6cb5fd9bbf0feb928561af9932694574b;p=dpdk.git

diff --git a/app/test/test_timer_racecond.c b/app/test/test_timer_racecond.c
index 7824ec4bf6..a9e1daf16b 100644
--- a/app/test/test_timer_racecond.c
+++ b/app/test/test_timer_racecond.c
@@ -42,10 +42,9 @@
 #include <rte_lcore.h>
 #include <rte_random.h>
 #include <rte_malloc.h>
+#include <rte_pause.h>
 
-#undef TEST_TIMER_RACECOND_VERBOSE
-
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
 #define usec_delay(us) usleep(us)
 #else
 #define usec_delay(us) rte_delay_us(us)
@@ -53,7 +52,7 @@
 
 #define BILLION (1UL << 30)
 
-#define TEST_DURATION_S 20 /* in seconds */
+#define TEST_DURATION_S 4 /* in seconds */
 #define N_TIMERS    50
 
 static struct rte_timer timer[N_TIMERS];
@@ -64,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);
 }
 
@@ -95,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;