drivers/net: build i40e and mlx5 on Windows

[dpdk.git] / examples / timer / main.c

diff --git a/examples/timer/main.c b/examples/timer/main.c
index 968a941..5a57e48 100644 (file)
--- a/examples/timer/main.c
+++ b/examples/timer/main.c
@@ -25,8 +25,8 @@ static struct rte_timer timer1;
 
 /* timer0 callback */
 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();
@@ -41,8 +41,8 @@ timer0_cb(__attribute__((unused)) struct rte_timer *tim,
 
 /* timer1 callback */
 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;
@@ -55,8 +55,8 @@ timer1_cb(__attribute__((unused)) struct rte_timer *tim,
        rte_timer_reset(tim, hz/3, SINGLE, lcore_id, timer1_cb, NULL);
 }
 
-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;
@@ -100,7 +100,7 @@ main(int argc, char **argv)
        rte_timer_init(&timer0);
        rte_timer_init(&timer1);
 
-       /* load timer0, every second, on master lcore, reloaded automatically */
+       /* load timer0, every second, on main lcore, reloaded automatically */
        hz = rte_get_timer_hz();
        lcore_id = rte_lcore_id();
        rte_timer_reset(&timer0, hz, PERIODICAL, lcore_id, timer0_cb, NULL);
@@ -109,12 +109,12 @@ 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) {
+       /* call lcore_mainloop() on every worker lcore */
+       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);
 
        return 0;