From: "Steven Rostedt (VMware)" <rostedt@xxxxxxxxxxx>
It is now more common to enable the sched_waking event than to use the
sched_wakeup or sched_wakeup_new, as it encompasses both. But the sched
plugin does not handle that. Fix that by including the sched_waking event as
an event to use for processing schedule wakeup events.
Signen-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
---
kernel-shark/src/plugins/sched_events.c | 6 ++++++
kernel-shark/src/plugins/sched_events.h | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/kernel-shark/src/plugins/sched_events.c b/kernel-shark/src/plugins/sched_events.c
index 0cfe5b5367e2..14f8edb2836b 100644
--- a/kernel-shark/src/plugins/sched_events.c
+++ b/kernel-shark/src/plugins/sched_events.c
@@ -85,6 +85,10 @@ static bool plugin_sched_init_context(struct kshark_context *kshark_ctx)
&plugin_ctx->sched_wakeup_new_event,
&plugin_ctx->sched_wakeup_new_pid_field);
+ wakeup_found |= define_wakeup_event(kshark_ctx->pevent, "sched_waking",
+ &plugin_ctx->sched_waking_event,
+ &plugin_ctx->sched_waking_pid_field);
+
if (!wakeup_found)
return false;
@@ -158,10 +162,12 @@ static bool wakeup_match_rec_pid(struct plugin_sched_context *plugin_ctx,
int pid)
{
struct tep_event *wakeup_events[] = {
+ plugin_ctx->sched_waking_event,
plugin_ctx->sched_wakeup_event,
plugin_ctx->sched_wakeup_new_event,
};
struct tep_format_field *wakeup_fields[] = {
+ plugin_ctx->sched_waking_pid_field,
plugin_ctx->sched_wakeup_pid_field,
plugin_ctx->sched_wakeup_new_pid_field,
};
diff --git a/kernel-shark/src/plugins/sched_events.h b/kernel-shark/src/plugins/sched_events.h
index 0beb63fe2b48..dbc9963cbc4e 100644
--- a/kernel-shark/src/plugins/sched_events.h
+++ b/kernel-shark/src/plugins/sched_events.h
@@ -51,6 +51,12 @@ struct plugin_sched_context {
/** Pointer to the sched_wakeup_new_pid_field format descriptor. */
struct tep_format_field *sched_wakeup_new_pid_field;
+ /** Pointer to the sched_waking_event object. */
+ struct tep_event *sched_waking_event;
+
+ /** Pointer to the sched_waking_pid_field format descriptor. */
+ struct tep_format_field *sched_waking_pid_field;
+
/** List of Data collections used by this plugin. */
struct kshark_entry_collection *collections;
--
2.20.1
|