michaelh/zephyr
1
0
Fork 0
Code Releases Activity

lib/os/heap-validate: code cleanup

Browse source 
Remove code duplication, use common code idiom, etc.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
This commit is contained in:
Nicolas Pitre 2021-11-12 00:12:29 -05:00 • committed by Anas Nashif
commit 5aeb809374
1 changed files with 21 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

67
lib/os/heap-validate.c
View file

@ -67,42 +67,27 @@ static inline void check_nexts(struct z_heap *h, int bidx)
} }
} }
#ifdef CONFIG_SYS_HEAP_RUNTIME_STATS static void get_alloc_info(struct z_heap *h, size_t *alloc_bytes,
size_t *free_bytes)
static inline void sys_heap_get_info(struct sys_heap *heap,
struct sys_heap_runtime_stats *stats)
{ {
chunkid_t c = 0; chunkid_t c;
struct z_heap *h = heap->heap;
stats->allocated_bytes = 0; *alloc_bytes = 0;
stats->free_bytes = 0; *free_bytes = 0;
do { for (c = right_chunk(h, 0); c < h->end_chunk; c = right_chunk(h, c)) {
if (chunk_used(h, c)) { if (chunk_used(h, c)) {
if ((c != 0) && (c != h->end_chunk)) { *alloc_bytes += chunksz_to_bytes(h, chunk_size(h, c));
stats->allocated_bytes += } else if (!solo_free_header(h, c)) {
chunksz_to_bytes(h, chunk_size(h, c)); *free_bytes += chunksz_to_bytes(h, chunk_size(h, c));
}
} else {
if (!solo_free_header(h, c)) {
stats->free_bytes +=
chunksz_to_bytes(h, chunk_size(h, c));
}
} }
c = right_chunk(h, c); }
} while (c != h->end_chunk);
} }
#endif
bool sys_heap_validate(struct sys_heap *heap) bool sys_heap_validate(struct sys_heap *heap)
{ {
struct z_heap *h = heap->heap; struct z_heap *h = heap->heap;
chunkid_t c; chunkid_t c;
#ifdef CONFIG_SYS_HEAP_RUNTIME_STATS
struct sys_heap_runtime_stats stat1, stat2;
#endif
/* /*
* Walk through the chunks linearly, verifying sizes and end pointer. * Walk through the chunks linearly, verifying sizes and end pointer.
@ -123,11 +108,13 @@ bool sys_heap_validate(struct sys_heap *heap)
* free bytes, then compare with the results of * free bytes, then compare with the results of
* sys_heap_runtime_stats_get function. * sys_heap_runtime_stats_get function.
*/ */
sys_heap_runtime_stats_get(heap, &stat1); size_t allocated_bytes, free_bytes;
sys_heap_get_info(heap, &stat2); struct sys_heap_runtime_stats stat;
if ((stat1.allocated_bytes != stat2.allocated_bytes) || get_alloc_info(h, &allocated_bytes, &free_bytes);
(stat1.free_bytes != stat2.free_bytes)) { sys_heap_runtime_stats_get(heap, &stat);
if ((stat.allocated_bytes != allocated_bytes) ||
(stat.free_bytes != free_bytes)) {
return false; return false;
} }
#endif #endif
@ -393,20 +380,7 @@ void heap_print_info(struct z_heap *h, bool dump_chunks)
if (dump_chunks) { if (dump_chunks) {
printk("\nChunk dump:\n"); printk("\nChunk dump:\n");
} for (chunkid_t c = 0; ; c = right_chunk(h, c)) {
free_bytes = allocated_bytes = 0;
for (chunkid_t c = 0; ; c = right_chunk(h, c)) {
if (chunk_used(h, c)) {
if ((c != 0) && (c != h->end_chunk)) {
/* 1st and last are always allocated for internal purposes */
allocated_bytes += chunksz_to_bytes(h, chunk_size(h, c));
}
} else {
if (!solo_free_header(h, c)) {
free_bytes += chunksz_to_bytes(h, chunk_size(h, c));
}
}
if (dump_chunks) {
printk("chunk %4d: [%c] size=%-4d left=%-4d right=%d\n", printk("chunk %4d: [%c] size=%-4d left=%-4d right=%d\n",
c, c,
chunk_used(h, c) ? '*' chunk_used(h, c) ? '*'
@ -415,12 +389,13 @@ void heap_print_info(struct z_heap *h, bool dump_chunks)
chunk_size(h, c), chunk_size(h, c),
left_chunk(h, c), left_chunk(h, c),
right_chunk(h, c)); right_chunk(h, c));
} if (c == h->end_chunk) {
if (c == h->end_chunk) { break;
break; }
} }
} }
get_alloc_info(h, &allocated_bytes, &free_bytes);
/* The end marker chunk has a header. It is part of the overhead. */ /* The end marker chunk has a header. It is part of the overhead. */
total = h->end_chunk * CHUNK_UNIT + chunk_header_bytes(h); total = h->end_chunk * CHUNK_UNIT + chunk_header_bytes(h);
overhead = total - free_bytes - allocated_bytes; overhead = total - free_bytes - allocated_bytes;