michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: k_aligned_alloc: simplify assertion

Browse source 
Let's avoid division and modulus operations as they're costly... and even
more so when they're unnecessary as in this case the main constraint is
about the alignment being a power of 2 which is a very small subset of
sizeof(void *) multiples.

Then move the assertion to common code for wider coverage.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
This commit is contained in:
Nicolas Pitre 2025-03-10 17:02:48 -04:00 • committed by Benjamin Cabé
commit 31244724a2
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
kernel/mempool.c
View file

@ -15,6 +15,10 @@ static void *z_heap_aligned_alloc(struct k_heap *heap, size_t align, size_t size
struct k_heap **heap_ref;
size_t __align;
/* A power of 2 as well as 0 is OK */
__ASSERT((align & (align - 1)) == 0,
"align must be a power of 2");
/*
* Adjust the size to make room for our heap reference.
* Merge a rewind bit with align value (see sys_heap_aligned_alloc()).
@ -64,13 +68,6 @@ K_HEAP_DEFINE(_system_heap, K_HEAP_MEM_POOL_SIZE);
void *k_aligned_alloc(size_t align, size_t size)
{
__ASSERT(align / sizeof(void *) >= 1
&& (align % sizeof(void *)) == 0,
"align must be a multiple of sizeof(void *)");
__ASSERT((align & (align - 1)) == 0,
"align must be a power of 2");
SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_heap_sys, k_aligned_alloc, _SYSTEM_HEAP);
void *ret = z_heap_aligned_alloc(_SYSTEM_HEAP, align, size);