lttng.kernel: remove getX86IrqVectorsEntry/Exit

Use getIPIIrqVectorsEntry/Exit instead. This solves the downcast issues
in BaseHandler.

Change-Id: I362712eb4e38d661d5f3066e15f5046a5de749aa
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/77782
Reviewed-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Tested-by: Alexandre Montplaisir <alexmonthy@efficios.com>

diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/graph/handlers/BaseHandler.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/graph/handlers/BaseHandler.java
index 6f6101872543cedbdabc76f52567f8579b664695..103185945c4e18ed32dd0cecb9269b3975c4f714 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/graph/handlers/BaseHandler.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/graph/handlers/BaseHandler.java
@@ -18,7 +18,6 @@ import org.eclipse.tracecompass.analysis.graph.core.building.AbstractTraceEventH
 import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelAnalysisEventLayout;
 import org.eclipse.tracecompass.common.core.NonNullUtils;
 import org.eclipse.tracecompass.internal.lttng2.kernel.core.analysis.graph.building.LttngKernelExecGraphProvider;
-import org.eclipse.tracecompass.internal.lttng2.kernel.core.trace.layout.Lttng27EventLayout;
 import org.eclipse.tracecompass.internal.lttng2.kernel.core.trace.layout.Lttng28EventLayout;
 import org.eclipse.tracecompass.internal.lttng2.kernel.core.trace.layout.LttngEventLayout;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
@@ -174,15 +173,7 @@ public class BaseHandler extends AbstractTraceEventHandler {
         String eventName = event.getName();
         ITmfTrace trace = event.getTrace();
         IKernelAnalysisEventLayout layout = getProvider().getEventLayout(trace);
-        /* awkward downcast */
-        if (layout instanceof Lttng27EventLayout) {
-            Lttng27EventLayout layout27 = (Lttng27EventLayout) layout;
-            if (entry) {
-                return layout27.getX86IrqVectorsEntry().contains(eventName);
-            }
-            return layout27.getX86IrqVectorsExit().contains(eventName);
-        }
-        return false;
+        return entry ? layout.getIPIIrqVectorsEntries().contains(eventName) : layout.getIPIIrqVectorsExits().contains(eventName);
     }
 
     @Override

diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/trace/layout/Lttng27EventLayout.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/trace/layout/Lttng27EventLayout.java
index 1d307a0b36e03bb33582c61852cda5be4801659a..d72dc9690e4691c750eb1fba10cdc01d523d0edd 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/trace/layout/Lttng27EventLayout.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/trace/layout/Lttng27EventLayout.java
@@ -224,22 +224,14 @@ public class Lttng27EventLayout extends Lttng26EventLayout {
         return X86_IRQ_VECTORS_THERMAL_APIC_EXIT;
     }
 
-    public Collection<String> getX86IrqVectorsEntry() {
-        return IPI_ENTRY_SET;
-    }
-
-    public Collection<String> getX86IrqVectorsExit() {
-        return IPI_EXIT_SET;
-    }
-
     @Override
     public @NonNull Collection<@NonNull String> getIPIIrqVectorsEntries() {
-        return getX86IrqVectorsEntry();
+        return IPI_ENTRY_SET;
     }
 
     @Override
     public @NonNull Collection<@NonNull String> getIPIIrqVectorsExits() {
-        return getX86IrqVectorsExit();
+        return IPI_EXIT_SET;
     }
 
     // ------------------------------------------------------------------------