michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: timer_api: run in user mode

Browse source 
We didn't have any coverage of the timer APIs in user
mode.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2019-05-02 12:26:32 -07:00 • committed by Andrew Boie
commit 5f0ee9d350
3 changed files with 85 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/kernel/timer/timer_api/prj.conf
View file

@ -1,4 +1,4 @@
CONFIG_ZTEST=y CONFIG_ZTEST=y
CONFIG_QEMU_TICKLESS_WORKAROUND=y CONFIG_QEMU_TICKLESS_WORKAROUND=y
CONFIG_TEST_USERSPACE=y

140
tests/kernel/timer/timer_api/src/main.c
View file

@ -24,8 +24,18 @@ static void duration_stop(struct k_timer *timer);
/** TESTPOINT: init timer via K_TIMER_DEFINE */ /** TESTPOINT: init timer via K_TIMER_DEFINE */
K_TIMER_DEFINE(ktimer, duration_expire, duration_stop); K_TIMER_DEFINE(ktimer, duration_expire, duration_stop);
static struct k_timer timer;
static struct timer_data tdata; static struct k_timer duration_timer;
static struct k_timer period0_timer;
static struct k_timer expire_timer;
static struct k_timer sync_timer;
static struct k_timer periodicity_timer;
static struct k_timer status_timer;
static struct k_timer status_anytime_timer;
static struct k_timer status_sync_timer;
static struct k_timer remain_timer;
static ZTEST_BMEM struct timer_data tdata;
#define TIMER_ASSERT(exp, tmr) \ #define TIMER_ASSERT(exp, tmr) \
do { \ do { \
@ -119,16 +129,15 @@ void test_timer_duration_period(void)
{ {
init_timer_data(); init_timer_data();
/** TESTPOINT: init timer via k_timer_init */ /** TESTPOINT: init timer via k_timer_init */
k_timer_init(&timer, duration_expire, duration_stop); k_timer_start(&duration_timer, DURATION, PERIOD);
k_timer_start(&timer, DURATION, PERIOD);
tdata.timestamp = k_uptime_get(); tdata.timestamp = k_uptime_get();
busy_wait_ms(DURATION + PERIOD * EXPIRE_TIMES + PERIOD / 2); busy_wait_ms(DURATION + PERIOD * EXPIRE_TIMES + PERIOD / 2);
/** TESTPOINT: check expire and stop times */ /** TESTPOINT: check expire and stop times */
TIMER_ASSERT(tdata.expire_cnt == EXPIRE_TIMES, &timer); TIMER_ASSERT(tdata.expire_cnt == EXPIRE_TIMES, &duration_timer);
TIMER_ASSERT(tdata.stop_cnt == 1, &timer); TIMER_ASSERT(tdata.stop_cnt == 1, &duration_timer);
/* cleanup environemtn */ /* cleanup environemtn */
k_timer_stop(&timer); k_timer_stop(&duration_timer);
} }
/** /**
@ -150,17 +159,16 @@ void test_timer_period_0(void)
{ {
init_timer_data(); init_timer_data();
/** TESTPOINT: set period 0 */ /** TESTPOINT: set period 0 */
k_timer_init(&timer, period0_expire, NULL); k_timer_start(&period0_timer, DURATION, 0);
k_timer_start(&timer, DURATION, 0);
tdata.timestamp = k_uptime_get(); tdata.timestamp = k_uptime_get();
busy_wait_ms(DURATION + 1); busy_wait_ms(DURATION + 1);
/** TESTPOINT: ensure it is one-short timer */ /** TESTPOINT: ensure it is one-short timer */
TIMER_ASSERT(tdata.expire_cnt == 1, &timer); TIMER_ASSERT(tdata.expire_cnt == 1, &period0_timer);
TIMER_ASSERT(tdata.stop_cnt == 0, &timer); TIMER_ASSERT(tdata.stop_cnt == 0, &period0_timer);
/* cleanup environemtn */ /* cleanup environemtn */
k_timer_stop(&timer); k_timer_stop(&period0_timer);
} }
/** /**
@ -182,18 +190,17 @@ void test_timer_expirefn_null(void)
{ {
init_timer_data(); init_timer_data();
/** TESTPOINT: expire function NULL */ /** TESTPOINT: expire function NULL */
k_timer_init(&timer, NULL, duration_stop); k_timer_start(&expire_timer, DURATION, PERIOD);
k_timer_start(&timer, DURATION, PERIOD);
busy_wait_ms(DURATION + PERIOD * EXPIRE_TIMES + PERIOD / 2); busy_wait_ms(DURATION + PERIOD * EXPIRE_TIMES + PERIOD / 2);
k_timer_stop(&timer); k_timer_stop(&expire_timer);
/** TESTPOINT: expire handler is not invoked */ /** TESTPOINT: expire handler is not invoked */
TIMER_ASSERT(tdata.expire_cnt == 0, &timer); TIMER_ASSERT(tdata.expire_cnt == 0, &expire_timer);
/** TESTPOINT: stop handler is invoked */ /** TESTPOINT: stop handler is invoked */
TIMER_ASSERT(tdata.stop_cnt == 1, &timer); TIMER_ASSERT(tdata.stop_cnt == 1, &expire_timer);
/* cleanup environment */ /* cleanup environment */
k_timer_stop(&timer); k_timer_stop(&expire_timer);
} }
/* Wait for the next expiration of an OS timer tick, to synchronize /* Wait for the next expiration of an OS timer tick, to synchronize
@ -201,9 +208,6 @@ void test_timer_expirefn_null(void)
*/ */
static void tick_sync(void) static void tick_sync(void)
{ {
static struct k_timer sync_timer;
k_timer_init(&sync_timer, NULL, NULL);
k_timer_start(&sync_timer, 0, 1); k_timer_start(&sync_timer, 0, 1);
k_timer_status_sync(&sync_timer); k_timer_status_sync(&sync_timer);
k_timer_stop(&sync_timer); k_timer_stop(&sync_timer);
@ -238,29 +242,30 @@ void test_timer_periodicity(void)
init_timer_data(); init_timer_data();
/** TESTPOINT: set duration 0 */ /** TESTPOINT: set duration 0 */
k_timer_init(&timer, NULL, NULL); k_timer_start(&periodicity_timer, 0, PERIOD);
k_timer_start(&timer, 0, PERIOD);
/* clear the expiration that would have happenned due to /* clear the expiration that would have happenned due to
* whatever duration that was set. * whatever duration that was set.
*/ */
k_timer_status_sync(&timer); k_timer_status_sync(&periodicity_timer);
tdata.timestamp = k_uptime_get(); tdata.timestamp = k_uptime_get();
for (int i = 0; i < EXPIRE_TIMES; i++) { for (int i = 0; i < EXPIRE_TIMES; i++) {
/** TESTPOINT: expired times returned by status sync */ /** TESTPOINT: expired times returned by status sync */
TIMER_ASSERT(k_timer_status_sync(&timer) == 1, &timer); TIMER_ASSERT(k_timer_status_sync(&periodicity_timer) == 1,
&periodicity_timer);
delta = k_uptime_delta(&tdata.timestamp); delta = k_uptime_delta(&tdata.timestamp);
/** TESTPOINT: check if timer fired within 1ms of the /** TESTPOINT: check if timer fired within 1ms of the
* expected period (firing time) * expected period (firing time)
*/ */
TIMER_ASSERT(WITHIN_ERROR(delta, PERIOD, 1), &timer); TIMER_ASSERT(WITHIN_ERROR(delta, PERIOD, 1),
&periodicity_timer);
} }
/* cleanup environment */ /* cleanup environment */
k_timer_stop(&timer); k_timer_stop(&periodicity_timer);
} }
/** /**
@ -281,15 +286,15 @@ void test_timer_periodicity(void)
void test_timer_status_get(void) void test_timer_status_get(void)
{ {
init_timer_data(); init_timer_data();
k_timer_init(&timer, status_expire, status_stop); k_timer_start(&status_timer, DURATION, PERIOD);
k_timer_start(&timer, DURATION, PERIOD);
/** TESTPOINT: status get upon timer starts */ /** TESTPOINT: status get upon timer starts */
TIMER_ASSERT(k_timer_status_get(&timer) == 0, &timer); TIMER_ASSERT(k_timer_status_get(&status_timer) == 0, &status_timer);
/** TESTPOINT: remaining get upon timer starts */ /** TESTPOINT: remaining get upon timer starts */
TIMER_ASSERT(k_timer_remaining_get(&timer) >= DURATION / 2, &timer); TIMER_ASSERT(k_timer_remaining_get(&status_timer) >= DURATION / 2,
&status_timer);
/* cleanup environment */ /* cleanup environment */
k_timer_stop(&timer); k_timer_stop(&status_timer);
} }
/** /**
@ -310,15 +315,15 @@ void test_timer_status_get(void)
void test_timer_status_get_anytime(void) void test_timer_status_get_anytime(void)
{ {
init_timer_data(); init_timer_data();
k_timer_init(&timer, NULL, NULL); k_timer_start(&status_anytime_timer, DURATION, PERIOD);
k_timer_start(&timer, DURATION, PERIOD);
busy_wait_ms(DURATION + PERIOD * (EXPIRE_TIMES - 1) + PERIOD / 2); busy_wait_ms(DURATION + PERIOD * (EXPIRE_TIMES - 1) + PERIOD / 2);
/** TESTPOINT: status get at any time */ /** TESTPOINT: status get at any time */
TIMER_ASSERT(k_timer_status_get(&timer) == EXPIRE_TIMES, &timer); TIMER_ASSERT(k_timer_status_get(&status_anytime_timer) == EXPIRE_TIMES,
&status_anytime_timer);
/* cleanup environment */ /* cleanup environment */
k_timer_stop(&timer); k_timer_stop(&status_anytime_timer);
} }
/** /**
@ -340,20 +345,20 @@ void test_timer_status_get_anytime(void)
void test_timer_status_sync(void) void test_timer_status_sync(void)
{ {
init_timer_data(); init_timer_data();
k_timer_init(&timer, duration_expire, duration_stop); k_timer_start(&status_sync_timer, DURATION, PERIOD);
k_timer_start(&timer, DURATION, PERIOD);
for (int i = 0; i < EXPIRE_TIMES; i++) { for (int i = 0; i < EXPIRE_TIMES; i++) {
/** TESTPOINT: check timer not expire */ /** TESTPOINT: check timer not expire */
TIMER_ASSERT(tdata.expire_cnt == i, &timer); TIMER_ASSERT(tdata.expire_cnt == i, &status_sync_timer);
/** TESTPOINT： expired times returned by status sync */ /** TESTPOINT： expired times returned by status sync */
TIMER_ASSERT(k_timer_status_sync(&timer) == 1, &timer); TIMER_ASSERT(k_timer_status_sync(&status_sync_timer) == 1,
&status_sync_timer);
/** TESTPOINT: check timer not expire */ /** TESTPOINT: check timer not expire */
TIMER_ASSERT(tdata.expire_cnt == (i + 1), &timer); TIMER_ASSERT(tdata.expire_cnt == (i + 1), &status_sync_timer);
} }
/* cleanup environment */ /* cleanup environment */
k_timer_stop(&timer); k_timer_stop(&status_sync_timer);
} }
/** /**
@ -415,13 +420,13 @@ K_TIMER_DEFINE(timer2, user_data_timer_handler, NULL);
K_TIMER_DEFINE(timer3, user_data_timer_handler, NULL); K_TIMER_DEFINE(timer3, user_data_timer_handler, NULL);
K_TIMER_DEFINE(timer4, user_data_timer_handler, NULL); K_TIMER_DEFINE(timer4, user_data_timer_handler, NULL);
static struct k_timer *user_data_timer[5] = { static ZTEST_DMEM struct k_timer *user_data_timer[5] = {
&timer0, &timer1, &timer2, &timer3, &timer4 &timer0, &timer1, &timer2, &timer3, &timer4
}; };
static const intptr_t user_data[5] = { 0x1337, 0xbabe, 0xd00d, 0xdeaf, 0xfade }; static const intptr_t user_data[5] = { 0x1337, 0xbabe, 0xd00d, 0xdeaf, 0xfade };
static int user_data_correct[5] = { 0, 0, 0, 0, 0 }; static ZTEST_BMEM int user_data_correct[5];
static void user_data_timer_handler(struct k_timer *timer) static void user_data_timer_handler(struct k_timer *timer)
{ {
@ -504,26 +509,45 @@ void test_timer_remaining_get(void)
u32_t remaining; u32_t remaining;
init_timer_data(); init_timer_data();
k_timer_init(&timer, NULL, NULL); k_timer_start(&remain_timer, DURATION, 0);
k_timer_start(&timer, DURATION, 0);
busy_wait_ms(DURATION / 2); busy_wait_ms(DURATION / 2);
remaining = k_timer_remaining_get(&timer); remaining = k_timer_remaining_get(&remain_timer);
k_timer_stop(&timer); k_timer_stop(&remain_timer);
zassert_true(remaining <= (DURATION / 2), NULL); zassert_true(remaining <= (DURATION / 2), NULL);
} }
static void timer_init(struct k_timer *timer, k_timer_expiry_t expiry_fn,
k_timer_stop_t stop_fn)
{
k_object_access_grant(timer, k_current_get());
k_timer_init(timer, expiry_fn, stop_fn);
}
void test_main(void) void test_main(void)
{ {
timer_init(&duration_timer, duration_expire, duration_stop);
timer_init(&period0_timer, period0_expire, NULL);
timer_init(&expire_timer, NULL, duration_stop);
timer_init(&sync_timer, NULL, NULL);
timer_init(&periodicity_timer, NULL, NULL);
timer_init(&status_timer, status_expire, status_stop);
timer_init(&status_anytime_timer, NULL, NULL);
timer_init(&status_sync_timer, duration_expire, duration_stop);
timer_init(&remain_timer, NULL, NULL);
k_thread_access_grant(k_current_get(), &ktimer, &timer0, &timer1,
&timer2, &timer3, &timer4);
ztest_test_suite(timer_api, ztest_test_suite(timer_api,
ztest_unit_test(test_timer_duration_period), ztest_user_unit_test(test_timer_duration_period),
ztest_unit_test(test_timer_period_0), ztest_user_unit_test(test_timer_period_0),
ztest_unit_test(test_timer_expirefn_null), ztest_user_unit_test(test_timer_expirefn_null),
ztest_unit_test(test_timer_periodicity), ztest_user_unit_test(test_timer_periodicity),
ztest_unit_test(test_timer_status_get), ztest_user_unit_test(test_timer_status_get),
ztest_unit_test(test_timer_status_get_anytime), ztest_user_unit_test(test_timer_status_get_anytime),
ztest_unit_test(test_timer_status_sync), ztest_user_unit_test(test_timer_status_sync),
ztest_unit_test(test_timer_k_define), ztest_user_unit_test(test_timer_k_define),
ztest_unit_test(test_timer_user_data), ztest_user_unit_test(test_timer_user_data),
ztest_unit_test(test_timer_remaining_get)); ztest_user_unit_test(test_timer_remaining_get));
ztest_run_test_suite(timer_api); ztest_run_test_suite(timer_api);
} }

4
tests/kernel/timer/timer_api/testcase.yaml
View file

@ -1,8 +1,8 @@
tests: tests:
kernel.timer: kernel.timer:
tags: kernel tags: kernel userspace
kernel.timer.tickless: kernel.timer.tickless:
build_only: true build_only: true
extra_args: CONF_FILE="prj_tickless.conf" extra_args: CONF_FILE="prj_tickless.conf"
arch_exclude: riscv32 nios2 posix arch_exclude: riscv32 nios2 posix
tags: kernel tags: kernel userspace