tests/kernel/mem_protect: Port to k_heap API
The kernel resource pool is now a k_heap. There is a compatibility
API still, but this is a core test that should be exercising the core
API.
Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
diff --git a/tests/kernel/mem_protect/mem_protect/src/inherit.c b/tests/kernel/mem_protect/mem_protect/src/inherit.c
index a660152..d7e628f 100644
--- a/tests/kernel/mem_protect/mem_protect/src/inherit.c
+++ b/tests/kernel/mem_protect/mem_protect/src/inherit.c
@@ -21,7 +21,7 @@
K_THREAD_STACK_DEFINE(test_1_stack, INHERIT_STACK_SIZE);
K_THREAD_STACK_DEFINE(parent_thr_stack, STACK_SIZE);
K_THREAD_STACK_DEFINE(child_thr_stack, STACK_SIZE);
-Z_MEM_POOL_DEFINE(res_pool, BLK_SIZE_MIN, BLK_SIZE_MAX, BLK_NUM_MAX, BLK_ALIGN);
+K_HEAP_DEFINE(res_pool, BLK_SIZE_MAX * BLK_NUM_MAX);
K_SEM_DEFINE(inherit_sem, SEMAPHORE_INIT_COUNT, SEMAPHORE_MAX_COUNT);
K_SEM_DEFINE(sync_sem, SEM_INIT_VAL, SEM_MAX_VAL);
K_MUTEX_DEFINE(inherit_mutex);
@@ -123,18 +123,18 @@
k_thread_join(&test_1_tid, K_FOREVER);
}
-struct k_mem_pool *z_impl_ret_resource_pool_ptr(void)
+struct k_heap *z_impl_ret_resource_pool_ptr(void)
{
return _current->resource_pool;
}
-static inline struct k_mem_pool *z_vrfy_ret_resource_pool_ptr(void)
+static inline struct k_heap *z_vrfy_ret_resource_pool_ptr(void)
{
return z_impl_ret_resource_pool_ptr();
}
#include <syscalls/ret_resource_pool_ptr_mrsh.c>
-struct k_mem_pool *child_res_pool_ptr;
-struct k_mem_pool *parent_res_pool_ptr;
+struct k_heap *child_res_pool_ptr;
+struct k_heap *parent_res_pool_ptr;
void child_handler(void *p1, void *p2, void *p3)
{
@@ -177,7 +177,7 @@
parent_handler,
NULL, NULL, NULL,
PRIORITY, 0, K_NO_WAIT);
- z_thread_resource_pool_assign(&parent_thr, &res_pool);
+ k_thread_heap_assign(&parent_thr, &res_pool);
k_sem_take(&sync_sem, K_FOREVER);
zassert_true(parent_res_pool_ptr == child_res_pool_ptr,
"Resource pool of the parent thread not inherited,"
diff --git a/tests/kernel/mem_protect/mem_protect/src/mem_protect.h b/tests/kernel/mem_protect/mem_protect/src/mem_protect.h
index 13a5fda..ae88015 100644
--- a/tests/kernel/mem_protect/mem_protect/src/mem_protect.h
+++ b/tests/kernel/mem_protect/mem_protect/src/mem_protect.h
@@ -114,7 +114,7 @@
#ifndef _TEST_SYSCALLS_H_
#define _TEST_SYSCALLS_H_
-__syscall struct k_mem_pool *ret_resource_pool_ptr(void);
+__syscall struct k_heap *ret_resource_pool_ptr(void);
#include <syscalls/mem_protect.h>
diff --git a/tests/kernel/queue/src/test_queue_contexts.c b/tests/kernel/queue/src/test_queue_contexts.c
index 7230bd6..aa64a47 100644
--- a/tests/kernel/queue/src/test_queue_contexts.c
+++ b/tests/kernel/queue/src/test_queue_contexts.c
@@ -11,7 +11,7 @@
/**TESTPOINT: init via K_QUEUE_DEFINE*/
K_QUEUE_DEFINE(kqueue);
-Z_MEM_POOL_DEFINE(mem_pool_fail, 4, _MPOOL_MINBLK, 1, 4);
+Z_MEM_POOL_DEFINE(mem_pool_fail, 4, 8, 1, 4);
Z_MEM_POOL_DEFINE(mem_pool_pass, 4, 64, 4, 4);
struct k_queue queue;
