kernel: make status for threads work again

Signed-off-by: Arnaud Fiorini <fiorini.arnaud@gmail.com>

Author: arfio

analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/kernel/KernelThreadInformationProvider.java

@@ -548,7 +548,7 @@ public static Map<Integer, List<ITmfStateInterval>> getStatusIntervalsForThreads
         if (ss == null) {
             return Objects.requireNonNull(Collections.emptyMap());
         }
-        List<Long> currentTimes = times.stream().filter(time -> (time > ss.getCurrentEndTime() || time < ss.getStartTime())).sorted().collect(Collectors.toList());
+        List<Long> currentTimes = times.stream().filter(time -> (time < ss.getCurrentEndTime() && time > ss.getStartTime())).sorted().collect(Collectors.toList());
         if (currentTimes.isEmpty()) {
             return Objects.requireNonNull(Collections.emptyMap());
         }

analysis/org.eclipse.tracecompass.analysis.profiling.core.tests/src/org/eclipse/tracecompass/analysis/profiling/core/tests/FlameChartDataProviderTest.java

@@ -262,7 +262,7 @@ public void testFetchModel() {
                 new TimeGraphState(6, 2, null, new OutputElementStyle(LinuxStyle.WAIT_FOR_CPU.getLabel())),
                 new TimeGraphState(8, 2, null, new OutputElementStyle(LinuxStyle.USERMODE.getLabel())),
                 new TimeGraphState(10, 2, null, new OutputElementStyle(LinuxStyle.WAIT_FOR_CPU.getLabel())),
-                new TimeGraphState(12, 8, null, new OutputElementStyle(LinuxStyle.USERMODE.getLabel()))), true);
+                new TimeGraphState(12, 8, "openat", new OutputElementStyle(LinuxStyle.SYSCALL.getLabel()))), true);
 
         // Get the row model for those entries with low resolution
         rowResponse = dataProvider.fetchRowModel(FetchParametersUtils.selectionTimeQueryToMap(new SelectionTimeQueryFilter(3, 15, 2, selectedIds)), new NullProgressMonitor());
@@ -300,7 +300,7 @@ public void testFetchModel() {
         // Verify kernel statuses of tid 6
         verifyStates(rows, FlameDataProviderTestUtils.findEntryByDepthAndType(tid6Children, -1, EntryType.KERNEL), ImmutableList.of(
                 new TimeGraphState(1, 5, null, new OutputElementStyle(LinuxStyle.USERMODE.getLabel())),
-                new TimeGraphState(12, 8, null, new OutputElementStyle(LinuxStyle.USERMODE.getLabel()))), true);
+                new TimeGraphState(12, 8, "openat", new OutputElementStyle(LinuxStyle.SYSCALL.getLabel()))), true);
 
         // Check arrows
         FlameChartEntryModel tid2 = FlameDataProviderTestUtils.findEntryByNameAndType(modelEntries, "2", EntryType.LEVEL);
@@ -436,6 +436,7 @@ private static void verifyStates(List<ITimeGraphRowModel> rowModels, FlameChartE
         assertNotNull(rowModel);
         @SuppressWarnings("null")
         List<ITimeGraphState> states = rowModel.getStates();
+        assertEquals(expectedStates.size(), states.size());
         for (int i = 0; i < states.size(); i++) {
             String entryName = entry.getName();
             if (i > expectedStates.size() - 1) {

analysis/org.eclipse.tracecompass.analysis.profiling.core.tests/stubs/org/eclipse/tracecompass/analysis/profiling/core/tests/stubs2/KernelStateProviderStub.java

@@ -59,14 +59,15 @@ public ITmfStateProvider getNewInstance() {
     @Override
     protected void eventHandle(ITmfEvent event) {
         ITmfStateSystemBuilder ssb = getStateSystemBuilder();
-        if (ssb == null) {
+        if (ssb == null || event.getName().equals("instant_event")) {
             return;
         }
         int threadQuark = ssb.getQuarkAbsoluteAndAdd(Attributes.THREADS, event.getContent().getFieldValue(String.class, "tid"));
         boolean isEntry = event.getName().equals(ENTRY);
         long timestamp = event.getTimestamp().getValue();
         if (isEntry) {
-            if (event.getName().equals("op4")) {
+            String operationName = event.getContent().getFieldValue(String.class, "op");
+            if (operationName != null && operationName.equals("op4")) {
                 int systemCallQuark = ssb.getQuarkRelativeAndAdd(threadQuark, Attributes.SYSTEM_CALL);
                 ssb.modifyAttribute(timestamp, "openat", systemCallQuark);
                 /* Put the process in system call mode */