-/*-
- * 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
#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)
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);
}
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;