| Message ID | 1450370336-15445-1-git-send-email-ivan.khoronzhuk@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
Petri, This patch corrects validation for scheduler time we had talk about some time ago. And removes: > - wait_time = odp_schedule_wait_time((uint64_t)-1LL); > - CU_ASSERT(wait_time > 0); as was decided. On 17.12.15 18:38, Ivan Khoronzhuk wrote: > Test checks scheduler time correctness using time API. > > Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> > --- > > Based on api-next as it uses new time API. > > Since v1: > - improved a little > > test/validation/scheduler/scheduler.c | 45 +++++++++++++++++++++++++++++++++-- > 1 file changed, 43 insertions(+), 2 deletions(-) > > diff --git a/test/validation/scheduler/scheduler.c b/test/validation/scheduler/scheduler.c > index 2e157a5..daed8cb 100644 > --- a/test/validation/scheduler/scheduler.c > +++ b/test/validation/scheduler/scheduler.c > @@ -48,6 +48,8 @@ > #define CHAOS_NDX_TO_PTR(n) ((void *)(uintptr_t)n) > #define CHAOS_WAIT_FAIL (5 * ODP_TIME_SEC_IN_NS) > > +#define ODP_WAIT_TOLERANCE 20000000 > + > /* Test global variables */ > typedef struct { > int num_workers; > @@ -114,13 +116,52 @@ static int exit_schedule_loop(void) > > void scheduler_test_wait_time(void) > { > + int i; > + odp_queue_t queue; > uint64_t wait_time; > + odp_queue_param_t qp; > + odp_time_t lower_limit, upper_limit; > + odp_time_t start_time, end_time, diff; > > + /* check on read */ > wait_time = odp_schedule_wait_time(0); > wait_time = odp_schedule_wait_time(1); > > - wait_time = odp_schedule_wait_time((uint64_t)-1LL); > - CU_ASSERT(wait_time > 0); > + /* check ODP_SCHED_NO_WAIT */ > + odp_queue_param_init(&qp); > + queue = odp_queue_create("dummy_queue", ODP_QUEUE_TYPE_SCHED, &qp); > + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); > + > + wait_time = odp_schedule_wait_time(ODP_TIME_SEC_IN_NS); > + start_time = odp_time_local(); > + odp_schedule(&queue, ODP_SCHED_NO_WAIT); > + end_time = odp_time_local(); > + > + diff = odp_time_diff(end_time, start_time); > + lower_limit = ODP_TIME_NULL; > + upper_limit = odp_time_local_from_ns(ODP_WAIT_TOLERANCE); > + > + CU_ASSERT(odp_time_cmp(diff, lower_limit) >= 0); > + CU_ASSERT(odp_time_cmp(diff, upper_limit) <= 0); > + > + /* check time correctness */ > + start_time = odp_time_local(); > + for (i = 1; i < 6; i++) { > + odp_schedule(&queue, wait_time); > + printf("%d..", i); > + } > + end_time = odp_time_local(); > + > + diff = odp_time_diff(end_time, start_time); > + lower_limit = odp_time_local_from_ns(5 * ODP_TIME_SEC_IN_NS - > + ODP_WAIT_TOLERANCE); > + upper_limit = odp_time_local_from_ns(5 * ODP_TIME_SEC_IN_NS + > + ODP_WAIT_TOLERANCE); > + > + CU_ASSERT(odp_time_cmp(diff, lower_limit) >= 0); > + CU_ASSERT(odp_time_cmp(diff, upper_limit) <= 0); > + > + CU_ASSERT_FATAL(odp_queue_destroy(queue) == 0); > } > > void scheduler_test_num_prio(void) >
ping. On 17.12.15 18:38, Ivan Khoronzhuk wrote: > Test checks scheduler time correctness using time API. > > Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> > --- > > Based on api-next as it uses new time API. > > Since v1: > - improved a little > > test/validation/scheduler/scheduler.c | 45 +++++++++++++++++++++++++++++++++-- > 1 file changed, 43 insertions(+), 2 deletions(-) > > diff --git a/test/validation/scheduler/scheduler.c b/test/validation/scheduler/scheduler.c > index 2e157a5..daed8cb 100644 > --- a/test/validation/scheduler/scheduler.c > +++ b/test/validation/scheduler/scheduler.c > @@ -48,6 +48,8 @@ > #define CHAOS_NDX_TO_PTR(n) ((void *)(uintptr_t)n) > #define CHAOS_WAIT_FAIL (5 * ODP_TIME_SEC_IN_NS) > > +#define ODP_WAIT_TOLERANCE 20000000 > + > /* Test global variables */ > typedef struct { > int num_workers; > @@ -114,13 +116,52 @@ static int exit_schedule_loop(void) > > void scheduler_test_wait_time(void) > { > + int i; > + odp_queue_t queue; > uint64_t wait_time; > + odp_queue_param_t qp; > + odp_time_t lower_limit, upper_limit; > + odp_time_t start_time, end_time, diff; > > + /* check on read */ > wait_time = odp_schedule_wait_time(0); > wait_time = odp_schedule_wait_time(1); > > - wait_time = odp_schedule_wait_time((uint64_t)-1LL); > - CU_ASSERT(wait_time > 0); > + /* check ODP_SCHED_NO_WAIT */ > + odp_queue_param_init(&qp); > + queue = odp_queue_create("dummy_queue", ODP_QUEUE_TYPE_SCHED, &qp); > + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); > + > + wait_time = odp_schedule_wait_time(ODP_TIME_SEC_IN_NS); > + start_time = odp_time_local(); > + odp_schedule(&queue, ODP_SCHED_NO_WAIT); > + end_time = odp_time_local(); > + > + diff = odp_time_diff(end_time, start_time); > + lower_limit = ODP_TIME_NULL; > + upper_limit = odp_time_local_from_ns(ODP_WAIT_TOLERANCE); > + > + CU_ASSERT(odp_time_cmp(diff, lower_limit) >= 0); > + CU_ASSERT(odp_time_cmp(diff, upper_limit) <= 0); > + > + /* check time correctness */ > + start_time = odp_time_local(); > + for (i = 1; i < 6; i++) { > + odp_schedule(&queue, wait_time); > + printf("%d..", i); > + } > + end_time = odp_time_local(); > + > + diff = odp_time_diff(end_time, start_time); > + lower_limit = odp_time_local_from_ns(5 * ODP_TIME_SEC_IN_NS - > + ODP_WAIT_TOLERANCE); > + upper_limit = odp_time_local_from_ns(5 * ODP_TIME_SEC_IN_NS + > + ODP_WAIT_TOLERANCE); > + > + CU_ASSERT(odp_time_cmp(diff, lower_limit) >= 0); > + CU_ASSERT(odp_time_cmp(diff, upper_limit) <= 0); > + > + CU_ASSERT_FATAL(odp_queue_destroy(queue) == 0); > } > > void scheduler_test_num_prio(void) >
On 22.12.15 10:34, Savolainen, Petri (Nokia - FI/Espoo) wrote: > > >> -----Original Message----- >> From: lng-odp [mailto:lng-odp-bounces@lists.linaro.org] On Behalf Of EXT >> Ivan Khoronzhuk >> Sent: Monday, December 21, 2015 1:02 PM >> To: lng-odp@lists.linaro.org >> Subject: Re: [lng-odp] [API-NEXT PATCH v2] validation: sched: Improve >> scheduler validation test to check sched time correctly >> >> ping. >> >> On 17.12.15 18:38, Ivan Khoronzhuk wrote: >>> Test checks scheduler time correctness using time API. >>> >>> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> >>> --- >>> >>> Based on api-next as it uses new time API. >>> >>> Since v1: >>> - improved a little >>> >>> test/validation/scheduler/scheduler.c | 45 >> +++++++++++++++++++++++++++++++++-- >>> 1 file changed, 43 insertions(+), 2 deletions(-) >>> >>> diff --git a/test/validation/scheduler/scheduler.c >> b/test/validation/scheduler/scheduler.c >>> index 2e157a5..daed8cb 100644 >>> --- a/test/validation/scheduler/scheduler.c >>> +++ b/test/validation/scheduler/scheduler.c >>> @@ -48,6 +48,8 @@ >>> #define CHAOS_NDX_TO_PTR(n) ((void *)(uintptr_t)n) >>> #define CHAOS_WAIT_FAIL (5 * ODP_TIME_SEC_IN_NS) >>> >>> +#define ODP_WAIT_TOLERANCE 20000000 > > > This 20 msec tolerance is better documented with the _MSEC_IN_NS macro (20*ODP_TIME_SEC_IN_NS). > > -Petri > Yep. Will correct in v3. > >>> + >>> /* Test global variables */ >>> typedef struct { >>> int num_workers; >>> @@ -114,13 +116,52 @@ static int exit_schedule_loop(void) >>> >>> void scheduler_test_wait_time(void) >>> { >>> + int i; >>> + odp_queue_t queue; >>> uint64_t wait_time; >>> + odp_queue_param_t qp; >>> + odp_time_t lower_limit, upper_limit; >>> + odp_time_t start_time, end_time, diff; >>> >>> + /* check on read */ >>> wait_time = odp_schedule_wait_time(0); >>> wait_time = odp_schedule_wait_time(1); >>> >>> - wait_time = odp_schedule_wait_time((uint64_t)-1LL); >>> - CU_ASSERT(wait_time > 0); >>> + /* check ODP_SCHED_NO_WAIT */ >>> + odp_queue_param_init(&qp); >>> + queue = odp_queue_create("dummy_queue", ODP_QUEUE_TYPE_SCHED, &qp); >>> + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); >>> + >>> + wait_time = odp_schedule_wait_time(ODP_TIME_SEC_IN_NS); >>> + start_time = odp_time_local(); >>> + odp_schedule(&queue, ODP_SCHED_NO_WAIT); >>> + end_time = odp_time_local(); >>> + >>> + diff = odp_time_diff(end_time, start_time); >>> + lower_limit = ODP_TIME_NULL; >>> + upper_limit = odp_time_local_from_ns(ODP_WAIT_TOLERANCE); >>> + >>> + CU_ASSERT(odp_time_cmp(diff, lower_limit) >= 0); >>> + CU_ASSERT(odp_time_cmp(diff, upper_limit) <= 0); >>> + >>> + /* check time correctness */ >>> + start_time = odp_time_local(); >>> + for (i = 1; i < 6; i++) { >>> + odp_schedule(&queue, wait_time); >>> + printf("%d..", i); >>> + } >>> + end_time = odp_time_local(); >>> + >>> + diff = odp_time_diff(end_time, start_time); >>> + lower_limit = odp_time_local_from_ns(5 * ODP_TIME_SEC_IN_NS - >>> + ODP_WAIT_TOLERANCE); >>> + upper_limit = odp_time_local_from_ns(5 * ODP_TIME_SEC_IN_NS + >>> + ODP_WAIT_TOLERANCE); >>> + >>> + CU_ASSERT(odp_time_cmp(diff, lower_limit) >= 0); >>> + CU_ASSERT(odp_time_cmp(diff, upper_limit) <= 0); >>> + >>> + CU_ASSERT_FATAL(odp_queue_destroy(queue) == 0); >>> } >>> >>> void scheduler_test_num_prio(void) >>> >> >> -- >> Regards, >> Ivan Khoronzhuk >> _______________________________________________ >> lng-odp mailing list >> lng-odp@lists.linaro.org >> https://lists.linaro.org/mailman/listinfo/lng-odp
diff --git a/test/validation/scheduler/scheduler.c b/test/validation/scheduler/scheduler.c index 2e157a5..daed8cb 100644 --- a/test/validation/scheduler/scheduler.c +++ b/test/validation/scheduler/scheduler.c @@ -48,6 +48,8 @@ #define CHAOS_NDX_TO_PTR(n) ((void *)(uintptr_t)n) #define CHAOS_WAIT_FAIL (5 * ODP_TIME_SEC_IN_NS) +#define ODP_WAIT_TOLERANCE 20000000 + /* Test global variables */ typedef struct { int num_workers; @@ -114,13 +116,52 @@ static int exit_schedule_loop(void) void scheduler_test_wait_time(void) { + int i; + odp_queue_t queue; uint64_t wait_time; + odp_queue_param_t qp; + odp_time_t lower_limit, upper_limit; + odp_time_t start_time, end_time, diff; + /* check on read */ wait_time = odp_schedule_wait_time(0); wait_time = odp_schedule_wait_time(1); - wait_time = odp_schedule_wait_time((uint64_t)-1LL); - CU_ASSERT(wait_time > 0); + /* check ODP_SCHED_NO_WAIT */ + odp_queue_param_init(&qp); + queue = odp_queue_create("dummy_queue", ODP_QUEUE_TYPE_SCHED, &qp); + CU_ASSERT_FATAL(queue != ODP_QUEUE_INVALID); + + wait_time = odp_schedule_wait_time(ODP_TIME_SEC_IN_NS); + start_time = odp_time_local(); + odp_schedule(&queue, ODP_SCHED_NO_WAIT); + end_time = odp_time_local(); + + diff = odp_time_diff(end_time, start_time); + lower_limit = ODP_TIME_NULL; + upper_limit = odp_time_local_from_ns(ODP_WAIT_TOLERANCE); + + CU_ASSERT(odp_time_cmp(diff, lower_limit) >= 0); + CU_ASSERT(odp_time_cmp(diff, upper_limit) <= 0); + + /* check time correctness */ + start_time = odp_time_local(); + for (i = 1; i < 6; i++) { + odp_schedule(&queue, wait_time); + printf("%d..", i); + } + end_time = odp_time_local(); + + diff = odp_time_diff(end_time, start_time); + lower_limit = odp_time_local_from_ns(5 * ODP_TIME_SEC_IN_NS - + ODP_WAIT_TOLERANCE); + upper_limit = odp_time_local_from_ns(5 * ODP_TIME_SEC_IN_NS + + ODP_WAIT_TOLERANCE); + + CU_ASSERT(odp_time_cmp(diff, lower_limit) >= 0); + CU_ASSERT(odp_time_cmp(diff, upper_limit) <= 0); + + CU_ASSERT_FATAL(odp_queue_destroy(queue) == 0); } void scheduler_test_num_prio(void)
Test checks scheduler time correctness using time API. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> --- Based on api-next as it uses new time API. Since v1: - improved a little test/validation/scheduler/scheduler.c | 45 +++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-)