From: Pavan Nikhilesh <pbhagavatula@marvell.com>
Round timeout ticks when converting from nanoseconds, this prevents
loss of accuracy and deviation from requested timeout value.
Fixes: d008f20bce23 ("app/eventdev: add event timer adapter as a producer")
Cc: stable@dpdk.org
Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
---
app/test-eventdev/test_perf_common.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c
index 34cded373..cc100650c 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -2,6 +2,8 @@
* Copyright(c) 2017 Cavium, Inc
*/
+#include <math.h>
+
#include "test_perf_common.h"
int
@@ -95,11 +97,13 @@ perf_event_timer_producer(void *arg)
uint64_t timeout_ticks = opt->expiry_nsec / opt->timer_tick_nsec;
memset(&tim, 0, sizeof(struct rte_event_timer));
- timeout_ticks = opt->optm_timer_tick_nsec ?
- (timeout_ticks * opt->timer_tick_nsec)
- / opt->optm_timer_tick_nsec : timeout_ticks;
+ timeout_ticks =
+ opt->optm_timer_tick_nsec
+ ? ceil((double)(timeout_ticks * opt->timer_tick_nsec) /
+ opt->optm_timer_tick_nsec)
+ : timeout_ticks;
timeout_ticks += timeout_ticks ? 0 : 1;
- tim.ev.event_type = RTE_EVENT_TYPE_TIMER;
+ tim.ev.event_type = RTE_EVENT_TYPE_TIMER;
tim.ev.op = RTE_EVENT_OP_NEW;
tim.ev.sched_type = t->opt->sched_type_list[0];
tim.ev.queue_id = p->queue_id;
@@ -159,11 +163,13 @@ perf_event_timer_producer_burst(void *arg)
uint64_t timeout_ticks = opt->expiry_nsec / opt->timer_tick_nsec;
memset(&tim, 0, sizeof(struct rte_event_timer));
- timeout_ticks = opt->optm_timer_tick_nsec ?
- (timeout_ticks * opt->timer_tick_nsec)
- / opt->optm_timer_tick_nsec : timeout_ticks;
+ timeout_ticks =
+ opt->optm_timer_tick_nsec
+ ? ceil((double)(timeout_ticks * opt->timer_tick_nsec) /
+ opt->optm_timer_tick_nsec)
+ : timeout_ticks;
timeout_ticks += timeout_ticks ? 0 : 1;
- tim.ev.event_type = RTE_EVENT_TYPE_TIMER;
+ tim.ev.event_type = RTE_EVENT_TYPE_TIMER;
tim.ev.op = RTE_EVENT_OP_NEW;
tim.ev.sched_type = t->opt->sched_type_list[0];
tim.ev.queue_id = p->queue_id;
--
2.17.1