From e54b3828b8ddfd5a9b9b5545b5fb1d96ba6551d4 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 11 May 2021 17:15:15 -0400 Subject: [PATCH] Disable sched_switch bitwise enum in default build MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Only generate the bitwise enumerations when CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM is enabled, so the default build does not generate traces which lead to warnings when viewed with babeltrace 1.x and babeltrace 2 with default options. Original commit: commit 721caea47b6506f7ad9086c3e9801dc9dfe06b6a Author: Geneviève Bastien Date: Wed Feb 12 16:58:25 2020 -0500 sched: Make the sched_switch task state an enum Change-Id: Ib19d06365fbed7daa9440d5dfff283c4f89db6ee Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- include/instrumentation/events/sched.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h index 29bce672..91953a6f 100644 --- a/include/instrumentation/events/sched.h +++ b/include/instrumentation/events/sched.h @@ -165,6 +165,7 @@ static inline long __trace_sched_switch_state(struct task_struct *p) #endif /* _TRACE_SCHED_DEF_ */ +#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM /* * Enumeration of the task state bitmask. * Only bit flags are enumerated here, not composition of states. @@ -198,6 +199,7 @@ LTTNG_TRACEPOINT_ENUM(task_state, ctf_enum_value("TASK_STATE_MAX", TASK_STATE_MAX) ) ) +#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */ /* * Tracepoint for calling kthread_stop, performed to end a kthread: @@ -339,9 +341,17 @@ LTTNG_TRACEPOINT_EVENT(sched_switch, ctf_integer(pid_t, prev_tid, prev->pid) ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO) #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0)) +#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev)) #else + ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev)) +#endif +#else +#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(prev)) +#else + ctf_integer(long, prev_state, __trace_sched_switch_state(prev)) +#endif #endif ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN) ctf_integer(pid_t, next_tid, next->pid) -- 2.34.1