From: Geneviève Bastien <gbastien+lttng@versatic.net>
Date: Mon, 13 Feb 2017 15:48:03 +0000 (-0500)
Subject: os.linux: Have the I/O analysis depend on TID
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=be7cf478142a73a43c01e1e69f3f286d027d2519;p=deliverable%2Ftracecompass.git

os.linux: Have the I/O analysis depend on TID

It uses this dependency through the aspect, but the aspect uses TID
analysis now, not the kernel analysis anymore.

Change-Id: I028a7ea98ead5023aea3113148332f837391ca54
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/91054
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
---

diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/inputoutput/InputOutputAnalysisModule.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/inputoutput/InputOutputAnalysisModule.java
index 2e0fcf68f1..edb9a8e749 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/inputoutput/InputOutputAnalysisModule.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/inputoutput/InputOutputAnalysisModule.java
@@ -14,7 +14,7 @@ import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelAnalysisModule;
+import org.eclipse.tracecompass.analysis.os.linux.core.tid.TidAnalysisModule;
 import org.eclipse.tracecompass.analysis.os.linux.core.trace.DefaultEventLayout;
 import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelAnalysisEventLayout;
 import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelTrace;
@@ -67,10 +67,10 @@ public class InputOutputAnalysisModule extends TmfStateSystemAnalysisModule {
          * This analysis depends on the LTTng kernel analysis, so it's added to
          * dependent modules.
          */
-        Iterable<KernelAnalysisModule> kernelModules = TmfTraceUtils.getAnalysisModulesOfClass(trace, KernelAnalysisModule.class);
-        for (KernelAnalysisModule kernelModule : kernelModules) {
+        Iterable<TidAnalysisModule> tidModules = TmfTraceUtils.getAnalysisModulesOfClass(trace, TidAnalysisModule.class);
+        for (TidAnalysisModule tidModule : tidModules) {
             /* Only add the first one we find, if there is one */
-            modules.add(kernelModule);
+            modules.add(tidModule);
             break;
         }
         return modules;