Skip to content

Trace - make clear that trace context is unused with Zephyr #11102

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
lyakh wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Trace - make clear that trace context is unused with Zephyr #11102

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e51e411
audio, drivers: srop trace contexts under Zephyr
lyakh Aug 17, 2026
2336e0e
audio, ipc: stop copying trace context on Zephyr builds
lyakh Aug 17, 2026
91790f3
trace: annotate remaining DECLARE_TR_CTX calls
lyakh Aug 17, 2026
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
4 changes: 4 additions & 0 deletions src/audio/pipeline/pipeline-graph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ LOG_MODULE_REGISTER(pipe, CONFIG_SOF_LOG_LEVEL);

SOF_DEFINE_REG_UUID(pipe);

@kv2019i kv2019i Aug 17, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's with the "!CONFIG_SOF_USERSPACE_LL" in the commit message?


/* unused with Zephyr, generates no output */
DECLARE_TR_CTX(pipe_tr, SOF_UUID(pipe_uuid), LOG_LEVEL_INFO);

/* number of pipeline stream metadata objects we export in mailbox */
Expand Down Expand Up @@ -140,12 +141,15 @@ struct pipeline *pipeline_new(struct k_heap *heap, uint32_t pipeline_id, uint32_
p->pipeline_id = pipeline_id;
p->status = COMP_STATE_INIT;
p->trigger.cmd = COMP_TRIGGER_NO_ACTION;
#ifndef __ZEPHYR__
/* Zephyr's tr_*() macros ignore the trace context, no need to copy it */
ret = memcpy_s(&p->tctx, sizeof(struct tr_ctx), &pipe_tr,
sizeof(struct tr_ctx));
if (ret < 0) {
pipe_err(p, "failed to copy trace settings");
goto free;
}
#endif

ret = pipeline_posn_offset_get(&p->posn_offset);
if (ret < 0) {
Expand Down
3 changes: 2 additions & 1 deletion src/ipc/ipc-helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ __cold struct comp_buffer *buffer_new(struct mod_alloc_ctx *alloc,
buffer->stream.runtime_stream_params.pipeline_id = desc->comp.pipeline_id;
buffer->core = desc->comp.core;

#if !defined(CONFIG_SOF_USERSPACE_LL)
/* Zephyr's tr_*() macros ignore the trace context, no need to copy it */
#ifndef __ZEPHYR__
memcpy_s(&buffer->tctx, sizeof(struct tr_ctx),
&buffer_tr, sizeof(struct tr_ctx));
#endif
Expand Down