aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Khoronzhuk <ivan.khoronzhuk@linaro.org>2015-09-17 11:31:30 +0300
committerMaxim Uvarov <maxim.uvarov@linaro.org>2015-09-22 21:19:08 +0300
commit33762eb822f0bac5b09e34a5fb7571d262ad9a7e (patch)
treec610136a8a153f92d15760b67edf926fe48d9fd7
parent5f12c19908dad6f259b253204bf549267962db7f (diff)
performance: odp_pktio_perf: fix potential overflow for send_duration
The direct comparing of "cur_cycles" and "end_cycles" is not valid, as "end_cycles" can be overflowed and comparison will give wrong result. So use odp_time_diff_cycles() for that, as it takes in account cycles overflow. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> Reviewed-by: Stuart Haslam <stuart.haslam@linaro.org> Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
-rw-r--r--test/performance/odp_pktio_perf.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c
index 709becf..ac32b15 100644
--- a/test/performance/odp_pktio_perf.c
+++ b/test/performance/odp_pktio_perf.c
@@ -303,7 +303,7 @@ static void *run_thread_tx(void *arg)
int thr_id;
odp_queue_t outq;
pkt_tx_stats_t *stats;
- uint64_t next_tx_cycles, end_cycles, cur_cycles;
+ uint64_t next_tx_cycles, start_cycles, cur_cycles, send_duration;
uint64_t burst_gap_cycles;
uint32_t batch_len;
int unsent_pkts = 0;
@@ -328,15 +328,14 @@ static void *run_thread_tx(void *arg)
burst_gap_cycles = odp_time_ns_to_cycles(
ODP_TIME_SEC / (targs->pps / targs->batch_len));
+ send_duration = odp_time_ns_to_cycles(targs->duration * ODP_TIME_SEC);
odp_barrier_wait(&globals->tx_barrier);
cur_cycles = odp_time_cycles();
+ start_cycles = cur_cycles;
next_tx_cycles = cur_cycles;
- end_cycles = cur_cycles +
- odp_time_ns_to_cycles(targs->duration * ODP_TIME_SEC);
-
- while (cur_cycles < end_cycles) {
+ while (odp_time_diff_cycles(start_cycles, cur_cycles) < send_duration) {
unsigned alloc_cnt = 0, tx_cnt;
if (cur_cycles < next_tx_cycles) {