michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: pipe: Enhance tests to improve code coverage

Browse source 
This test is intended to validate k_pipe_alloc_init()
and k_pipe_cleanup(), when CONFIG_USERSPACE is not defined.
Also added test to validate pending reader and pending writer
feature in pipe.

Signed-off-by: Ajay Kishore <ajay.kishore@intel.com>
This commit is contained in:
Ajay Kishore 2018-08-31 18:09:34 +05:30 • committed by Anas Nashif
commit 75780a8135
2 changed files with 133 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/kernel/pipe/pipe_api/src/main.c
View file

@ -21,6 +21,9 @@ extern void test_pipe_block_put_sema(void);
extern void test_pipe_get_put(void);
extern void test_half_pipe_get_put(void);
extern void test_half_pipe_block_put_sema(void);
extern void test_pipe_alloc(void);
extern void test_pipe_reader_wait(void);
extern void test_pipe_block_writer_wait(void);
#ifdef CONFIG_USERSPACE
extern void test_pipe_user_thread2thread(void);
extern void test_pipe_user_put_fail(void);
@ -69,6 +72,9 @@ void test_main(void)
ztest_unit_test(test_pipe_block_put_sema),
ztest_unit_test(test_pipe_get_put),
ztest_unit_test(test_half_pipe_block_put_sema),
ztest_unit_test(test_half_pipe_get_put));
ztest_unit_test(test_half_pipe_get_put),
ztest_unit_test(test_pipe_alloc),
ztest_unit_test(test_pipe_reader_wait),
ztest_unit_test(test_pipe_block_writer_wait));
ztest_run_test_suite(pipe_api);
}

132
tests/kernel/pipe/pipe_api/src/test_pipe_contexts.c
View file

