Skip to content

heap_listener: only use designated initializer #96923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+31 −43
Open

heap_listener: only use designated initializer #96923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf282c4
heap_listener: clang-format files
Oct 2, 2025
8824f4a
heap_listener: only use designated initializer
Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 22 additions & 31 deletions include/zephyr/sys/heap_listener.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ enum heap_event_types {
* @param old_heap_end Pointer to end of heap before resize
* @param new_heap_end Pointer to end of heap after resize
*/
typedef void (*heap_listener_resize_cb_t)(uintptr_t heap_id,
void *old_heap_end,
typedef void (*heap_listener_resize_cb_t)(uintptr_t heap_id, void *old_heap_end,
void *new_heap_end);

/**
Expand All @@ -68,8 +67,7 @@ typedef void (*heap_listener_resize_cb_t)(uintptr_t heap_id,
* @param mem Pointer to the allocated memory
* @param bytes Size of allocated memory
*/
typedef void (*heap_listener_alloc_cb_t)(uintptr_t heap_id,
void *mem, size_t bytes);
typedef void (*heap_listener_alloc_cb_t)(uintptr_t heap_id, void *mem, size_t bytes);

/**
* @typedef heap_listener_free_cb_t
Expand All @@ -87,8 +85,7 @@ typedef void (*heap_listener_alloc_cb_t)(uintptr_t heap_id,
* @param mem Pointer to the freed memory
* @param bytes Size of freed memory
*/
typedef void (*heap_listener_free_cb_t)(uintptr_t heap_id,
void *mem, size_t bytes);
typedef void (*heap_listener_free_cb_t)(uintptr_t heap_id, void *mem, size_t bytes);

struct heap_listener {
/** Singly linked list node */
Expand All @@ -108,10 +105,10 @@ struct heap_listener {
enum heap_event_types event;

union {
heap_listener_alloc_cb_t alloc_cb;
heap_listener_free_cb_t free_cb;
heap_listener_resize_cb_t resize_cb;
};
heap_listener_alloc_cb_t alloc;
heap_listener_free_cb_t free;
heap_listener_resize_cb_t resize;
} cb;
};

/**
Expand Down Expand Up @@ -205,13 +202,11 @@ void heap_listener_notify_resize(uintptr_t heap_id, void *old_heap_end, void *ne
* @param _heap_id Identifier of the heap to be listened
* @param _alloc_cb Function to be called for allocation event
*/
#define HEAP_LISTENER_ALLOC_DEFINE(name, _heap_id, _alloc_cb) \
struct heap_listener name = { \
.heap_id = _heap_id, \
.event = HEAP_ALLOC, \
{ \
.alloc_cb = _alloc_cb \
}, \
#define HEAP_LISTENER_ALLOC_DEFINE(name, _heap_id, _alloc_cb) \
struct heap_listener name = { \
.heap_id = _heap_id, \
.event = HEAP_ALLOC, \
.cb = {.alloc = _alloc_cb}, \
}

/**
Expand All @@ -231,13 +226,11 @@ void heap_listener_notify_resize(uintptr_t heap_id, void *old_heap_end, void *ne
* @param _heap_id Identifier of the heap to be listened
* @param _free_cb Function to be called for free event
*/
#define HEAP_LISTENER_FREE_DEFINE(name, _heap_id, _free_cb) \
struct heap_listener name = { \
.heap_id = _heap_id, \
.event = HEAP_FREE, \
{ \
.free_cb = _free_cb \
}, \
#define HEAP_LISTENER_FREE_DEFINE(name, _heap_id, _free_cb) \
struct heap_listener name = { \
.heap_id = _heap_id, \
.event = HEAP_FREE, \
.cb = {.free = _free_cb}, \
}

/**
Expand All @@ -257,13 +250,11 @@ void heap_listener_notify_resize(uintptr_t heap_id, void *old_heap_end, void *ne
* @param _heap_id Identifier of the heap to be listened
* @param _resize_cb Function to be called when the listened heap is resized
*/
#define HEAP_LISTENER_RESIZE_DEFINE(name, _heap_id, _resize_cb) \
struct heap_listener name = { \
.heap_id = _heap_id, \
.event = HEAP_RESIZE, \
{ \
.resize_cb = _resize_cb \
}, \
#define HEAP_LISTENER_RESIZE_DEFINE(name, _heap_id, _resize_cb) \
struct heap_listener name = { \
.heap_id = _heap_id, \
.event = HEAP_RESIZE, \
.cb = {.resize = _resize_cb}, \
}

/** @} */
Expand Down
21 changes: 9 additions & 12 deletions lib/heap/heap_listener.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ void heap_listener_notify_alloc(uintptr_t heap_id, void *mem, size_t bytes)
k_spinlock_key_t key = k_spin_lock(&heap_listener_lock);

SYS_SLIST_FOR_EACH_CONTAINER(&heap_listener_list, listener, node) {
if (listener->heap_id == heap_id
&& listener->alloc_cb != NULL
&& listener->event == HEAP_ALLOC) {
listener->alloc_cb(heap_id, mem, bytes);
if (listener->heap_id == heap_id && listener->cb.alloc != NULL &&
listener->event == HEAP_ALLOC) {
listener->cb.alloc(heap_id, mem, bytes);
}
}

Expand All @@ -50,10 +49,9 @@ void heap_listener_notify_free(uintptr_t heap_id, void *mem, size_t bytes)
k_spinlock_key_t key = k_spin_lock(&heap_listener_lock);

SYS_SLIST_FOR_EACH_CONTAINER(&heap_listener_list, listener, node) {
if (listener->heap_id == heap_id
&& listener->free_cb != NULL
&& listener->event == HEAP_FREE) {
listener->free_cb(heap_id, mem, bytes);
if (listener->heap_id == heap_id && listener->cb.free != NULL &&
listener->event == HEAP_FREE) {
listener->cb.free(heap_id, mem, bytes);
}
}

Expand All @@ -66,10 +64,9 @@ void heap_listener_notify_resize(uintptr_t heap_id, void *old_heap_end, void *ne
k_spinlock_key_t key = k_spin_lock(&heap_listener_lock);

SYS_SLIST_FOR_EACH_CONTAINER(&heap_listener_list, listener, node) {
if (listener->heap_id == heap_id
&& listener->resize_cb != NULL
&& listener->event == HEAP_RESIZE) {
listener->resize_cb(heap_id, old_heap_end, new_heap_end);
if (listener->heap_id == heap_id && listener->cb.resize != NULL &&
listener->event == HEAP_RESIZE) {
listener->cb.resize(heap_id, old_heap_end, new_heap_end);
}
}

Expand Down
Loading