X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Ftimer%2Fmain.c;h=a349846c7ca2f69543a9153d4e55966d5d6c9d6f;hb=fa71c328d1d7cf11531a7688fe679ef61f81ec7d;hp=968a941367f3e82dc745fb1e75416a965b3d871b;hpb=3998e2a07220844d3f3c17f76a781ced3efe0de0;p=dpdk.git

diff --git a/examples/timer/main.c b/examples/timer/main.c
index 968a941367..a349846c7c 100644
--- a/examples/timer/main.c
+++ b/examples/timer/main.c
@@ -18,15 +18,14 @@
 #include <rte_timer.h>
 #include <rte_debug.h>
 
-#define TIMER_RESOLUTION_CYCLES 20000000ULL /* around 10ms at 2 Ghz */
-
+static uint64_t timer_resolution_cycles;
 static struct rte_timer timer0;
 static struct rte_timer timer1;
 
-/* timer0 callback */
+/* timer0 callback. 8< */
 static void
-timer0_cb(__attribute__((unused)) struct rte_timer *tim,
-	  __attribute__((unused)) void *arg)
+timer0_cb(__rte_unused struct rte_timer *tim,
+	  __rte_unused void *arg)
 {
 	static unsigned counter = 0;
 	unsigned lcore_id = rte_lcore_id();
@@ -38,11 +37,12 @@ timer0_cb(__attribute__((unused)) struct rte_timer *tim,
 	if ((counter ++) == 20)
 		rte_timer_stop(tim);
 }
+/* >8 End of timer0 callback. */
 
-/* timer1 callback */
+/* timer1 callback. 8< */
 static void
-timer1_cb(__attribute__((unused)) struct rte_timer *tim,
-	  __attribute__((unused)) void *arg)
+timer1_cb(__rte_unused struct rte_timer *tim,
+	  __rte_unused void *arg)
 {
 	unsigned lcore_id = rte_lcore_id();
 	uint64_t hz;
@@ -54,9 +54,10 @@ timer1_cb(__attribute__((unused)) struct rte_timer *tim,
 	lcore_id = rte_get_next_lcore(lcore_id, 0, 1);
 	rte_timer_reset(tim, hz/3, SINGLE, lcore_id, timer1_cb, NULL);
 }
+/* >8 End of timer1 callback. */
 
-static __attribute__((noreturn)) int
-lcore_mainloop(__attribute__((unused)) void *arg)
+static __rte_noreturn int
+lcore_mainloop(__rte_unused void *arg)
 {
 	uint64_t prev_tsc = 0, cur_tsc, diff_tsc;
 	unsigned lcore_id;
@@ -64,21 +65,22 @@ lcore_mainloop(__attribute__((unused)) void *arg)
 	lcore_id = rte_lcore_id();
 	printf("Starting mainloop on core %u\n", lcore_id);
 
+	/* Main loop. 8< */
 	while (1) {
 		/*
-		 * Call the timer handler on each core: as we don't
-		 * need a very precise timer, so only call
-		 * rte_timer_manage() every ~10ms (at 2Ghz). In a real
-		 * application, this will enhance performances as
-		 * reading the HPET timer is not efficient.
+		 * Call the timer handler on each core: as we don't need a
+		 * very precise timer, so only call rte_timer_manage()
+		 * every ~10ms. In a real application, this will enhance
+		 * performances as reading the HPET timer is not efficient.
 		 */
-		cur_tsc = rte_rdtsc();
+		cur_tsc = rte_get_timer_cycles();
 		diff_tsc = cur_tsc - prev_tsc;
-		if (diff_tsc > TIMER_RESOLUTION_CYCLES) {
+		if (diff_tsc > timer_resolution_cycles) {
 			rte_timer_manage();
 			prev_tsc = cur_tsc;
 		}
 	}
+	/* >8 End of main loop. */
 }
 
 int
@@ -88,20 +90,24 @@ main(int argc, char **argv)
 	uint64_t hz;
 	unsigned lcore_id;
 
-	/* init EAL */
+	/* Init EAL. 8< */
 	ret = rte_eal_init(argc, argv);
 	if (ret < 0)
 		rte_panic("Cannot init EAL\n");
 
 	/* init RTE timer library */
 	rte_timer_subsystem_init();
+	/* >8 End of init EAL. */
 
-	/* init timer structures */
+	/* Init timer structures. 8< */
 	rte_timer_init(&timer0);
 	rte_timer_init(&timer1);
+	/* >8 End of init timer structures. */
 
-	/* load timer0, every second, on master lcore, reloaded automatically */
+	/* Load timer0, every second, on main lcore, reloaded automatically. 8< */
 	hz = rte_get_timer_hz();
+	timer_resolution_cycles = hz * 10 / 1000; /* around 10ms */
+
 	lcore_id = rte_lcore_id();
 	rte_timer_reset(&timer0, hz, PERIODICAL, lcore_id, timer0_cb, NULL);
 
@@ -109,13 +115,19 @@ main(int argc, char **argv)
 	lcore_id = rte_get_next_lcore(lcore_id, 0, 1);
 	rte_timer_reset(&timer1, hz/3, SINGLE, lcore_id, timer1_cb, NULL);
 
-	/* call lcore_mainloop() on every slave lcore */
-	RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+	/* >8 End of two timers configured. */
+
+	/* Call lcore_mainloop() on every worker lcore. 8< */
+	RTE_LCORE_FOREACH_WORKER(lcore_id) {
 		rte_eal_remote_launch(lcore_mainloop, NULL, lcore_id);
 	}
 
-	/* call it on master lcore too */
+	/* call it on main lcore too */
 	(void) lcore_mainloop(NULL);
+	/* >8 End of call lcore_mainloop() on every worker lcore. */
+
+	/* clean up the EAL */
+	rte_eal_cleanup();
 
 	return 0;
 }