@ -6,9 +6,9 @@
#include <ztest.h>
#define STACK_SIZE 1024
#define PIPE_LEN 16
#define BYTES_TO_WRITE 4
#define STACK_SIZE 1024
#define PIPE_LEN 16
#define BYTES_TO_WRITE 4
#define BYTES_TO_READ BYTES_TO_WRITE
K_MEM_POOL_DEFINE(mpool, BYTES_TO_WRITE, PIPE_LEN, 1, BYTES_TO_WRITE);
@ -16,17 +16,23 @@ static unsigned char __aligned(4) data[] = "abcd1234$%^&PIPE";
/**TESTPOINT: init via K_PIPE_DEFINE*/
K_PIPE_DEFINE(kpipe, PIPE_LEN, 4);
K_PIPE_DEFINE(khalfpipe, (PIPE_LEN / 2), 4);
K_PIPE_DEFINE(kpipe1, PIPE_LEN, 4);
K_PIPE_DEFINE(pipe_test_alloc, PIPE_LEN, 4);
__kernel struct k_pipe pipe;
K_THREAD_STACK_DEFINE(tstack, STACK_SIZE);
K_THREAD_STACK_DEFINE(tstack1, STACK_SIZE);
K_THREAD_STACK_DEFINE(tstack2, STACK_SIZE);
__kernel struct k_thread tdata;
__kernel struct k_thread tdata1;
__kernel struct k_thread tdata2;
K_SEM_DEFINE(end_sema, 0, 1);
/* By design, only two blocks. We should never need more than that, one
* to allocate the pipe object, one for its buffer. Both should be auto-
* released when the thread exits
*/
K_MEM_POOL_DEFINE(test_pool, 128, 128, 2, 4);
K_MEM_POOL_DEFINE(test_pool, 128, 128, 4, 4);
static void tpipe_put(struct k_pipe *ppipe, int timeout)
{
@ -112,6 +118,47 @@ static void tpipe_thread_thread(struct k_pipe *ppipe)
k_thread_abort(tid);
}
static void tpipe_kthread_to_kthread(struct k_pipe *ppipe)
{
/**TESTPOINT: thread-thread data passing via pipe*/
k_tid_t tid = k_thread_create(&tdata, tstack, STACK_SIZE,
tThread_entry, ppipe, NULL, NULL,
K_PRIO_PREEMPT(0), 0, 0);
tpipe_put(ppipe, K_NO_WAIT);
k_sem_take(&end_sema, K_FOREVER);
k_sem_take(&end_sema, K_FOREVER);
tpipe_get(ppipe, K_FOREVER);
/* clear the spawned thread avoid side effect */
k_thread_abort(tid);
}
static void tpipe_put_no_wait(struct k_pipe *ppipe)
{
size_t to_wt, wt_byte = 0;
for (int i = 0; i < PIPE_LEN; i += wt_byte) {
/**TESTPOINT: pipe put*/
to_wt = (PIPE_LEN - i) >= BYTES_TO_WRITE ?
BYTES_TO_WRITE : (PIPE_LEN - i);
zassert_false(k_pipe_put(ppipe, &data[i], to_wt,
&wt_byte, 1, K_NO_WAIT), NULL);
zassert_true(wt_byte == to_wt || wt_byte == 1, NULL);
}
}
static void thread_handler(void *p1, void *p2, void *p3)
{
tpipe_put_no_wait((struct k_pipe *)p1);
k_sem_give(&end_sema);
}
static void thread_for_block_put(void *p1, void *p2, void *p3)
{
tpipe_block_put((struct k_pipe *)p1, (struct k_sem *)p2, K_FOREVER);
}
/**
* @addtogroup kernel_pipe_tests
@ -183,8 +230,8 @@ void test_pipe_block_put_sema(void)
k_sem_init(&sync_sema, 0, 1);
/**TESTPOINT: test k_pipe_block_put with semaphore*/
k_tid_t tid = k_thread_create(&tdata, tstack, STACK_SIZE,
tThread_block_put, &pipe, &sync_sema, NULL,
K_PRIO_PREEMPT(0), 0, 0);
tThread_block_put, &pipe, &sync_sema,
NULL, K_PRIO_PREEMPT(0), 0, 0);
k_sleep(10);
tpipe_get(&pipe, K_FOREVER);
k_sem_take(&end_sema, K_FOREVER);
@ -274,6 +321,79 @@ void test_half_pipe_block_put_sema(void)
k_thread_abort(tid);
}
/**
* @brief Test Initialization and buffer allocation of pipe,
* with various parameters
* @see k_pipe_alloc_init(), k_pipe_cleanup()
*/
void test_pipe_alloc(void)
{
int ret;
zassert_false(k_pipe_alloc_init(&pipe_test_alloc, PIPE_LEN), NULL);
tpipe_kthread_to_kthread(&pipe_test_alloc);
k_pipe_cleanup(&pipe_test_alloc);
zassert_false(k_pipe_alloc_init(&pipe_test_alloc, 0), NULL);
k_pipe_cleanup(&pipe_test_alloc);
ret = k_pipe_alloc_init(&pipe_test_alloc, PIPE_LEN * 8);
zassert_true(ret == -ENOMEM,
"resource pool is smaller then requested buffer");
}
/**
* @brief Test pending reader in pipe
* @see k_pipe_put(), k_pipe_get()
*/
void test_pipe_reader_wait(void)
{
/**TESTPOINT: test k_pipe_block_put with semaphore*/
k_tid_t tid = k_thread_create(&tdata, tstack, STACK_SIZE,
thread_handler, &kpipe1, NULL, NULL,
K_PRIO_PREEMPT(0), 0, 0);
tpipe_get(&kpipe1, K_FOREVER);
k_sem_take(&end_sema, K_FOREVER);
k_thread_abort(tid);
}
/**
* @brief Test pending writer in pipe
* @see k_pipe_block_put(), k_pipe_get()
*/
void test_pipe_block_writer_wait(void)
{
struct k_sem s_sema;
struct k_sem s_sema1;
const int main_low_prio = 10;
k_sem_init(&s_sema, 0, 1);
k_sem_init(&s_sema1, 0, 1);
int old_prio = k_thread_priority_get(k_current_get());
k_thread_priority_set(k_current_get(), main_low_prio);
/**TESTPOINT: test k_pipe_block_put with semaphore*/
k_tid_t tid = k_thread_create(&tdata, tstack, STACK_SIZE,
thread_for_block_put, &kpipe1, &s_sema,
NULL, K_PRIO_PREEMPT(main_low_prio - 1),
0, 0);
k_tid_t tid1 = k_thread_create(&tdata1, tstack1, STACK_SIZE,
thread_for_block_put, &kpipe1, &s_sema1,
NULL, K_PRIO_PREEMPT(main_low_prio - 1),
0, 0);
tpipe_get(&kpipe1, K_FOREVER);
k_thread_priority_set(k_current_get(), old_prio);
k_thread_abort(tid);
k_thread_abort(tid1);
}
/**
* @}
*/