aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorIvan Khoronzhuk <ivan.khoronzhuk@linaro.org>2015-08-27 15:31:19 +0300
committerMaxim Uvarov <maxim.uvarov@linaro.org>2015-08-27 18:25:47 +0300
commit0bd245638dd047b98185d110cf89d80d757e6459 (patch)
tree089f781cee46236c36e3dd8f044bf31f17d0aa6d /test
parent679692b11df483d468850575f01f3812eb3afaf1 (diff)
validation: pktio: don't mix scheduler wait time and ns
The odp_schduler() requires time value in it`s own ticks, so pass scheduler wait time instead of ns. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> Reviewed-by: Stuart Haslam <stuart.haslam@linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'test')
-rw-r--r--test/validation/pktio/pktio.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c
index 89d4bf1..b136419 100644
--- a/test/validation/pktio/pktio.c
+++ b/test/validation/pktio/pktio.c
@@ -354,15 +354,17 @@ static odp_packet_t wait_for_packet(odp_queue_t queue,
uint64_t start, now, diff;
odp_event_t ev;
odp_packet_t pkt = ODP_PACKET_INVALID;
+ uint64_t wait;
start = odp_time_cycles();
+ wait = odp_schedule_wait_time(ns);
do {
if (queue != ODP_QUEUE_INVALID &&
odp_queue_type(queue) == ODP_QUEUE_TYPE_POLL)
ev = queue_deq_wait_time(queue, ns);
else
- ev = odp_schedule(NULL, ns);
+ ev = odp_schedule(NULL, wait);
if (ev != ODP_EVENT_INVALID) {
if (odp_event_type(ev) == ODP_EVENT_PACKET) {
@@ -583,6 +585,7 @@ void pktio_test_inq_remdef(void)
odp_pktio_t pktio;
odp_queue_t inq;
odp_event_t ev;
+ uint64_t wait;
int i;
pktio = create_pktio(iface_name[0], ODP_QUEUE_TYPE_SCHED, 0);
@@ -592,8 +595,9 @@ void pktio_test_inq_remdef(void)
CU_ASSERT(inq != ODP_QUEUE_INVALID);
CU_ASSERT(odp_pktio_inq_remdef(pktio) == 0);
+ wait = odp_schedule_wait_time(ODP_TIME_SEC);
for (i = 0; i < 100; i++) {
- ev = odp_schedule(NULL, ODP_TIME_MSEC);
+ ev = odp_schedule(NULL, wait);
if (ev != ODP_EVENT_INVALID) {
odp_event_free(ev);
CU_FAIL("received unexpected event");