patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

sys_heap: simplify some complex checks

Browse source 
Avoid redundancy and bucket_idx() usage when possible.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
This commit is contained in:
Nicolas Pitre 2019-09-26 15:22:24 -04:00 committed by Carles Cufí
parent d1125d21d4
commit cb3d460a2c
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/os/heap.c
View file

@ -25,8 +25,7 @@ static void free_list_remove(struct z_heap *h, int bidx,
CHECK(!chunk_used(h, c));
CHECK(b->next != 0);
CHECK(b->list_size > 0);
CHECK((((h->avail_buckets & (1 << bidx)) == 0)
== (h->buckets[bidx].next == 0)));
CHECK(h->avail_buckets & (1 << bidx));
b->list_size--;
@ -67,7 +66,7 @@ static void free_list_add(struct z_heap *h, chunkid_t c)
set_prev_free_chunk(h, second, c);
}
CHECK(h->avail_buckets & (1 << bucket_idx(h, chunk_size(h, c))));
CHECK(h->avail_buckets & (1 << bi));
}
/* Allocates (fit check has already been perfomred) from the next