Skip to content

sof: trace: Do not have empty trace macros when traces are off #2022

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

Merged
tlauda merged 2 commits into from
Oct 30, 2019
Merged

sof: trace: Do not have empty trace macros when traces are off #2022

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
18d9ca9
sof: trace: Do not have empty trace macros when traces are off
Oct 29, 2019
db91fce
sof: debug: Do not have empty debug macros when debug is disabled
Oct 29, 2019
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
14 changes: 7 additions & 7 deletions src/include/sof/debug/debug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,13 @@
(IS_ENABLED(CONFIG_GDB_DEBUG) ? SOF_IPC_INFO_GDB : 0) \
)

#define dbg()
#define dbg_at(__x)
#define dbg_val(__v)
#define dbg_val_at(__v, __x)
#define dump(addr, count)
#define dump_object(__o)
#define dump_object_ptr(__o)
#define dbg() do {} while (0)
#define dbg_at(__x) do {} while (0)
#define dbg_val(__v) do {} while (0)
#define dbg_val_at(__v, __x) do {} while (0)
#define dump(addr, count) do {} while (0)
#define dump_object(__o) do {} while (0)
#define dump_object_ptr(__o) do {} while (0)
#endif

/* dump stack as part of panic */
Expand Down
8 changes: 4 additions & 4 deletions src/include/sof/spinlock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,11 @@ extern uint32_t lock_dbg_user[DBG_LOCK_USERS];

#else

#define trace_lock(__e)
#define tracev_lock(__e)
#define trace_lock(__e) do {} while (0)
#define tracev_lock(__e) do {} while (0)

#define spin_lock_dbg()
#define spin_unlock_dbg()
#define spin_lock_dbg() do {} while (0)
#define spin_unlock_dbg() do {} while (0)

/* all SMP spinlocks need init, nothing todo on UP */
#define spinlock_init(lock) \
Expand Down
50 changes: 25 additions & 25 deletions src/include/sof/trace/trace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,13 @@ void trace_init(struct sof *sof);
#define tracev_value(x) trace_value(x)
#define tracev_value_atomic(x) trace_value_atomic(x)
#else
#define tracev_event(...)
#define tracev_event_with_ids(...)
#define tracev_event_atomic(...)
#define tracev_event_atomic_with_ids(...)
#define tracev_event(...) do {} while (0)
#define tracev_event_with_ids(...) do {} while (0)
#define tracev_event_atomic(...) do {} while (0)
#define tracev_event_atomic_with_ids(...) do {} while (0)

#define tracev_value(x)
#define tracev_value_atomic(x)
#define tracev_value(x) do {} while (0)
#define tracev_value_atomic(x) do {} while (0)
#endif

/* error tracing */
Expand Down Expand Up @@ -338,30 +338,30 @@ do { \
#endif
#else

#define trace_event(...)
#define trace_event_atomic(...)
#define trace_event_with_ids(...)
#define trace_event_atomic_with_ids(...)
#define trace_event(...) do {} while (0)
#define trace_event_atomic(...) do {} while (0)
#define trace_event_with_ids(...) do {} while (0)
#define trace_event_atomic_with_ids(...) do {} while (0)

#define trace_error_with_ids(...)
#define trace_error(...)
#define trace_error_atomic(...)
#define trace_error_atomic_with_ids(...)
#define trace_error_with_ids(...) do {} while (0)
#define trace_error(...) do {} while (0)
#define trace_error_atomic(...) do {} while (0)
#define trace_error_atomic_with_ids(...) do {} while (0)

#define trace_error_value(x)
#define trace_error_value_atomic(x)
#define trace_error_value(x) do {} while (0)
#define trace_error_value_atomic(x) do {} while (0)

#define trace_value(x)
#define trace_value_atomic(x)
#define trace_value(x) do {} while (0)
#define trace_value_atomic(x) do {} while (0)

#define trace_point(x)
#define trace_point(x) do {} while (0)

#define tracev_event(...)
#define tracev_event_with_ids(...)
#define tracev_event_atomic(...)
#define tracev_event_atomic_with_ids(...)
#define tracev_value(x)
#define tracev_value_atomic(x)
#define tracev_event(...) do {} while (0)
#define tracev_event_with_ids(...) do {} while (0)
#define tracev_event_atomic(...) do {} while (0)
#define tracev_event_atomic_with_ids(...) do {} while (0)
#define tracev_value(x) do {} while (0)
#define tracev_value_atomic(x) do {} while (0)

#endif

Expand Down