It's more convenient the local time to be a monotonic source.
The monotony allows to use local time in similar manner as it's
supposed to be used with global time and the 64-bit timer is enough
to guarantee it.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronz...@linaro.org>
---
example/generator/odp_generator.c | 10 +++++-----
include/odp/api/time.h | 2 +-
platform/linux-generic/odp_schedule.c | 9 +++------
test/performance/odp_pktio_perf.c | 16 ++++++++--------
test/validation/pktio/pktio.c | 21 ++++++++-------------
5 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/example/generator/odp_generator.c
b/example/generator/odp_generator.c
index 9d79f89..2de530d 100644
--- a/example/generator/odp_generator.c
+++ b/example/generator/odp_generator.c
@@ -586,7 +586,7 @@ static void *gen_recv_thread(void *arg)
*/
static void print_global_stats(int num_workers)
{
- odp_time_t start, wait, diff;
+ odp_time_t cur, wait, next;
uint64_t pkts, pkts_prev = 0, pps, maximum_pps = 0;
int verbose_interval = 20;
odp_thrmask_t thrd_mask;
@@ -595,7 +595,7 @@ static void print_global_stats(int num_workers)
continue;
wait = odp_time_local_from_ns(verbose_interval * ODP_TIME_SEC_IN_NS);
- start = odp_time_local();
+ next = odp_time_sum(odp_time_local(), wait);
while (odp_thrmask_worker(&thrd_mask) == num_workers) {
if (args->appl.number != -1 &&
@@ -604,11 +604,11 @@ static void print_global_stats(int num_workers)
break;
}
- diff = odp_time_diff(odp_time_local(), start);
- if (odp_time_cmp(wait, diff) > 0)
+ cur = odp_time_local();
+ if (odp_time_cmp(next, cur) > 0)
continue;
- start = odp_time_local();
+ next = odp_time_sum(cur, wait);
if (args->appl.mode == APPL_MODE_RCV) {
pkts = odp_atomic_load_u64(&counters.udp);
diff --git a/include/odp/api/time.h b/include/odp/api/time.h
index 2bddb56..3228879 100644
--- a/include/odp/api/time.h
+++ b/include/odp/api/time.h
@@ -45,7 +45,7 @@ extern "C" {
* Current local time
*
* Returns current local time stamp value. The local time source provides high
- * resolution time.
+ * resolution time and is monotonic.
*
* @return Local time stamp.
*/
diff --git a/platform/linux-generic/odp_schedule.c
b/platform/linux-generic/odp_schedule.c
index 96b3ac5..3017876 100644
--- a/platform/linux-generic/odp_schedule.c
+++ b/platform/linux-generic/odp_schedule.c
@@ -586,7 +586,7 @@ static int schedule_loop(odp_queue_t *out_queue, uint64_t
wait,
odp_event_t out_ev[],
unsigned int max_num, unsigned int max_deq)
{
- odp_time_t start_time, time, diff, wtime;
+ odp_time_t next, wtime;
int first = 1;
int ret;
@@ -604,15 +604,12 @@ static int schedule_loop(odp_queue_t *out_queue, uint64_t
wait,
if (first) {
wtime = odp_time_local_from_ns(wait);
- start_time = odp_time_local();
+ next = odp_time_sum(odp_time_local(), wtime);
first = 0;
continue;
}
- time = odp_time_local();
- diff = odp_time_diff(time, start_time);
-
- if (odp_time_cmp(wtime, diff) < 0)
+ if (odp_time_cmp(next, odp_time_local()) < 0)
break;
}
diff --git a/test/performance/odp_pktio_perf.c
b/test/performance/odp_pktio_perf.c
index ffe9844..3d37ae1 100644
--- a/test/performance/odp_pktio_perf.c
+++ b/test/performance/odp_pktio_perf.c
@@ -305,8 +305,8 @@ static void *run_thread_tx(void *arg)
int thr_id;
odp_queue_t outq;
pkt_tx_stats_t *stats;
- odp_time_t start_time, cur_time, send_duration;
- odp_time_t burst_start_time, burst_gap;
+ odp_time_t cur_time, send_time_end, send_duration;
+ odp_time_t burst_gap_end, burst_gap;
uint32_t batch_len;
int unsent_pkts = 0;
odp_event_t tx_event[BATCH_LEN_MAX];
@@ -336,19 +336,19 @@ static void *run_thread_tx(void *arg)
odp_barrier_wait(&globals->tx_barrier);
cur_time = odp_time_local();
- start_time = cur_time;
- burst_start_time = odp_time_diff(cur_time, burst_gap);
- while (odp_time_diff(cur_time, start_time) < send_duration) {
+ send_time_end = odp_time_sum(cur_time, send_duration);
+ burst_gap_end = cur_time;
+ while (odp_time_cmp(send_time_end, cur_time) > 0) {
unsigned alloc_cnt = 0, tx_cnt;
- if (odp_time_diff(cur_time, burst_start_time) < burst_gap) {
+ if (odp_time_cmp(burst_gap_end, cur_time) > 0) {
cur_time = odp_time_local();
if (!odp_time_cmp(idle_start, ODP_TIME_NULL))
idle_start = cur_time;
continue;
}
- if (odp_time_cmp(idle_start, ODP_TIME_NULL)) {
+ if (odp_time_cmp(idle_start, ODP_TIME_NULL) > 0) {
odp_time_t diff = odp_time_diff(cur_time, idle_start);
stats->s.idle_ticks =
@@ -357,7 +357,7 @@ static void *run_thread_tx(void *arg)
idle_start = ODP_TIME_NULL;
}
- burst_start_time += burst_gap;
+ burst_gap_end = odp_time_sum(burst_gap_end, burst_gap);
alloc_cnt = alloc_packets(tx_event, batch_len - unsent_pkts);
if (alloc_cnt != batch_len)
diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c
index 2f42c27..aee3a7d 100644
--- a/test/validation/pktio/pktio.c
+++ b/test/validation/pktio/pktio.c
@@ -336,18 +336,16 @@ static int destroy_inq(odp_pktio_t pktio)
static odp_event_t queue_deq_wait_time(odp_queue_t queue, uint64_t ns)
{
- odp_time_t start, now, diff;
+ odp_time_t wait, end;
odp_event_t ev;
- start = odp_time_local();
-
+ wait = odp_time_local_from_ns(ns);
+ end = odp_time_sum(odp_time_local(), wait);
do {
ev = odp_queue_deq(queue);
if (ev != ODP_EVENT_INVALID)
return ev;
- now = odp_time_local();
- diff = odp_time_diff(now, start);
- } while (odp_time_to_ns(diff) < ns);
+ } while (odp_time_cmp(end, odp_time_local()) > 0);
return ODP_EVENT_INVALID;
}
@@ -355,14 +353,14 @@ static odp_event_t queue_deq_wait_time(odp_queue_t queue,
uint64_t ns)
static odp_packet_t wait_for_packet(pktio_info_t *pktio_rx,
uint32_t seq, uint64_t ns)
{
- odp_time_t start, now, diff;
+ odp_time_t wait_time, end;
odp_event_t ev;
odp_packet_t pkt;
uint64_t wait;
- start = odp_time_local();
wait = odp_schedule_wait_time(ns);
-
+ wait_time = odp_time_local_from_ns(ns);
+ end = odp_time_sum(odp_time_local(), wait_time);
do {
pkt = ODP_PACKET_INVALID;
@@ -388,10 +386,7 @@ static odp_packet_t wait_for_packet(pktio_info_t *pktio_rx,
odp_packet_free(pkt);
}
-
- now = odp_time_local();
- diff = odp_time_diff(now, start);
- } while (odp_time_to_ns(diff) < ns);
+ } while (odp_time_cmp(end, odp_time_local()) > 0);
CU_FAIL("failed to receive transmitted packet");
--
1.9.1
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp
