From: Loïc Prieur-Drevon <loic.prieurdrevon@gmail.com>
Date: Fri, 15 Apr 2016 14:57:23 +0000 (-0400)
Subject: KernelAnalysis: Use Threads CoreAttributes to store "Status"
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=d3cc952fc100cdec10155e9ef222a8ea31a1f0d6;p=deliverable%2Ftracecompass.git

KernelAnalysis: Use Threads CoreAttributes to store "Status"

Threads core attributes were not used to store interval data, this
leads to useless NullStateValue intervals ranging from tree start
to end. This patch uses the Threads CoreNodes to store the "Status"
fields thus reducing the number of attributes and intervals.

Change-Id: Ia24b8d5226b66738a8c14d3d652879169437b95a
Signed-off-by: Loïc Prieur-Drevon <loic.prieurdrevon@gmail.com>
Reviewed-on: https://git.eclipse.org/r/70769
Reviewed-by: Hudson CI
Reviewed-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Tested-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Alexandre Montplaisir <alexmonthy@efficios.com>
---

diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/kernel/KernelThreadInformationProvider.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/kernel/KernelThreadInformationProvider.java
index de0125ba18..dd4e20f691 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/kernel/KernelThreadInformationProvider.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/kernel/KernelThreadInformationProvider.java
@@ -223,8 +223,7 @@ public final class KernelThreadInformationProvider {
 
         try {
             int threadQuark = ss.getQuarkAbsolute(Attributes.THREADS, threadId.toString());
-            int statusQuark = ss.getQuarkRelative(threadQuark, Attributes.STATUS);
-            List<ITmfStateInterval> statusIntervals = StateSystemUtils.queryHistoryRange(ss, statusQuark, Math.max(start, ss.getStartTime()), Math.min(end - 1, ss.getCurrentEndTime()), resolution, monitor);
+            List<ITmfStateInterval> statusIntervals = StateSystemUtils.queryHistoryRange(ss, threadQuark, Math.max(start, ss.getStartTime()), Math.min(end - 1, ss.getCurrentEndTime()), resolution, monitor);
             return statusIntervals;
         } catch (AttributeNotFoundException | StateSystemDisposedException | TimeRangeException e) {
         }
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/KernelStateProvider.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/KernelStateProvider.java
index 99d2250adf..f6bceb73eb 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/KernelStateProvider.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/KernelStateProvider.java
@@ -61,7 +61,7 @@ public class KernelStateProvider extends AbstractTmfStateProvider {
      * Version number of this state provider. Please bump this if you modify the
      * contents of the generated state history in some way.
      */
-    private static final int VERSION = 18;
+    private static final int VERSION = 19;
 
     // ------------------------------------------------------------------------
     // Fields
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/IrqEntryHandler.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/IrqEntryHandler.java
index e9a7efd922..a969771404 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/IrqEntryHandler.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/IrqEntryHandler.java
@@ -56,7 +56,7 @@ public class IrqEntryHandler extends KernelEventHandler {
         ss.modifyAttribute(timestamp, value, quark);
 
         /* Change the status of the running process to interrupted */
-        quark = ss.getQuarkRelativeAndAdd(KernelEventHandlerUtils.getCurrentThreadNode(cpu, ss), Attributes.STATUS);
+        quark = KernelEventHandlerUtils.getCurrentThreadNode(cpu, ss);
         value = StateValues.PROCESS_STATUS_INTERRUPTED_VALUE;
         ss.modifyAttribute(timestamp, value, quark);
 
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/KernelEventHandlerUtils.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/KernelEventHandlerUtils.java
index 61cceb0c5c..85780c32a6 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/KernelEventHandlerUtils.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/KernelEventHandlerUtils.java
@@ -130,8 +130,7 @@ public final class KernelEventHandlerUtils {
             /* We were previously in kernel mode */
             value = StateValues.PROCESS_STATUS_RUN_SYSCALL_VALUE;
         }
-        quark = ssb.getQuarkRelativeAndAdd(currentThreadNode, Attributes.STATUS);
-        ssb.modifyAttribute(timestamp, value, quark);
+        ssb.modifyAttribute(timestamp, value, currentThreadNode);
     }
 
     /**
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/ProcessForkHandler.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/ProcessForkHandler.java
index 4696c25bf0..02a13ce24a 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/ProcessForkHandler.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/ProcessForkHandler.java
@@ -73,9 +73,8 @@ public class ProcessForkHandler extends KernelEventHandler {
         ss.modifyAttribute(timestamp, value, quark);
 
         /* Set the new process' status */
-        quark = ss.getQuarkRelativeAndAdd(childTidNode, Attributes.STATUS);
         value = StateValues.PROCESS_STATUS_WAIT_FOR_CPU_VALUE;
-        ss.modifyAttribute(timestamp, value, quark);
+        ss.modifyAttribute(timestamp, value, childTidNode);
 
         /* Set the process' syscall name, to be the same as the parent's */
         quark = ss.getQuarkRelativeAndAdd(parentTidNode, Attributes.SYSTEM_CALL);
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SchedSwitchHandler.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SchedSwitchHandler.java
index a30d37ca59..5355f390ae 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SchedSwitchHandler.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SchedSwitchHandler.java
@@ -118,8 +118,7 @@ public class SchedSwitchHandler extends KernelEventHandler {
         } else {
             value = StateValues.PROCESS_STATUS_WAIT_UNKNOWN_VALUE;
         }
-        int quark = ss.getQuarkRelativeAndAdd(formerThreadNode, Attributes.STATUS);
-        ss.modifyAttribute(timestamp, value, quark);
+        ss.modifyAttribute(timestamp, value, formerThreadNode);
 
     }
 
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SchedWakeupHandler.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SchedWakeupHandler.java
index d0fb0940d6..40bed11921 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SchedWakeupHandler.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SchedWakeupHandler.java
@@ -52,21 +52,20 @@ public class SchedWakeupHandler extends KernelEventHandler {
          * Assign it to the "wait for cpu" state, but only if it was not already
          * running.
          */
-        int quark = ss.getQuarkRelativeAndAdd(threadNode, Attributes.STATUS);
-        int status = ss.queryOngoingState(quark).unboxInt();
+        int status = ss.queryOngoingState(threadNode).unboxInt();
         ITmfStateValue value = null;
         long timestamp = KernelEventHandlerUtils.getTimestamp(event);
         if (status != StateValues.PROCESS_STATUS_RUN_SYSCALL &&
                 status != StateValues.PROCESS_STATUS_RUN_USERMODE) {
             value = StateValues.PROCESS_STATUS_WAIT_FOR_CPU_VALUE;
-            ss.modifyAttribute(timestamp, value, quark);
+            ss.modifyAttribute(timestamp, value, threadNode);
         }
 
         /*
          * When a user changes a threads prio (e.g. with pthread_setschedparam),
          * it shows in ftrace with a sched_wakeup.
          */
-        quark = ss.getQuarkRelativeAndAdd(threadNode, Attributes.PRIO);
+        int quark = ss.getQuarkRelativeAndAdd(threadNode, Attributes.PRIO);
         value = TmfStateValue.newValueInt(prio);
         ss.modifyAttribute(timestamp, value, quark);
     }
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SoftIrqEntryHandler.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SoftIrqEntryHandler.java
index c0317c176a..664ea331f3 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SoftIrqEntryHandler.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SoftIrqEntryHandler.java
@@ -55,9 +55,8 @@ public class SoftIrqEntryHandler extends KernelEventHandler {
         ss.modifyAttribute(timestamp, value, quark);
 
         /* Change the status of the running process to interrupted */
-        quark = ss.getQuarkRelativeAndAdd(currentThreadNode, Attributes.STATUS);
         value = StateValues.PROCESS_STATUS_INTERRUPTED_VALUE;
-        ss.modifyAttribute(timestamp, value, quark);
+        ss.modifyAttribute(timestamp, value, currentThreadNode);
 
         /* Change the status of the CPU to interrupted */
         quark = ss.getQuarkRelativeAndAdd(currentCPUNode, Attributes.STATUS);
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/StateDumpHandler.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/StateDumpHandler.java
index 36770ca6d0..333c2f69af 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/StateDumpHandler.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/StateDumpHandler.java
@@ -73,9 +73,7 @@ public class StateDumpHandler extends KernelEventHandler {
 
     private static void setStatus(ITmfStateSystemBuilder ss, int status, int curThreadNode, long timestamp) {
         ITmfStateValue value;
-        int quark;
-        quark = ss.getQuarkRelativeAndAdd(curThreadNode, Attributes.STATUS);
-        if (ss.queryOngoingState(quark).isNull()) {
+        if (ss.queryOngoingState(curThreadNode).isNull()) {
             switch (status) {
             case LinuxValues.STATEDUMP_PROCESS_STATUS_WAIT_CPU:
                 value = StateValues.PROCESS_STATUS_WAIT_FOR_CPU_VALUE;
@@ -92,7 +90,7 @@ public class StateDumpHandler extends KernelEventHandler {
             default:
                 value = StateValues.PROCESS_STATUS_UNKNOWN_VALUE;
             }
-            ss.modifyAttribute(timestamp, value, quark);
+            ss.modifyAttribute(timestamp, value, curThreadNode);
         }
     }
 
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SysEntryHandler.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SysEntryHandler.java
index acdedad72f..f2b4ed27b8 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SysEntryHandler.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SysEntryHandler.java
@@ -50,9 +50,8 @@ public class SysEntryHandler extends KernelEventHandler {
         ss.modifyAttribute(timestamp, value, quark);
 
         /* Put the process in system call mode */
-        quark = ss.getQuarkRelativeAndAdd(currentThreadNode, Attributes.STATUS);
         value = StateValues.PROCESS_STATUS_RUN_SYSCALL_VALUE;
-        ss.modifyAttribute(timestamp, value, quark);
+        ss.modifyAttribute(timestamp, value, currentThreadNode);
 
         /* Put the CPU in system call (kernel) mode */
         int currentCPUNode = KernelEventHandlerUtils.getCurrentCPUNode(cpu, ss);
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SysExitHandler.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SysExitHandler.java
index e5eec932ba..2841d3612c 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SysExitHandler.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/SysExitHandler.java
@@ -50,9 +50,8 @@ public class SysExitHandler extends KernelEventHandler {
         ss.modifyAttribute(timestamp, value, quark);
 
         /* Put the process in system call mode */
-        quark = ss.getQuarkRelativeAndAdd(currentThreadNode, Attributes.STATUS);
         value = StateValues.PROCESS_STATUS_RUN_USERMODE_VALUE;
-        ss.modifyAttribute(timestamp, value, quark);
+        ss.modifyAttribute(timestamp, value, currentThreadNode);
 
         /* Put the CPU in system call (kernel) mode */
         int currentCPUNode = KernelEventHandlerUtils.getCurrentCPUNode(cpu, ss);
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/controlflow/ControlFlowCheckActiveProvider.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/controlflow/ControlFlowCheckActiveProvider.java
index d12fe25448..0528c27c52 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/controlflow/ControlFlowCheckActiveProvider.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/controlflow/ControlFlowCheckActiveProvider.java
@@ -14,9 +14,7 @@ package org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.controlflow
 
 import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelAnalysisModule;
 import org.eclipse.tracecompass.analysis.os.linux.core.kernel.StateValues;
-import org.eclipse.tracecompass.internal.analysis.os.linux.core.kernel.Attributes;
 import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
-import org.eclipse.tracecompass.statesystem.core.exceptions.AttributeNotFoundException;
 import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException;
 import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;
 import org.eclipse.tracecompass.tmf.core.statesystem.TmfStateSystemAnalysisModule;
@@ -89,7 +87,7 @@ public class ControlFlowCheckActiveProvider implements ITimeGraphEntryActiveProv
                     return false;
                 }
                 try {
-                    int statusQuark = ssq.getQuarkRelative(cfe.getThreadQuark(), Attributes.STATUS);
+                    int statusQuark = cfe.getThreadQuark();
 
                     /* Get the initial state at beginTS */
                     ITmfStateInterval currentInterval = ssq.querySingleState(beginTS, statusQuark);
@@ -107,7 +105,7 @@ public class ControlFlowCheckActiveProvider implements ITimeGraphEntryActiveProv
                         }
                         ts = currentInterval.getEndTime();
                     }
-                } catch (AttributeNotFoundException | StateSystemDisposedException e) {
+                } catch (StateSystemDisposedException e) {
                     /* Ignore ... */
                 }
             }
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/controlflow/ControlFlowView.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/controlflow/ControlFlowView.java
index 133872b9f5..a2de8bdac6 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/controlflow/ControlFlowView.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/controlflow/ControlFlowView.java
@@ -860,8 +860,7 @@ public class ControlFlowView extends AbstractStateSystemTimeGraphView {
         }
         ControlFlowEntry entry = (ControlFlowEntry) tgentry;
         try {
-            int threadQuark = entry.getThreadQuark();
-            int statusQuark = ss.getQuarkRelative(threadQuark, Attributes.STATUS);
+            int statusQuark = entry.getThreadQuark();
             eventList = new ArrayList<>(fullStates.size());
             ITmfStateInterval lastInterval = prevFullState == null || statusQuark >= prevFullState.size() ? null : prevFullState.get(statusQuark);
             long lastStartTime = lastInterval == null ? -1 : lastInterval.getStartTime();
@@ -897,7 +896,7 @@ public class ControlFlowView extends AbstractStateSystemTimeGraphView {
                 lastStartTime = time;
                 lastEndTime = time + duration;
             }
-        } catch (AttributeNotFoundException | TimeRangeException e) {
+        } catch (TimeRangeException e) {
             Activator.getDefault().logError(e.getMessage());
         }
         return eventList;
@@ -930,7 +929,7 @@ public class ControlFlowView extends AbstractStateSystemTimeGraphView {
                         ITmfStateInterval currentThreadInterval = ssq.querySingleState(time, currentThreadQuark);
                         int currentThread = currentThreadInterval.getStateValue().unboxInt();
                         if (currentThread > 0) {
-                            int statusQuark = ssq.getQuarkAbsolute(Attributes.THREADS, Integer.toString(currentThread), Attributes.STATUS);
+                            int statusQuark = ssq.getQuarkAbsolute(Attributes.THREADS, Integer.toString(currentThread));
                             ITmfStateInterval statusInterval = ssq.querySingleState(time, statusQuark);
                             if (statusInterval.getStartTime() == time) {
                                 thread = currentThread;
diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/StateSystemTest.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/StateSystemTest.java
index ef8169a66b..8a6f1d09df 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/StateSystemTest.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/StateSystemTest.java
@@ -404,16 +404,16 @@ public abstract class StateSystemTest {
     public void testGetQuarks_end() {
         List<Integer> list = fixture.getQuarks(Attributes.THREADS, "1577", "*");
 
-        /* There should be 5 sub-attributes for each Thread node */
-        assertEquals(5, list.size());
+        /* There should be 4 sub-attributes for each Thread node */
+        assertEquals(4, list.size());
     }
 
     @Test
     public void testGetQuarks_middle_end() {
         List<Integer> list = fixture.getQuarks(Attributes.THREADS, "*", "*");
 
-        /* There should be 169 threads and 5 sub-attributes per thread */
-        assertEquals(169 * 5, list.size());
+        /* There should be 169 threads and 4 sub-attributes per thread */
+        assertEquals(169 * 4, list.size());
     }
 
     @Test
@@ -525,7 +525,7 @@ public abstract class StateSystemTest {
     @Test
     public void testFirstIntervalIsConsidered() {
         try {
-            int quark = fixture.getQuarkAbsolute(Attributes.THREADS, "1397", Attributes.STATUS);
+            int quark = fixture.getQuarkAbsolute(Attributes.THREADS, "1397");
             List<ITmfStateInterval> list = fixture.queryFullState(1331668248014135800L);
             ITmfStateInterval interval = list.get(quark);
             assertEquals(1331668247516664825L, interval.getStartTime());
diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/TestValues.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/TestValues.java
index 050c700638..4dae05ece4 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/TestValues.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/TestValues.java
@@ -25,15 +25,13 @@ import org.eclipse.tracecompass.statesystem.core.statevalue.TmfStateValue;
  */
 interface TestValues {
 
-    int size = 1040;
+    int size = 871;
 
     long[] startTimes = {
-        1331668247314038062L,
-        1331668247314038062L,
         1331668247314038062L,
         1331668247399757985L,
-        1331668247316320929L,
         1331668247316334243L,
+        1331668247316320929L,
         1331668247314046266L,
         1331668247314046266L,
         1331668247399148733L,
@@ -43,25 +41,21 @@ interface TestValues {
         1331668247314038062L,
         1331668248014145796L,
         1331668248014183954L,
-        1331668247314038062L,
+        1331668247314851888L,
         1331668247327098502L,
         1331668247327098502L,
-        1331668247314851888L,
         1331668247327098502L,
         1331668247327098502L,
-        1331668247314038062L,
-        1331668247415001807L,
         1331668247399704235L,
         1331668247415001807L,
         1331668247415001807L,
-        1331668247314038062L,
-        1331668247314038062L,
+        1331668247415001807L,
         1331668247314038062L,
         1331668248014145796L,
+        1331668247314038062L,
         1331668247314601653L,
         1331668247314601653L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668248013353414L,
         1331668247314607227L,
         1331668247314607227L,
@@ -70,7 +64,6 @@ interface TestValues {
         1331668248014130616L,
         1331668247314038062L,
         1331668248011090056L,
-        1331668247314038062L,
         1331668247931793142L,
         1331668247930941981L,
         1331668247314038062L,
@@ -79,23 +72,20 @@ interface TestValues {
         1331668247959024716L,
         1331668248011129576L,
         1331668247314038062L,
-        1331668247314038062L,
+        1331668247315471788L,
         1331668247335106720L,
         1331668247335106720L,
-        1331668247315471788L,
         1331668247335106720L,
         1331668247335106720L,
         1331668247931782426L,
         1331668247315274351L,
         1331668247314038062L,
-        1331668247314038062L,
+        1331668247316120937L,
         1331668247335112802L,
         1331668247335112802L,
-        1331668247316120937L,
         1331668247335112802L,
         1331668247335112802L,
         1331668248004705322L,
-        1331668247314038062L,
         1331668248004935409L,
         1331668248004770916L,
         1331668248004925240L,
@@ -105,13 +95,11 @@ interface TestValues {
         1331668247314038062L,
         1331668247314038062L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247999256178L,
         1331668247999239403L,
         1331668247999250697L,
         1331668247318567561L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247999336085L,
         1331668247999131058L,
         1331668247999327778L,
@@ -119,25 +107,21 @@ interface TestValues {
         1331668247314038062L,
         1331668247959041965L,
         1331668247960265258L,
-        1331668247314038062L,
         1331668247903884233L,
         1331668247902254797L,
         1331668247903869067L,
         1331668247328403934L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247908495390L,
         1331668247908391792L,
         1331668247908464125L,
         1331668247328921944L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247903840082L,
         1331668247902986051L,
         1331668247903831313L,
         1331668247329404733L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247960291263L,
         1331668247960272741L,
         1331668247314038062L,
@@ -147,58 +131,47 @@ interface TestValues {
         1331668247340039213L,
         1331668247340083580L,
         1331668247966976915L,
-        1331668247314038062L,
         1331668248004729173L,
         1331668248004720009L,
         1331668247314038062L,
         1331668247371137735L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247387196023L,
         1331668247387154824L,
         1331668247387191465L,
         1331668247376420842L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247400231496L,
         1331668247400130260L,
         1331668247400218303L,
         1331668247378430187L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247751186217L,
         1331668247751173305L,
         1331668247314038062L,
         1331668247387136191L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247400779449L,
         1331668247415047817L,
         1331668247415047817L,
         1331668247415047817L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247400095883L,
         1331668247399991225L,
         1331668247400085049L,
         1331668247399991225L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247401441000L,
         1331668247401341331L,
         1331668247401428073L,
         1331668247400779449L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247410754305L,
         1331668247410594291L,
-        1331668247314038062L,
         1331668247519727372L,
         1331668247519619353L,
-        1331668247314038062L,
         1331668247412887695L,
         1331668247412803787L,
-        1331668247314038062L,
         1331668247413704524L,
         1331668247413576917L,
         1331668247412877246L,
@@ -213,40 +186,33 @@ interface TestValues {
         1331668247519712481L,
         1331668247411099759L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247924029486L,
         1331668247923412966L,
         1331668247924012402L,
         1331668247412302666L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247924105876L,
         1331668247924010016L,
         1331668247924098044L,
         1331668247417574343L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668248014184526L,
         1331668248013799545L,
         1331668248014130616L,
         1331668247417635948L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247928627023L,
         1331668247928556625L,
         1331668247928621067L,
         1331668247417978805L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247928556625L,
         1331668247927469138L,
         1331668247928529840L,
         1331668247418470511L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247930341625L,
         1331668247928614605L,
-        1331668247314038062L,
         1331668248014184526L,
         1331668248014184526L,
         1331668248013793850L,
@@ -255,19 +221,16 @@ interface TestValues {
         1331668247930328175L,
         1331668247419655652L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668248013753736L,
         1331668248013353414L,
         1331668248013749389L,
         1331668247420382626L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247930579872L,
         1331668247930316322L,
         1331668247930574368L,
         1331668247420451876L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247926378321L,
         1331668247925622863L,
         1331668247926367737L,
@@ -275,70 +238,58 @@ interface TestValues {
         1331668247314038062L,
         1331668247619316825L,
         1331668247619491008L,
-        1331668247314038062L,
         1331668247619505885L,
         1331668247619392829L,
         1331668247619495072L,
         1331668247434248026L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247434551326L,
         1331668247434365352L,
         1331668247434546203L,
         1331668247434365352L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247908325947L,
         1331668247908264450L,
         1331668247908319810L,
         1331668247467380509L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247908677700L,
         1331668247908325947L,
         1331668247908640244L,
         1331668247467447781L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247869556425L,
         1331668247869483379L,
         1331668247869544380L,
         1331668247503177108L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247504321893L,
         1331668247504294050L,
         1331668247504319470L,
         1331668247503423094L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668248014183954L,
         1331668248014145796L,
         1331668248014183954L,
         1331668247512172527L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247539381562L,
         1331668247539325848L,
         1331668247539369787L,
         1331668247539325848L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247735177820L,
         1331668247735128110L,
         1331668247735170303L,
         1331668247735128110L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247735168206L,
         1331668247735152717L,
         1331668247735161964L,
         1331668247735152717L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247775218227L,
         1331668247775191569L,
-        1331668247314038062L,
         1331668247775231079L,
         1331668247775218227L,
         1331668247775205377L,
@@ -347,13 +298,11 @@ interface TestValues {
         1331668247775223776L,
         1331668247775218227L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247869483379L,
         1331668247869457807L,
         1331668247869477795L,
         1331668247869457807L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668247941667986L,
         1331668247941620894L,
         1331668247941650415L,
@@ -950,129 +899,9 @@ interface TestValues {
         1331668247314038062L,
         1331668247314038062L,
         1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
     };
 
     long[] endTimes = {
-        1331668259054285979L,
-        1331668259054285979L,
         1331668259054285979L,
         1331668259054130388L,
         1331668259054285979L,
@@ -1096,10 +925,6 @@ interface TestValues {
         1331668259054285979L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
-        1331668259054285979L,
-        1331668259054285979L,
-        1331668259054285979L,
         1331668248014620024L,
         1331668259054285979L,
         1331668259054285979L,
@@ -1113,7 +938,6 @@ interface TestValues {
         1331668248014188534L,
         1331668259054285979L,
         1331668248015040151L,
-        1331668259054285979L,
         1331668248482983146L,
         1331668248482983146L,
         1331668259054285979L,
@@ -1127,7 +951,6 @@ interface TestValues {
         1331668259054285979L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248483009726L,
         1331668259054285979L,
         1331668259054285979L,
@@ -1136,9 +959,7 @@ interface TestValues {
         1331668259054285979L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248015959980L,
-        1331668259054285979L,
         1331668248016172023L,
         1331668248016172023L,
         1331668248016194935L,
@@ -1148,13 +969,11 @@ interface TestValues {
         1331668259054285979L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248016556933L,
         1331668248016556933L,
         1331668248016592456L,
         1331668252511012367L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248016623209L,
         1331668248016623209L,
         1331668248016645047L,
@@ -1162,25 +981,21 @@ interface TestValues {
         1331668259054285979L,
         1331668248015041609L,
         1331668248486545657L,
-        1331668259054285979L,
         1331668248502954816L,
         1331668248502954816L,
         1331668248503000162L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248020364249L,
         1331668248020364249L,
         1331668248020419523L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248020866943L,
         1331668248020866943L,
         1331668248020888352L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248531200073L,
         1331668248531200073L,
         1331668259054285979L,
@@ -1190,7 +1005,6 @@ interface TestValues {
         1331668257323835062L,
         1331668257323879563L,
         1331668248021867385L,
-        1331668259054285979L,
         1331668248175307354L,
         1331668248175307354L,
         1331668259054285979L,
@@ -1201,14 +1015,11 @@ interface TestValues {
         1331668259054285979L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
-        1331668259054285979L,
         1331668259051873438L,
         1331668259051873438L,
         1331668259051879701L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248751061201L,
         1331668248751061201L,
         1331668259054285979L,
@@ -1219,29 +1030,22 @@ interface TestValues {
         1331668259054285979L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
-        1331668259054285979L,
         1331668259051838247L,
         1331668259051838247L,
         1331668259051846351L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668257325265220L,
         1331668257325265220L,
         1331668257325277639L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668250005943125L,
         1331668250005943125L,
-        1331668259054285979L,
         1331668248014565260L,
         1331668248014565260L,
-        1331668259054285979L,
         1331668250006219013L,
         1331668250006219013L,
-        1331668259054285979L,
         1331668250004649129L,
         1331668250004649129L,
         1331668250006228246L,
@@ -1256,40 +1060,33 @@ interface TestValues {
         1331668248014624125L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248414826115L,
         1331668248414826115L,
         1331668248414875444L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248420327828L,
         1331668248420327828L,
         1331668248420342919L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248015353903L,
         1331668248015353903L,
         1331668248015428919L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248420617453L,
         1331668248420617453L,
         1331668248420709272L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248421112139L,
         1331668248421112139L,
         1331668248421137268L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248421291701L,
         1331668248421291701L,
-        1331668259054285979L,
         1331668248014188534L,
         1331668248015518081L,
         1331668248014188534L,
@@ -1298,19 +1095,16 @@ interface TestValues {
         1331668248421940554L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248014548923L,
         1331668248016397030L,
         1331668248014550770L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248422509298L,
         1331668248422509298L,
         1331668248422523601L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248424325503L,
         1331668248424325503L,
         1331668248424394073L,
@@ -1318,70 +1112,58 @@ interface TestValues {
         1331668259054285979L,
         1331668248140683324L,
         1331668248140686546L,
-        1331668259054285979L,
         1331668248140727269L,
         1331668248140727269L,
         1331668248140780012L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251031789570L,
         1331668251031789570L,
         1331668251031812282L,
         1331668252047037657L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248269586770L,
         1331668248269586770L,
         1331668248269613258L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248141167328L,
         1331668248141167328L,
         1331668248141400164L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248141004006L,
         1331668248141004006L,
         1331668248141028631L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248141324868L,
         1331668248141324868L,
         1331668248141345677L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248014185078L,
         1331668248015165243L,
         1331668248014185078L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248539549580L,
         1331668248539549580L,
         1331668248539579511L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668255234884605L,
         1331668255234884605L,
         1331668255234905622L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668255234936617L,
         1331668255234936617L,
         1331668255234941684L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252778982101L,
         1331668252778982101L,
-        1331668259054285979L,
         1331668252779007563L,
         1331668252779007563L,
         1331668252781320133L,
@@ -1390,353 +1172,294 @@ interface TestValues {
         1331668252781341690L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248869653287L,
         1331668248869653287L,
         1331668248869679933L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248941858743L,
         1331668248941858743L,
         1331668248941885421L,
         1331668252782929207L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248207116451L,
         1331668248207116451L,
         1331668248207177650L,
         1331668248207163589L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248207165629L,
         1331668248207165629L,
         1331668248207212201L,
         1331668248207197204L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248763171129L,
         1331668248763171129L,
         1331668259054285979L,
         1331668248763179780L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248895005379L,
         1331668248895005379L,
         1331668248895062414L,
         1331668248895035146L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668249000328909L,
         1331668249000328909L,
         1331668249000373092L,
         1331668249000350716L,
         1331668259054285979L,
         1331668249548101920L,
-        1331668259054285979L,
         1331668249947171998L,
         1331668249947171998L,
         1331668249947269897L,
         1331668249947249018L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668249951033184L,
         1331668249951033184L,
         1331668249951077605L,
         1331668249951058138L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668249959079406L,
         1331668249959079406L,
         1331668259054285979L,
         1331668249959100633L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668249970937981L,
         1331668249970937981L,
         1331668259054285979L,
         1331668249970963407L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668250007423753L,
         1331668250007423753L,
         1331668250007449251L,
         1331668250007428034L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668250231124169L,
         1331668250231124169L,
         1331668250231169946L,
         1331668250231148973L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668250326525622L,
         1331668250326525622L,
         1331668250329519305L,
         1331668250329507458L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251063191270L,
         1331668251063191270L,
         1331668251063256143L,
         1331668251063222335L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251065026369L,
         1331668251065026369L,
         1331668251065048462L,
         1331668251065030498L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251065058051L,
         1331668251065058051L,
         1331668251065091761L,
         1331668251065069765L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251065364590L,
         1331668251065364590L,
         1331668251065412381L,
         1331668251065407607L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251065462500L,
         1331668251065462500L,
         1331668251065477027L,
         1331668251065465604L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251065780572L,
         1331668251065780572L,
         1331668251065836719L,
         1331668251065829440L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251065899750L,
         1331668251065899750L,
         1331668251065913891L,
         1331668251065902892L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251066057402L,
         1331668251066057402L,
         1331668251066070617L,
         1331668251066060363L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251066495616L,
         1331668251066495616L,
         1331668251066520321L,
         1331668251066506338L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251066532840L,
         1331668251066532840L,
         1331668251066546436L,
         1331668251066535866L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251066658006L,
         1331668251066658006L,
         1331668251066671812L,
         1331668251066660635L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251066883302L,
         1331668251066883302L,
         1331668251066906446L,
         1331668251066887423L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251067153808L,
         1331668251067153808L,
         1331668251067176405L,
         1331668251067157534L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251067407214L,
         1331668251067407214L,
         1331668251067420770L,
         1331668251067410220L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251067763731L,
         1331668251067763731L,
         1331668251067818612L,
         1331668251067811009L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251067884367L,
         1331668251067884367L,
         1331668251067897382L,
         1331668251067887136L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251068275691L,
         1331668251068275691L,
         1331668251068288692L,
         1331668251068278423L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251068706355L,
         1331668251068706355L,
         1331668251068719015L,
         1331668251068709290L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251069067645L,
         1331668251069067645L,
         1331668251069122518L,
         1331668251069116275L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251069178617L,
         1331668251069178617L,
         1331668251069191305L,
         1331668251069181300L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251069664884L,
         1331668251069664884L,
         1331668251069684555L,
         1331668251069668097L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251069682852L,
         1331668251069682852L,
         1331668251069708201L,
         1331668251069690226L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251715054925L,
         1331668251715054925L,
         1331668259054285979L,
         1331668251715066022L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251803784493L,
         1331668251803784493L,
         1331668251803827591L,
         1331668251803808547L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251983438636L,
         1331668251983438636L,
         1331668251983448709L,
         1331668251983441583L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251992993580L,
         1331668251992993580L,
         1331668251993008591L,
         1331668251992998928L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252022091542L,
         1331668252022091542L,
         1331668252022091542L,
         1331668252022091542L,
         1331668252022095079L,
-        1331668259054285979L,
         1331668252031771660L,
         1331668252031771660L,
         1331668252031777595L,
         1331668252031773847L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252032463013L,
         1331668252032463013L,
         1331668252032502964L,
         1331668252032497700L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252032506884L,
         1331668252032506884L,
         1331668252032559227L,
         1331668252032539402L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252039535067L,
         1331668252039535067L,
         1331668259054285979L,
         1331668252039537404L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252044008981L,
         1331668252044008981L,
         1331668252044014257L,
         1331668252044010861L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252044059151L,
         1331668252044059151L,
         1331668252044064004L,
         1331668252044060420L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252179391423L,
         1331668252179391423L,
         1331668252184781913L,
         1331668252184772369L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252193425490L,
         1331668252193425490L,
         1331668252193432385L,
         1331668252193427706L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252253575716L,
         1331668252253575716L,
         1331668252253592491L,
         1331668252253581852L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252472449352L,
         1331668252472449352L,
         1331668252472474547L,
         1331668252472458163L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252487295286L,
         1331668252487295286L,
         1331668252487300925L,
         1331668252487297683L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252495759849L,
         1331668252495759849L,
         1331668252495766026L,
         1331668252495762178L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252496219924L,
         1331668252496219924L,
         1331668252496245837L,
         1331668252496228816L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252523291829L,
         1331668252523291829L,
         1331668252523482082L,
         1331668252523469395L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252764810964L,
         1331668252764810964L,
         1331668252764829827L,
         1331668252764814570L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252765021775L,
         1331668252765021775L,
         1331668252765026623L,
         1331668252765023841L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252769399706L,
         1331668252769399706L,
-        1331668259054285979L,
         1331668252769401404L,
         1331668252769401404L,
         1331668259054285979L,
@@ -1745,22 +1468,18 @@ interface TestValues {
         1331668259054285979L,
         1331668252769456141L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252784988923L,
         1331668252784988923L,
         1331668259054285979L,
         1331668252785262589L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252795062126L,
         1331668252795062126L,
         1331668259054285979L,
         1331668252795122600L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252828832090L,
         1331668252828832090L,
-        1331668259054285979L,
         1331668252828859292L,
         1331668252828859292L,
         1331668252828904216L,
@@ -1769,40 +1488,29 @@ interface TestValues {
         1331668252829060434L,
         1331668252828992804L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252829505108L,
         1331668252829505108L,
-        1331668259054285979L,
         1331668252829527974L,
         1331668252829527974L,
         1331668252829719292L,
         1331668252829638887L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252829643060L,
         1331668252829643060L,
-        1331668259054285979L,
         1331668252829660274L,
         1331668252829660274L,
-        1331668259054285979L,
         1331668252829683896L,
         1331668252829683896L,
-        1331668259054285979L,
         1331668252829799248L,
         1331668252829799248L,
-        1331668259054285979L,
         1331668252829802278L,
         1331668252829802278L,
-        1331668259054285979L,
         1331668252829821642L,
         1331668252829821642L,
-        1331668259054285979L,
         1331668252829840961L,
         1331668252829840961L,
-        1331668259054285979L,
         1331668252829859256L,
         1331668252829859256L,
-        1331668259054285979L,
         1331668252829976501L,
         1331668252829976501L,
         1331668252830107659L,
@@ -1826,7 +1534,6 @@ interface TestValues {
         1331668252831112505L,
         1331668252831083126L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252831228714L,
         1331668252831228714L,
         1331668252831318123L,
@@ -1841,22 +1548,18 @@ interface TestValues {
         1331668252832056760L,
         1331668252832046333L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252883172744L,
         1331668252883172744L,
         1331668252883172744L,
         1331668252883172744L,
         1331668252883178472L,
-        1331668259054285979L,
         1331668252885827603L,
         1331668252885827603L,
         1331668252885827603L,
         1331668252885827603L,
         1331668252885834716L,
-        1331668259054285979L,
         1331668252889337098L,
         1331668252889337098L,
-        1331668259054285979L,
         1331668252889396688L,
         1331668252889396688L,
         1331668252889396688L,
@@ -1865,247 +1568,206 @@ interface TestValues {
         1331668252901232798L,
         1331668252901118256L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252901540914L,
         1331668252901540914L,
         1331668252901540914L,
         1331668252901540914L,
         1331668252901545242L,
-        1331668259054285979L,
         1331668252901573889L,
         1331668252901573889L,
         1331668252901586635L,
         1331668252901577276L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252906764880L,
         1331668252906764880L,
         1331668252906764880L,
         1331668252906764880L,
         1331668252906769816L,
-        1331668259054285979L,
         1331668252912042743L,
         1331668252912042743L,
         1331668259054285979L,
         1331668252912048618L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252927449371L,
         1331668252927449371L,
         1331668252927449371L,
         1331668252927449371L,
         1331668252927454567L,
-        1331668259054285979L,
         1331668252947156908L,
         1331668252947156908L,
         1331668252947156908L,
         1331668252947156908L,
         1331668252947162086L,
-        1331668259054285979L,
         1331668252947197386L,
         1331668252947197386L,
         1331668252947197386L,
         1331668252947197386L,
         1331668252947200470L,
-        1331668259054285979L,
         1331668253035499713L,
         1331668253035499713L,
         1331668253035499713L,
         1331668253035499713L,
         1331668253035505047L,
-        1331668259054285979L,
         1331668253036766769L,
         1331668253036766769L,
         1331668253036766769L,
         1331668253036766769L,
         1331668253036770602L,
-        1331668259054285979L,
         1331668253037890651L,
         1331668253037890651L,
         1331668253037890651L,
         1331668253037890651L,
         1331668253037894147L,
-        1331668259054285979L,
         1331668253051945128L,
         1331668253051945128L,
         1331668253051945128L,
         1331668253051945128L,
         1331668253051948233L,
-        1331668259054285979L,
         1331668253054627961L,
         1331668253054627961L,
         1331668253054627961L,
         1331668253054627961L,
         1331668253054630786L,
-        1331668259054285979L,
         1331668253057609433L,
         1331668253057609433L,
         1331668253057609433L,
         1331668253057609433L,
         1331668253057612341L,
-        1331668259054285979L,
         1331668253062222314L,
         1331668253062222314L,
         1331668253062222314L,
         1331668253062222314L,
         1331668253062227485L,
-        1331668259054285979L,
         1331668253097239708L,
         1331668253097239708L,
         1331668253097239708L,
         1331668253097239708L,
         1331668253097246792L,
-        1331668259054285979L,
         1331668253097518746L,
         1331668253097518746L,
         1331668253097518746L,
         1331668253097518746L,
         1331668253097521994L,
-        1331668259054285979L,
         1331668253267104284L,
         1331668253267104284L,
         1331668253267117055L,
         1331668253267107624L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668253267342015L,
         1331668253267342015L,
         1331668253267378405L,
         1331668253267367303L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668253278218713L,
         1331668253278218713L,
         1331668253278218713L,
         1331668253278218713L,
         1331668253278223105L,
-        1331668259054285979L,
         1331668253324119756L,
         1331668253324119756L,
         1331668253324119756L,
         1331668253324119756L,
         1331668253324123194L,
-        1331668259054285979L,
         1331668253614347227L,
         1331668253614347227L,
         1331668253614347227L,
         1331668253614347227L,
         1331668253614351910L,
-        1331668259054285979L,
         1331668253619459320L,
         1331668253619459320L,
         1331668253619459320L,
         1331668253619459320L,
         1331668253619462745L,
-        1331668259054285979L,
         1331668253619867625L,
         1331668253619867625L,
         1331668253619867625L,
         1331668253619867625L,
         1331668253619870183L,
-        1331668259054285979L,
         1331668253621486721L,
         1331668253621486721L,
         1331668253621508851L,
         1331668253621491536L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668253622429608L,
         1331668253622429608L,
         1331668253622429608L,
         1331668253622429608L,
         1331668253622432889L,
-        1331668259054285979L,
         1331668253857465365L,
         1331668253857465365L,
         1331668253857465365L,
         1331668253857465365L,
         1331668253857469629L,
-        1331668259054285979L,
         1331668253858125091L,
         1331668253858125091L,
         1331668253858125091L,
         1331668253858125091L,
         1331668253858128274L,
-        1331668259054285979L,
         1331668253910194540L,
         1331668253910194540L,
         1331668253910194540L,
         1331668253910194540L,
         1331668253910198633L,
-        1331668259054285979L,
         1331668253910329721L,
         1331668253910329721L,
         1331668253910329721L,
         1331668253910329721L,
         1331668253910333029L,
-        1331668259054285979L,
         1331668253984922308L,
         1331668253984922308L,
         1331668253984922308L,
         1331668253984922308L,
         1331668253984926366L,
-        1331668259054285979L,
         1331668254004098152L,
         1331668254004098152L,
         1331668254004098152L,
         1331668254004098152L,
         1331668254004102129L,
-        1331668259054285979L,
         1331668254047839900L,
         1331668254047839900L,
         1331668254047839900L,
         1331668254047839900L,
         1331668254047843621L,
-        1331668259054285979L,
         1331668254093066195L,
         1331668254093066195L,
         1331668254093066195L,
         1331668254093066195L,
         1331668254093071603L,
-        1331668259054285979L,
         1331668254106326339L,
         1331668254106326339L,
         1331668254106326339L,
         1331668254106326339L,
         1331668254106330527L,
-        1331668259054285979L,
         1331668255052411647L,
         1331668255052411647L,
         1331668255052411647L,
         1331668255052411647L,
         1331668255052417904L,
-        1331668259054285979L,
         1331668255157088064L,
         1331668255157088064L,
         1331668255157101973L,
         1331668255157091812L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668256244508635L,
         1331668256244508635L,
         1331668256244508635L,
         1331668256244508635L,
         1331668256244513337L,
-        1331668259054285979L,
         1331668257246987050L,
         1331668257246987050L,
         1331668257247036372L,
         1331668257247027684L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668259045096840L,
         1331668259045096840L,
         1331668259045096840L,
         1331668259045096840L,
         1331668259045103189L,
-        1331668259054285979L,
         1331668259052126585L,
         1331668259052126585L,
         1331668259052126585L,
         1331668259052126585L,
         1331668259052129986L,
-        1331668259054285979L,
         1331668259053345550L,
         1331668259053345550L,
         1331668259054285979L,
@@ -2114,12 +1776,10 @@ interface TestValues {
     };
 
     ITmfStateValue[] values = {
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
-        TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueInt(1),
+        TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("lttng-sessiond"),
         TmfStateValue.newValueString("lttng-consumerd"),
         TmfStateValue.newValueInt(20),
@@ -2139,15 +1799,11 @@ interface TestValues {
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(5),
+        TmfStateValue.nullValue(),
         TmfStateValue.newValueString("swapper/0"),
         TmfStateValue.newValueInt(20),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(5),
         TmfStateValue.newValueString("swapper/1"),
         TmfStateValue.newValueInt(20),
@@ -2156,7 +1812,6 @@ interface TestValues {
         TmfStateValue.newValueInt(4),
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.nullValue(),
@@ -2170,7 +1825,6 @@ interface TestValues {
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("lttng-consumerd"),
         TmfStateValue.nullValue(),
@@ -2180,8 +1834,6 @@ interface TestValues {
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(-6),
         TmfStateValue.newValueString("sys_ppoll"),
@@ -2191,13 +1843,11 @@ interface TestValues {
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_futex"),
         TmfStateValue.newValueString("firefox"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
@@ -2205,25 +1855,21 @@ interface TestValues {
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("gnome-terminal"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_select"),
         TmfStateValue.newValueString("Xorg"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("metacity"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.nullValue(),
@@ -2233,25 +1879,21 @@ interface TestValues {
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.nullValue(),
         TmfStateValue.newValueString("ksoftirqd/0"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_read"),
         TmfStateValue.newValueString("rsyslogd"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_futex"),
         TmfStateValue.newValueString("rs:main Q:Reg"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.nullValue(),
@@ -2262,29 +1904,22 @@ interface TestValues {
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_select"),
         TmfStateValue.newValueString("rsyslogd"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_read"),
         TmfStateValue.newValueString("bash"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
@@ -2299,40 +1934,33 @@ interface TestValues {
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("unity-2d-panel"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("indicator-multi"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("gdbus"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("dbus-daemon"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("gdbus"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("indicator-appli"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(3),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
@@ -2341,19 +1969,16 @@ interface TestValues {
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("gdbus"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(5),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_futex"),
         TmfStateValue.newValueString("unity-panel-ser"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("hud-service"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
@@ -2361,70 +1986,58 @@ interface TestValues {
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("openvpn"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("firefox"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_futex"),
         TmfStateValue.newValueString("thunderbird-bin"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("thunderbird-bin"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("thunderbird-bin"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_futex"),
         TmfStateValue.newValueString("thunderbird-bin"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(2),
         TmfStateValue.newValueInt(20),
         TmfStateValue.nullValue(),
         TmfStateValue.newValueString("gdbus"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_nanosleep"),
         TmfStateValue.newValueString("gvfs-afc-volume"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("rtkit-daemon"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(-100),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("rtkit-daemon"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
@@ -2433,13 +2046,11 @@ interface TestValues {
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("thunderbird-bin"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_futex"),
         TmfStateValue.newValueString("thunderbird-bin"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_futex"),
@@ -3036,123 +2647,5 @@ interface TestValues {
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
     };
 }