test mbuf attach

[dpdk.git] / app / test / test_timer_racecond.c

diff --git a/app/test/test_timer_racecond.c b/app/test/test_timer_racecond.c
index 1edb444..28af9ca 100644 (file)
--- a/app/test/test_timer_racecond.c
+++ b/app/test/test_timer_racecond.c
@@ -1,8 +1,6 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2015 Akamai Technologies.
- *   All rights reserved.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015 Akamai Technologies.
+ * All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -44,8 +42,6 @@
 #include <rte_malloc.h>
 #include <rte_pause.h>
 
-#undef TEST_TIMER_RACECOND_VERBOSE
-
 #ifdef RTE_EXEC_ENV_LINUX
 #define usec_delay(us) usleep(us)
 #else
@@ -65,18 +61,18 @@ static volatile unsigned stop_slaves;
 
 static int reload_timer(struct rte_timer *tim);
 
+RTE_LOG_REGISTER(timer_logtype_test, test.timer, INFO);
+
 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);
 }
 
@@ -96,17 +92,16 @@ 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;
 }
 
 static int
-slave_main_loop(__attribute__((unused)) void *arg)
+slave_main_loop(__rte_unused void *arg)
 {
        unsigned lcore_id = rte_lcore_id();
        unsigned i;