bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include: zephyr: sys: simplify MIN_HEAP_FOREACH macro

Browse Source 
Refactor the `MIN_HEAP_FOREACH` macro to use a cleaner
for-loop style removing the need for a third `body` argument.
Update the sample application with the new macro changes.

Signed-off-by: Sayooj K Karun <sayooj@aerlync.com>
This commit is contained in:
Sayooj K Karun 2025-06-12 17:44:14 +05:30 committed by Anas Nashif
parent 964a832702
commit e719ba239f
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.clang-format
View File

@ -82,6 +82,7 @@ ForEachMacros:
- 'HTTP_SERVICE_FOREACH_RESOURCE'
- 'I3C_BUS_FOR_EACH_I3CDEV'
- 'I3C_BUS_FOR_EACH_I2CDEV'
- 'MIN_HEAP_FOREACH'
IfMacros:
- 'CHECKIF'
# Disabled for now, see bug https://github.com/zephyrproject-rtos/zephyr/issues/48520

15
include/zephyr/sys/min_heap.h
View File

@ -220,23 +220,18 @@ static inline void *min_heap_get_element(const struct min_heap *heap,
*
* @param heap Pointer to the heap.
* @param node_var The loop variable used to reference each node.
* @param body Code block to execute for each node.
*
* Example:
* ```
* void *node;
* MIN_HEAP_FOREACH(&heap, node, {
* MIN_HEAP_FOREACH(&heap, node) {
* printk("Value: %d\n", node->value);
* });
* }
* ```
*/
#define MIN_HEAP_FOREACH(heap, node_var, body) \
do { for (size_t _i = 0; _i < (heap)->size && \
(((node_var) = min_heap_get_element((heap), _i)) || true); \
++_i) { \
body; \
} \
} while (0)
#define MIN_HEAP_FOREACH(heap, node_var) \
for (size_t _i = 0; \
_i < (heap)->size && (((node_var) = min_heap_get_element((heap), _i)) || true); ++_i)
/**
* @}

8
samples/data_structures/min-heap/src/main.c
View File

@ -57,11 +57,11 @@ int main(void)
}
printk("Heap elements by order of priority:\n");
MIN_HEAP_FOREACH(&my_heap, elem, {
MIN_HEAP_FOREACH(&my_heap, elem) {
struct data *d = elem;
printk("key=%d value=%d\n", d->key, d->value);
});
}
printk("Top of heap: ");
top = min_heap_peek(&my_heap);
@ -77,11 +77,11 @@ int main(void)
}
printk("Heap after removal:\n");
MIN_HEAP_FOREACH(&my_heap, elem, {
MIN_HEAP_FOREACH(&my_heap, elem) {
struct data *d = elem;
printk("key=%d value=%d\n", d->key, d->value);
});
}
return 0;
}