mirror of
https://github.com/zephyrproject-rtos/zephyr
synced 2025-09-13 06:01:57 +00:00
0dd83b8c2e
This adds a k_heap data structure, a synchronized wrapper around a sys_heap memory allocator. As of this patch, it is an alternative implementation to k_mem_pool() with somewhat better efficiency and performance and more conventional (and convenient) behavior. Note that commit involves some header motion to break dependencies. The declaration for struct k_spinlock moves to kernel_structs.h, and a bunch of includes were trimmed. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
61 lines
1.3 KiB
C
61 lines
1.3 KiB
C
/*
|
|
* Copyright (c) 2020 Intel Corporation
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <kernel.h>
|
|
#include <ksched.h>
|
|
#include <wait_q.h>
|
|
#include <init.h>
|
|
|
|
void k_heap_init(struct k_heap *h, void *mem, size_t bytes)
|
|
{
|
|
z_waitq_init(&h->wait_q);
|
|
sys_heap_init(&h->heap, mem, bytes);
|
|
}
|
|
|
|
static int statics_init(struct device *unused)
|
|
{
|
|
ARG_UNUSED(unused);
|
|
Z_STRUCT_SECTION_FOREACH(k_heap, h) {
|
|
k_heap_init(h, h->heap.init_mem, h->heap.init_bytes);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
SYS_INIT(statics_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_OBJECTS);
|
|
|
|
void *k_heap_alloc(struct k_heap *h, size_t bytes, k_timeout_t timeout)
|
|
{
|
|
s64_t now, end = z_timeout_end_calc(timeout);
|
|
void *ret = NULL;
|
|
k_spinlock_key_t key = k_spin_lock(&h->lock);
|
|
|
|
__ASSERT(!arch_is_in_isr() || K_TIMEOUT_EQ(timeout, K_NO_WAIT), "");
|
|
|
|
while (ret == NULL) {
|
|
ret = sys_heap_alloc(&h->heap, bytes);
|
|
|
|
now = z_tick_get();
|
|
if ((ret != NULL) || ((end - now) <= 0)) {
|
|
break;
|
|
}
|
|
|
|
(void) z_pend_curr(&h->lock, key, &h->wait_q,
|
|
K_TICKS(end - now));
|
|
key = k_spin_lock(&h->lock);
|
|
}
|
|
|
|
k_spin_unlock(&h->lock, key);
|
|
return ret;
|
|
}
|
|
|
|
void k_heap_free(struct k_heap *h, void *mem)
|
|
{
|
|
k_spinlock_key_t key = k_spin_lock(&h->lock);
|
|
|
|
sys_heap_free(&h->heap, mem);
|
|
k_spin_unlock(&h->lock, key);
|
|
}
|