From: Alexandre Montplaisir <alexmonthy@efficios.com>
Date: Fri, 25 Nov 2016 20:43:14 +0000 (-0500)
Subject: lttng: Also apply the wakeup handler to sched_waking
X-Git-Url: http://git.efficios.com/?p=deliverable%2Ftracecompass.git;a=commitdiff_plain;h=a011e19bb550a5741b4aa301106613087865d20c

lttng: Also apply the wakeup handler to sched_waking

LTTng 2.8 (and kernels around that time) introduced the
sched_waking event. This event has the same fields as the
sched_wakeup one, and should cause the same state changes.

Change-Id: Idf9eaf1ecba0346b22283adfbe71ad56d52b045f
Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>
---

diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/trace/layout/Lttng28EventLayout.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/trace/layout/Lttng28EventLayout.java
index cd3a9e175c..1aafba6941 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/trace/layout/Lttng28EventLayout.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/trace/layout/Lttng28EventLayout.java
@@ -9,6 +9,10 @@
 
 package org.eclipse.tracecompass.internal.lttng2.kernel.core.trace.layout;
 
+import java.util.Collection;
+
+import com.google.common.collect.ImmutableList;
+
 /**
  * This file defines all the known event and field names for LTTng kernel
  * traces, for versions of lttng-modules 2.8 and above.
@@ -17,10 +21,16 @@ package org.eclipse.tracecompass.internal.lttng2.kernel.core.trace.layout;
  */
 public class Lttng28EventLayout extends Lttng27EventLayout {
 
+    private final Collection<String> fSchedWakeupEvents28;
+
     /**
      * Constructor
      */
     protected Lttng28EventLayout() {
+        fSchedWakeupEvents28 = ImmutableList.<String> builder()
+                .addAll(super.eventsSchedWakeup())
+                .add(eventSchedProcessWaking())
+                .build();
     }
 
     private static final Lttng28EventLayout INSTANCE = new Lttng28EventLayout();
@@ -44,4 +54,9 @@ public class Lttng28EventLayout extends Lttng27EventLayout {
         return "sched_waking"; //$NON-NLS-1$
     }
 
+    @Override
+    public Collection<String> eventsSchedWakeup() {
+        return fSchedWakeupEvents28;
+    }
+
 }