os.linux: Rename the "kernelanalysis" package to just "kernel"

[deliverable/tracecompass.git] / lttng / org.eclipse.tracecompass.lttng2.kernel.core / src / org / eclipse / tracecompass / internal / lttng2 / kernel / core / analysis / vm / module / VirtualMachineStateProvider.java

diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/module/VirtualMachineStateProvider.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/module/VirtualMachineStateProvider.java
index 706f44ae87ad9c13a605f767c228b377b9edc64a..17ba06d52903f9270e29b634e711868a6ac8cb58 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/module/VirtualMachineStateProvider.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/module/VirtualMachineStateProvider.java
@@ -18,11 +18,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.tracecompass.analysis.os.linux.core.kernelanalysis.KernelAnalysisModule;
-import org.eclipse.tracecompass.analysis.os.linux.core.kernelanalysis.KernelThreadInformationProvider;
+import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelAnalysisModule;
+import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelThreadInformationProvider;
 import org.eclipse.tracecompass.analysis.os.linux.core.model.HostThread;
 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.Activator;
 import org.eclipse.tracecompass.internal.lttng2.kernel.core.analysis.vm.VcpuStateValues;
 import org.eclipse.tracecompass.internal.lttng2.kernel.core.analysis.vm.VmAttributes;
@@ -83,7 +82,7 @@ public class VirtualMachineStateProvider extends AbstractTmfStateProvider {
 
     /* TODO: An analysis should support many hypervisor models */
     private IVirtualMachineModel fModel;
-    private final Table<ITmfTrace, String, Integer> fEventNames;
+    private final Table<ITmfTrace, String, @Nullable Integer> fEventNames;
     private final Map<ITmfTrace, IKernelAnalysisEventLayout> fLayouts;
 
     // ------------------------------------------------------------------------
@@ -100,7 +99,7 @@ public class VirtualMachineStateProvider extends AbstractTmfStateProvider {
         super(experiment, "Virtual Machine State Provider"); //$NON-NLS-1$
 
         fModel = new QemuKvmVmModel(experiment);
-        Table<ITmfTrace, String, Integer> table = NonNullUtils.checkNotNull(HashBasedTable.<ITmfTrace, String, Integer> create());
+        Table<ITmfTrace, String, @Nullable Integer> table = HashBasedTable.create();
         fEventNames = table;
         fLayouts = new HashMap<>();
     }
@@ -219,15 +218,14 @@ public class VirtualMachineStateProvider extends AbstractTmfStateProvider {
 
                 if (host.isGuest()) {
                     /* Get the event's CPU */
-                    Object cpuObj = TmfTraceUtils.resolveEventAspectOfClassForEvent(event.getTrace(), TmfCpuAspect.class, event);
-                    if (cpuObj == null) {
+                    Integer cpu = TmfTraceUtils.resolveIntEventAspectOfClassForEvent(event.getTrace(), TmfCpuAspect.class, event);
+                    if (cpu == null) {
                         /*
                          * We couldn't find any CPU information, ignore this
                          * event
                          */
                         break;
                     }
-                    Integer cpu = (Integer) cpuObj;
 
                     /*
                      * If sched switch is from a guest, just update the status
@@ -359,12 +357,11 @@ public class VirtualMachineStateProvider extends AbstractTmfStateProvider {
         }
 
         /* Get the CPU the event is running on */
-        Object cpuObj = TmfTraceUtils.resolveEventAspectOfClassForEvent(event.getTrace(), TmfCpuAspect.class, event);
-        if (cpuObj == null) {
+        Integer cpu = TmfTraceUtils.resolveIntEventAspectOfClassForEvent(event.getTrace(), TmfCpuAspect.class, event);
+        if (cpu == null) {
             /* We couldn't find any CPU information, ignore this event */
             return null;
         }
-        Integer cpu = (Integer) cpuObj;
 
         Integer currentTid = KernelThreadInformationProvider.getThreadOnCpu(module, cpu, ts);
         if (currentTid == null) {
@@ -373,4 +370,4 @@ public class VirtualMachineStateProvider extends AbstractTmfStateProvider {
         return new HostThread(hostId, currentTid);
     }
 
-}
\ No newline at end of file
+}