summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f52e9f4)
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 <gbastien@versatic.net>
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 <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
#endif /* _TRACE_SCHED_DEF_ */
#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.
/*
* Enumeration of the task state bitmask.
* Only bit flags are enumerated here, not composition of states.
ctf_enum_value("TASK_STATE_MAX", TASK_STATE_MAX)
)
)
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:
/*
* Tracepoint for calling kthread_stop, performed to end a kthread:
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))
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_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))
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)
#endif
ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN)
ctf_integer(pid_t, next_tid, next->pid)