adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

Tracing: Fix extra function calls when using FIFO tracing macros.

Browse source 
Fixes issue where function returns being used as data arguments to
k_fifo tracing macros were being called mulitple times due to
preprocessor copying  macro arguments during expansion.

Signed-off-by: Anthony Williams <anthony289478@gmail.com>
This commit is contained in:
Anthony Williams 2024-12-10 20:05:16 -05:00 committed by Benjamin Cabé
parent 913fddb80e
commit 4272353e29
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
include/zephyr/kernel.h
View file

@ -2544,9 +2544,10 @@ struct k_fifo {
*/ */
#define k_fifo_put(fifo, data) \ #define k_fifo_put(fifo, data) \
({ \ ({ \
SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_fifo, put, fifo, data); \ void *_data = data; \
k_queue_append(&(fifo)->_queue, data); \ SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_fifo, put, fifo, _data); \
SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_fifo, put, fifo, data); \ k_queue_append(&(fifo)->_queue, _data); \
SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_fifo, put, fifo, _data); \
}) })
/** /**
@ -2567,9 +2568,10 @@ struct k_fifo {
*/ */
#define k_fifo_alloc_put(fifo, data) \ #define k_fifo_alloc_put(fifo, data) \
({ \ ({ \
SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_fifo, alloc_put, fifo, data); \ void *_data = data; \
int fap_ret = k_queue_alloc_append(&(fifo)->_queue, data); \ SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_fifo, alloc_put, fifo, _data); \
SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_fifo, alloc_put, fifo, data, fap_ret); \ int fap_ret = k_queue_alloc_append(&(fifo)->_queue, _data); \
SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_fifo, alloc_put, fifo, _data, fap_ret); \
fap_ret; \ fap_ret; \
}) })
@ -2766,9 +2768,10 @@ struct k_lifo {
*/ */
#define k_lifo_put(lifo, data) \ #define k_lifo_put(lifo, data) \
({ \ ({ \
SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_lifo, put, lifo, data); \ void *_data = data; \
k_queue_prepend(&(lifo)->_queue, data); \ SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_lifo, put, lifo, _data); \
SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_lifo, put, lifo, data); \ k_queue_prepend(&(lifo)->_queue, _data); \
SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_lifo, put, lifo, _data); \
}) })
/** /**
@ -2789,9 +2792,10 @@ struct k_lifo {
*/ */
#define k_lifo_alloc_put(lifo, data) \ #define k_lifo_alloc_put(lifo, data) \
({ \ ({ \
SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_lifo, alloc_put, lifo, data); \ void *_data = data; \
int lap_ret = k_queue_alloc_prepend(&(lifo)->_queue, data); \ SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_lifo, alloc_put, lifo, _data); \
SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_lifo, alloc_put, lifo, data, lap_ret); \ int lap_ret = k_queue_alloc_prepend(&(lifo)->_queue, _data); \
SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_lifo, alloc_put, lifo, _data, lap_ret); \
lap_ret; \ lap_ret; \
}) })