michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: heap: rename 'free' and 'alloc'

Browse source 
This symbol is reserved and usage of reserved symbols violates the
coding guidelines. (MISRA 21.2)

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2021-03-22 08:01:59 -04:00
commit 1b6933d231
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -171,8 +171,8 @@ bool sys_heap_validate(struct sys_heap *heap)
} }
struct z_heap_stress_rec { struct z_heap_stress_rec {
void *(*alloc)(void *arg, size_t bytes); void *(*alloc_fn)(void *arg, size_t bytes);
void (*free)(void *arg, void *p); void (*free_fn)(void *arg, void *p);
void *arg; void *arg;
size_t total_bytes; size_t total_bytes;
struct z_heap_stress_block *blocks; struct z_heap_stress_block *blocks;
@ -265,8 +265,8 @@ static size_t rand_free_choice(struct z_heap_stress_rec *sr)
* scratch array is used to store temporary state and should be sized * scratch array is used to store temporary state and should be sized
* about half as large as the heap itself. Returns true on success. * about half as large as the heap itself. Returns true on success.
*/ */
void sys_heap_stress(void *(*alloc)(void *arg, size_t bytes), void sys_heap_stress(void *(*alloc_fn)(void *arg, size_t bytes),
void (*free)(void *arg, void *p), void (*free_fn)(void *arg, void *p),
void *arg, size_t total_bytes, void *arg, size_t total_bytes,
uint32_t op_count, uint32_t op_count,
void *scratch_mem, size_t scratch_bytes, void *scratch_mem, size_t scratch_bytes,
@ -274,8 +274,8 @@ void sys_heap_stress(void *(*alloc)(void *arg, size_t bytes),
struct z_heap_stress_result *result) struct z_heap_stress_result *result)
{ {
struct z_heap_stress_rec sr = { struct z_heap_stress_rec sr = {
.alloc = alloc, .alloc_fn = alloc_fn,
.free = free, .free_fn = free_fn,
.arg = arg, .arg = arg,
.total_bytes = total_bytes, .total_bytes = total_bytes,
.blocks = scratch_mem, .blocks = scratch_mem,
@ -288,7 +288,7 @@ void sys_heap_stress(void *(*alloc)(void *arg, size_t bytes),
for (uint32_t i = 0; i < op_count; i++) { for (uint32_t i = 0; i < op_count; i++) {
if (rand_alloc_choice(&sr)) { if (rand_alloc_choice(&sr)) {
size_t sz = rand_alloc_size(&sr); size_t sz = rand_alloc_size(&sr);
void *p = sr.alloc(sr.arg, sz); void *p = sr.alloc_fn(sr.arg, sz);
result->total_allocs++; result->total_allocs++;
if (p != NULL) { if (p != NULL) {
@ -307,7 +307,7 @@ void sys_heap_stress(void *(*alloc)(void *arg, size_t bytes),
sr.blocks[b] = sr.blocks[sr.blocks_alloced - 1]; sr.blocks[b] = sr.blocks[sr.blocks_alloced - 1];
sr.blocks_alloced--; sr.blocks_alloced--;
sr.bytes_alloced -= sz; sr.bytes_alloced -= sz;
sr.free(sr.arg, p); sr.free_fn(sr.arg, p);
} }
result->accumulated_in_use_bytes += sr.bytes_alloced; result->accumulated_in_use_bytes += sr.bytes_alloced;
} }