This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via e3217b34b9741560443b972aea71e270b547e7d9 (commit) via 1bb85b0de781e8c6fb3b79cf463337d04798b1af (commit) via 50d6e131ea081b60237e6c46f8515a7909770987 (commit) from 291afb1577f2954b94f7dfbec31e3d3768de8a81 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit e3217b34b9741560443b972aea71e270b547e7d9 Author: Matias Elo matias.elo@nokia.com Date: Fri Mar 15 15:57:24 2019 +0200
validation: scheduler: prevent pause resume test getting stuck
scheduler_test_pause_resume() will get stuck if all events are not successfully enqueued, so use fatal check.
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Stanislaw Kardach skardach@marvell.com Reviewed-by: Petri Savolainen petri.savolainen@nokia.com
diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 3d0f1f5b9..7ad6acf48 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -1671,10 +1671,7 @@ static void scheduler_test_pause_resume(void) CU_ASSERT_FATAL(buf != ODP_BUFFER_INVALID); ev = odp_buffer_to_event(buf); ret = odp_queue_enq(queue, ev); - CU_ASSERT(ret == 0); - - if (ret) - odp_buffer_free(buf); + CU_ASSERT_FATAL(ret == 0); }
for (i = 0; i < NUM_BUFS_BEFORE_PAUSE; i++) { @@ -1699,7 +1696,7 @@ static void scheduler_test_pause_resume(void) local_bufs++; }
- CU_ASSERT(local_bufs < NUM_BUFS_PAUSE - NUM_BUFS_BEFORE_PAUSE); + CU_ASSERT(local_bufs <= NUM_BUFS_PAUSE - NUM_BUFS_BEFORE_PAUSE);
odp_schedule_resume();
commit 1bb85b0de781e8c6fb3b79cf463337d04798b1af Author: Matias Elo matias.elo@nokia.com Date: Fri Mar 15 15:42:04 2019 +0200
validation: scheduler: remove ODP_ prefix from test define
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Stanislaw Kardach skardach@marvell.com Reviewed-by: Petri Savolainen petri.savolainen@nokia.com
diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index 652591754..3d0f1f5b9 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -54,7 +54,7 @@ #define CHAOS_PTR_TO_NDX(p) ((uint64_t)(uint32_t)(uintptr_t)p) #define CHAOS_NDX_TO_PTR(n) ((void *)(uintptr_t)n)
-#define ODP_WAIT_TOLERANCE (150 * ODP_TIME_MSEC_IN_NS) +#define WAIT_TOLERANCE (150 * ODP_TIME_MSEC_IN_NS) #define WAIT_1MS_RETRIES 1000
/* Test global variables */ @@ -192,7 +192,7 @@ static void scheduler_test_wait_time(void)
diff = odp_time_diff(end_time, start_time); lower_limit = ODP_TIME_NULL; - upper_limit = odp_time_local_from_ns(ODP_WAIT_TOLERANCE); + upper_limit = odp_time_local_from_ns(WAIT_TOLERANCE);
CU_ASSERT(odp_time_cmp(diff, lower_limit) >= 0); CU_ASSERT(odp_time_cmp(diff, upper_limit) <= 0); @@ -205,9 +205,9 @@ static void scheduler_test_wait_time(void)
diff = odp_time_diff(end_time, start_time); lower_limit = odp_time_local_from_ns(5 * ODP_TIME_SEC_IN_NS - - ODP_WAIT_TOLERANCE); + WAIT_TOLERANCE); upper_limit = odp_time_local_from_ns(5 * ODP_TIME_SEC_IN_NS + - ODP_WAIT_TOLERANCE); + WAIT_TOLERANCE);
if (odp_time_cmp(diff, lower_limit) <= 0) { fprintf(stderr, "Exceed lower limit: "
commit 50d6e131ea081b60237e6c46f8515a7909770987 Author: Matias Elo matias.elo@nokia.com Date: Fri Mar 15 15:31:52 2019 +0200
validation: scheduler: fix groups test invalid failure
The test would fail if odp_schedule(ODP_SCHED_NO_WAIT) wouldn't return any events on the first call.
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Stanislaw Kardach skardach@marvell.com Reviewed-by: Petri Savolainen petri.savolainen@nokia.com Reported-by: Angela Czubak aczubak@marvell.com
diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c index b7128c1f0..652591754 100644 --- a/test/validation/api/scheduler/scheduler.c +++ b/test/validation/api/scheduler/scheduler.c @@ -55,6 +55,7 @@ #define CHAOS_NDX_TO_PTR(n) ((void *)(uintptr_t)n)
#define ODP_WAIT_TOLERANCE (150 * ODP_TIME_MSEC_IN_NS) +#define WAIT_1MS_RETRIES 1000
/* Test global variables */ typedef struct { @@ -737,7 +738,9 @@ static void scheduler_test_groups(void) odp_queue_t queue, from; odp_schedule_group_t mygrp[NUM_GROUPS]; odp_queue_t queue_grp[NUM_GROUPS]; + uint64_t wait_time; int num = NUM_GROUPS; + int schedule_retries;
odp_queue_param_init(&qp); qp.type = ODP_QUEUE_TYPE_SCHED; @@ -795,21 +798,19 @@ static void scheduler_test_groups(void) odp_schedule_group_leave(mygrp2, &mymask); odp_schedule_group_join(mygrp1, &mymask);
+ wait_time = odp_schedule_wait_time(ODP_TIME_MSEC_IN_NS); + schedule_retries = 0; while (num) { queue = queue_grp[j]; - ev = odp_schedule(&from, ODP_SCHED_NO_WAIT); + ev = odp_schedule(&from, wait_time);
if (ev == ODP_EVENT_INVALID) { - /* change group */ - rc = odp_schedule_group_leave(mygrp[j], - &mymask); - CU_ASSERT_FATAL(rc == 0); - - j = (j + 1) % NUM_GROUPS; - rc = odp_schedule_group_join(mygrp[j], - &mymask); - CU_ASSERT_FATAL(rc == 0); + CU_ASSERT_FATAL(schedule_retries < + WAIT_1MS_RETRIES); + schedule_retries++; continue; + } else { + schedule_retries = 0; }
CU_ASSERT_FATAL(from == queue); @@ -826,6 +827,14 @@ static void scheduler_test_groups(void)
odp_buffer_free(buf);
+ /* Change group */ + rc = odp_schedule_group_leave(mygrp[j], &mymask); + CU_ASSERT_FATAL(rc == 0); + + j = (j + 1) % NUM_GROUPS; + rc = odp_schedule_group_join(mygrp[j], &mymask); + CU_ASSERT_FATAL(rc == 0); + /* Tell scheduler we're about to request an event. * Not needed, but a convenient place to test this API. */
-----------------------------------------------------------------------
Summary of changes: test/validation/api/scheduler/scheduler.c | 44 ++++++++++++++++++------------- 1 file changed, 25 insertions(+), 19 deletions(-)
hooks/post-receive