os.linux: Create PPID and SYSTEM_CALL attributes on demand

This patch ensures that threads' PPID and SYSTEM_CALL attributes
are only created when the state is changed instead of on a
sched_switch. The methods which require said attributes are adapted
to handle correctly the absence of said attributes.
This results in a state system with 0 - 40% less attributes, thus
reducing the legacy SHT's space on disk by the same size.

Change-Id: I1461824623912f8d2ea32bb2c97f0398b08f9aea
Signed-off-by: Loïc Prieur-Drevon <loic.prieurdrevon@gmail.com>
Reviewed-on: https://git.eclipse.org/r/80849
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

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 6d040ce288ff66382c50f76d9f3651cecbf990f6..4d2d1a192becf7766b18ecb3d9f3f15fcab16d1a 100644 (file)
--- 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 = 20;
+    private static final int VERSION = 21;
 
     // ------------------------------------------------------------------------
     // Fields

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 ef4fc47b8627fd261edb1a36d1d66aa6cd5be643..ab0506cbcd1a0ff6f909453e4e5e9df12363537a 100644 (file)
--- 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
@@ -83,10 +83,6 @@ public class SchedSwitchHandler extends KernelEventHandler {
         /* Set the current prio for the new process */
         setProcessPrio(ss, nextPrio, newCurrentThreadNode, timestamp);
 
-        /* Make sure the PPID and system_call sub-attributes exist */
-        ss.getQuarkRelativeAndAdd(newCurrentThreadNode, Attributes.SYSTEM_CALL);
-        ss.getQuarkRelativeAndAdd(newCurrentThreadNode, Attributes.PPID);
-
         /* Set the current scheduled process on the relevant CPU */
         int currentCPUNode = KernelEventHandlerUtils.getCurrentCPUNode(cpu, ss);
         setCpuProcess(ss, nextTid, timestamp, currentCPUNode);

diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/controlflow/ControlFlowPresentationProvider.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/controlflow/ControlFlowPresentationProvider.java
index f36d274c79400cbb96624e3bb622c68e2a559041..14b087ab762f5eb87f8875652c45a3339a2616cc 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/controlflow/ControlFlowPresentationProvider.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/controlflow/ControlFlowPresentationProvider.java
@@ -174,15 +174,18 @@ public class ControlFlowPresentationProvider extends TimeGraphPresentationProvid
         }
         int status = ((TimeEvent) event).getValue();
         if (status == StateValues.PROCESS_STATUS_RUN_SYSCALL) {
+            int syscallQuark = ssq.optQuarkRelative(entry.getThreadQuark(), Attributes.SYSTEM_CALL);
+            if (syscallQuark == ITmfStateSystem.INVALID_ATTRIBUTE) {
+                return retMap;
+            }
             try {
-                int syscallQuark = ssq.getQuarkRelative(entry.getThreadQuark(), Attributes.SYSTEM_CALL);
                 ITmfStateInterval value = ssq.querySingleState(event.getTime(), syscallQuark);
                 if (!value.getStateValue().isNull()) {
                     ITmfStateValue state = value.getStateValue();
                     retMap.put(Messages.ControlFlowView_attributeSyscallName, state.toString());
                 }
 
-            } catch (AttributeNotFoundException | TimeRangeException e) {
+            } catch (TimeRangeException e) {
                 Activator.getDefault().logError("Error in ControlFlowPresentationProvider", e); //$NON-NLS-1$
             } catch (StateSystemDisposedException e) {
                 /* Ignored */
@@ -213,8 +216,11 @@ public class ControlFlowPresentationProvider extends TimeGraphPresentationProvid
         if (status != StateValues.PROCESS_STATUS_RUN_SYSCALL) {
             return;
         }
+        int syscallQuark = ss.optQuarkRelative(entry.getThreadQuark(), Attributes.SYSTEM_CALL);
+        if (syscallQuark == ITmfStateSystem.INVALID_ATTRIBUTE) {
+            return;
+        }
         try {
-            int syscallQuark = ss.getQuarkRelative(entry.getThreadQuark(), Attributes.SYSTEM_CALL);
             ITmfStateInterval value = ss.querySingleState(event.getTime(), syscallQuark);
             if (!value.getStateValue().isNull()) {
                 ITmfStateValue state = value.getStateValue();
@@ -233,7 +239,7 @@ public class ControlFlowPresentationProvider extends TimeGraphPresentationProvid
 
                 Utils.drawText(gc, state.toString().substring(beginIndex), bounds.x, bounds.y, bounds.width, bounds.height, true, true);
             }
-        } catch (AttributeNotFoundException | TimeRangeException e) {
+        } catch (TimeRangeException e) {
             Activator.getDefault().logError("Error in ControlFlowPresentationProvider", e); //$NON-NLS-1$
         } catch (StateSystemDisposedException e) {
             /* Ignored */

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 a2de8bdac6617e449b3755367098ee27c254ca2c..25310183360aba71ab1ebb8b68963cf345907eee 100644 (file)
--- 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
@@ -651,19 +651,16 @@ public class ControlFlowView extends AbstractStateSystemTimeGraphView {
                             continue;
                         }
 
-                        int execNameQuark;
-                        int ppidQuark;
-                        try {
-                            execNameQuark = ssq.getQuarkRelative(threadQuark, Attributes.EXEC_NAME);
-                            ppidQuark = ssq.getQuarkRelative(threadQuark, Attributes.PPID);
-                        } catch (AttributeNotFoundException e) {
+                        int execNameQuark = ssq.optQuarkRelative(threadQuark, Attributes.EXEC_NAME);
+                        int ppidQuark = ssq.optQuarkRelative(threadQuark, Attributes.PPID);
+                        if (execNameQuark == ITmfStateSystem.INVALID_ATTRIBUTE) {
                             /* No information on this thread (yet?), skip it for now */
                             continue;
                         }
                         ITmfStateInterval lastExecNameInterval = prevFullState == null || execNameQuark >= prevFullState.size() ? null : prevFullState.get(execNameQuark);
                         long lastExecNameStartTime = lastExecNameInterval == null ? -1 : lastExecNameInterval.getStartTime();
                         long lastExecNameEndTime = lastExecNameInterval == null ? -1 : lastExecNameInterval.getEndTime() + 1;
-                        long lastPpidStartTime = prevFullState == null || ppidQuark >= prevFullState.size() ? -1 : prevFullState.get(ppidQuark).getStartTime();
+                        long lastPpidStartTime = prevFullState == null || ppidQuark >= prevFullState.size() || ppidQuark == ITmfStateSystem.INVALID_ATTRIBUTE ? -1 : prevFullState.get(ppidQuark).getStartTime();
                         for (List<ITmfStateInterval> fullState : fullStates) {
                             if (monitor.isCanceled()) {
                                 return;
@@ -673,10 +670,10 @@ public class ControlFlowView extends AbstractStateSystemTimeGraphView {
                                 continue;
                             }
                             ITmfStateInterval execNameInterval = fullState.get(execNameQuark);
-                            ITmfStateInterval ppidInterval = fullState.get(ppidQuark);
+                            ITmfStateInterval ppidInterval = ppidQuark == ITmfStateSystem.INVALID_ATTRIBUTE ? null : fullState.get(ppidQuark);
                             long startTime = execNameInterval.getStartTime();
                             long endTime = execNameInterval.getEndTime() + 1;
-                            if (startTime == lastExecNameStartTime && ppidInterval.getStartTime() == lastPpidStartTime) {
+                            if (startTime == lastExecNameStartTime && ppidInterval != null && ppidInterval.getStartTime() == lastPpidStartTime) {
                                 continue;
                             }
                             boolean isNull = execNameInterval.getStateValue().isNull();
@@ -687,7 +684,7 @@ public class ControlFlowView extends AbstractStateSystemTimeGraphView {
                                  */
                                 try {
                                     execNameInterval = ssq.querySingleState(startTime - 1, execNameQuark);
-                                    ppidInterval = ssq.querySingleState(startTime - 1, ppidQuark);
+                                    ppidInterval = ppidQuark == ITmfStateSystem.INVALID_ATTRIBUTE ? null : ssq.querySingleState(startTime - 1, ppidQuark);
                                     startTime = execNameInterval.getStartTime();
                                     endTime = execNameInterval.getEndTime() + 1;
                                 } catch (StateSystemDisposedException e) {
@@ -697,7 +694,7 @@ public class ControlFlowView extends AbstractStateSystemTimeGraphView {
                             if (!execNameInterval.getStateValue().isNull() &&
                                     execNameInterval.getStateValue().getType() == ITmfStateValue.Type.STRING) {
                                 String execName = execNameInterval.getStateValue().unboxStr();
-                                int ppid = ppidInterval.getStateValue().unboxInt();
+                                int ppid = ppidInterval == null ? -1 : ppidInterval.getStateValue().unboxInt();
                                 ControlFlowEntry entry = entryMap.get(entryKey);
                                 if (entry == null) {
                                     entry = new ControlFlowEntry(threadQuark, trace, execName, threadId, ppid, startTime, endTime);
@@ -719,7 +716,7 @@ public class ControlFlowView extends AbstractStateSystemTimeGraphView {
                             }
                             lastExecNameStartTime = startTime;
                             lastExecNameEndTime = endTime;
-                            lastPpidStartTime = ppidInterval.getStartTime();
+                            lastPpidStartTime = ppidInterval == null ? -1 : ppidInterval.getStartTime();
                         }
                     }
                     synchronized (fFlatTraces) {

diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/ResourcesPresentationProvider.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/ResourcesPresentationProvider.java
index 1f93b7dea6b0d6b8274a94434e55547813bcdb64..a25a8ad48a0c59a7727743a0f00f69a481d7121f 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/ResourcesPresentationProvider.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/ResourcesPresentationProvider.java
@@ -244,7 +244,10 @@ public class ResourcesPresentationProvider extends TimeGraphPresentationProvider
                                     retMap.put(Messages.ResourcesView_attributeProcessName, value.unboxStr());
                                 }
                                 if (status == StateValues.CPU_STATUS_RUN_SYSCALL) {
-                                    int syscallQuark = ss.getQuarkAbsolute(Attributes.THREADS, Integer.toString(currentThreadId), Attributes.SYSTEM_CALL);
+                                    int syscallQuark = ss.optQuarkAbsolute(Attributes.THREADS, Integer.toString(currentThreadId), Attributes.SYSTEM_CALL);
+                                    if (syscallQuark == ITmfStateSystem.INVALID_ATTRIBUTE) {
+                                        return retMap;
+                                    }
                                     interval = ss.querySingleState(hoverTime, syscallQuark);
                                     if (!interval.getStateValue().isNull()) {
                                         value = interval.getStateValue();
@@ -340,7 +343,10 @@ public class ResourcesPresentationProvider extends TimeGraphPresentationProvider
                                 }
                             }
                             if (attribute != null) {
-                                int quark = ss.getQuarkAbsolute(Attributes.THREADS, Integer.toString(currentThreadId), attribute);
+                                int quark = ss.optQuarkAbsolute(Attributes.THREADS, Integer.toString(currentThreadId), attribute);
+                                if (quark == ITmfStateSystem.INVALID_ATTRIBUTE) {
+                                    return;
+                                }
                                 ITmfStateInterval interval = ss.querySingleState(time, quark);
                                 if (!interval.getStateValue().isNull()) {
                                     value = interval.getStateValue();

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 8a6f1d09df6415df3f5fa7e7ee708307d6186e85..b895f05e052826971d2984434450755e84e0ca43 100644 (file)
--- 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 4 sub-attributes for each Thread node */
-        assertEquals(4, list.size());
+        /* There should be 3 sub-attributes for each Thread node */
+        assertEquals(3, list.size());
     }
 
     @Test
     public void testGetQuarks_middle_end() {
         List<Integer> list = fixture.getQuarks(Attributes.THREADS, "*", "*");
 
-        /* There should be 169 threads and 4 sub-attributes per thread */
-        assertEquals(169 * 4, list.size());
+        /* There should be 716 attributes as not all have a system call or priority at this point*/
+        assertEquals(547, list.size());
     }
 
     @Test

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 2de3b167b681d9aa3315629ffc315334a17ed3a8..d9e631402993c9883ed22ffa8807d0c9f3f4bf8c 100644 (file)
--- 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,7 +25,7 @@ import org.eclipse.tracecompass.statesystem.core.statevalue.TmfStateValue;
  */
 interface TestValues {
 
-    int size = 869;
+    int size = 740;
 
     long[] startTimes = {
         1331668247314038062L,
@@ -37,7 +37,6 @@ interface TestValues {
         1331668247399148733L,
         1331668247316120937L,
         1331668247314038062L,
-        1331668247314038062L,
         1331668248014183954L,
         1331668248014145796L,
         1331668247314851888L,
@@ -49,12 +48,10 @@ interface TestValues {
         1331668247415001807L,
         1331668247415001807L,
         1331668247415001807L,
-        1331668247314038062L,
         1331668248014145796L,
         1331668247314038062L,
         1331668247314601653L,
         1331668247314601653L,
-        1331668247314038062L,
         1331668248013353414L,
         1331668247314607227L,
         1331668247314607227L,
@@ -77,7 +74,6 @@ interface TestValues {
         1331668247335106720L,
         1331668247931782426L,
         1331668247315274351L,
-        1331668247314038062L,
         1331668247316120937L,
         1331668247335112802L,
         1331668247335112802L,
@@ -88,43 +84,34 @@ interface TestValues {
         1331668248004770916L,
         1331668248004925240L,
         1331668247316553071L,
-        1331668247314038062L,
         1331668247399743968L,
         1331668247314038062L,
-        1331668247314038062L,
-        1331668247314038062L,
         1331668247999256178L,
         1331668247999239403L,
         1331668247999250697L,
         1331668247318567561L,
-        1331668247314038062L,
         1331668247999336085L,
         1331668247999131058L,
         1331668247999327778L,
         1331668247318631139L,
-        1331668247314038062L,
         1331668247959041965L,
         1331668247960265258L,
         1331668247903884233L,
         1331668247902254797L,
         1331668247903869067L,
         1331668247328403934L,
-        1331668247314038062L,
         1331668247908495390L,
         1331668247908391792L,
         1331668247908464125L,
         1331668247328921944L,
-        1331668247314038062L,
         1331668247903840082L,
         1331668247902986051L,
         1331668247903831313L,
         1331668247329404733L,
-        1331668247314038062L,
         1331668247960291263L,
         1331668247960272741L,
         1331668247314038062L,
         1331668247330548245L,
-        1331668247314038062L,
         1331668247919182446L,
         1331668247340039213L,
         1331668247340083580L,
@@ -133,37 +120,30 @@ interface TestValues {
         1331668248004720009L,
         1331668247314038062L,
         1331668247371137735L,
-        1331668247314038062L,
         1331668247387196023L,
         1331668247387154824L,
         1331668247387191465L,
         1331668247376420842L,
-        1331668247314038062L,
         1331668247400231496L,
         1331668247400130260L,
         1331668247400218303L,
         1331668247378430187L,
-        1331668247314038062L,
         1331668247751186217L,
         1331668247751173305L,
         1331668247314038062L,
         1331668247387136191L,
-        1331668247314038062L,
         1331668247400779449L,
         1331668247415047817L,
         1331668247415047817L,
         1331668247415047817L,
-        1331668247314038062L,
         1331668247400095883L,
         1331668247399991225L,
         1331668247400085049L,
         1331668247399991225L,
-        1331668247314038062L,
         1331668247401441000L,
         1331668247401341331L,
         1331668247401428073L,
         1331668247400779449L,
-        1331668247314038062L,
         1331668247410754305L,
         1331668247410594291L,
         1331668247519727372L,
@@ -174,133 +154,106 @@ interface TestValues {
         1331668247413576917L,
         1331668247412877246L,
         1331668247410583861L,
-        1331668247314038062L,
         1331668247410735104L,
         1331668247410594291L,
-        1331668247314038062L,
         1331668247413682702L,
         1331668247410844189L,
-        1331668247314038062L,
         1331668247519712481L,
         1331668247411099759L,
-        1331668247314038062L,
         1331668247924029486L,
         1331668247923412966L,
         1331668247924012402L,
         1331668247412302666L,
-        1331668247314038062L,
         1331668247924105876L,
         1331668247924010016L,
         1331668247924098044L,
         1331668247417574343L,
-        1331668247314038062L,
         1331668248014184526L,
         1331668248013799545L,
         1331668248014130616L,
         1331668247417635948L,
-        1331668247314038062L,
         1331668247928627023L,
         1331668247928556625L,
         1331668247928621067L,
         1331668247417978805L,
-        1331668247314038062L,
         1331668247928556625L,
         1331668247927469138L,
         1331668247928529840L,
         1331668247418470511L,
-        1331668247314038062L,
         1331668247930341625L,
         1331668247928614605L,
         1331668248014184526L,
         1331668248014184526L,
         1331668248013793850L,
         1331668247419578477L,
-        1331668247314038062L,
         1331668247930328175L,
         1331668247419655652L,
-        1331668247314038062L,
         1331668248013753736L,
         1331668248013353414L,
         1331668248013749389L,
         1331668247420382626L,
-        1331668247314038062L,
         1331668247930579872L,
         1331668247930316322L,
         1331668247930574368L,
         1331668247420451876L,
-        1331668247314038062L,
         1331668247926378321L,
         1331668247925622863L,
         1331668247926367737L,
         1331668247423543945L,
-        1331668247314038062L,
         1331668247619316825L,
         1331668247619491008L,
         1331668247619505885L,
         1331668247619392829L,
         1331668247619495072L,
         1331668247434248026L,
-        1331668247314038062L,
         1331668247434551326L,
         1331668247434365352L,
         1331668247434546203L,
         1331668247434365352L,
-        1331668247314038062L,
         1331668247908325947L,
         1331668247908264450L,
         1331668247908319810L,
         1331668247467380509L,
-        1331668247314038062L,
         1331668247908677700L,
         1331668247908325947L,
         1331668247908640244L,
         1331668247467447781L,
-        1331668247314038062L,
         1331668247869556425L,
         1331668247869483379L,
         1331668247869544380L,
         1331668247503177108L,
-        1331668247314038062L,
         1331668247504321893L,
         1331668247504294050L,
         1331668247504319470L,
         1331668247503423094L,
-        1331668247314038062L,
         1331668248014183954L,
         1331668248014145796L,
         1331668248014183954L,
         1331668247512172527L,
-        1331668247314038062L,
         1331668247539381562L,
         1331668247539325848L,
         1331668247539369787L,
         1331668247539325848L,
-        1331668247314038062L,
         1331668247735177820L,
         1331668247735128110L,
         1331668247735170303L,
         1331668247735128110L,
-        1331668247314038062L,
         1331668247735168206L,
         1331668247735152717L,
         1331668247735161964L,
         1331668247735152717L,
-        1331668247314038062L,
         1331668247775218227L,
         1331668247775191569L,
         1331668247775231079L,
         1331668247775218227L,
         1331668247775205377L,
         1331668247775191569L,
-        1331668247314038062L,
         1331668247775223776L,
         1331668247775218227L,
-        1331668247314038062L,
         1331668247869483379L,
         1331668247869457807L,
         1331668247869477795L,
         1331668247869457807L,
-        1331668247314038062L,
         1331668247941667986L,
         1331668247941620894L,
         1331668247941650415L,
@@ -815,88 +768,6 @@ 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,
     };
 
     long[] endTimes = {
@@ -909,7 +780,6 @@ interface TestValues {
         1331668259054130388L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248014185078L,
         1331668248014620024L,
         1331668259054285979L,
@@ -921,12 +791,10 @@ interface TestValues {
         1331668259054285979L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248014620024L,
         1331668259054285979L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248015333196L,
         1331668259054285979L,
         1331668259054285979L,
@@ -954,49 +822,39 @@ interface TestValues {
         1331668259054285979L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248015959980L,
         1331668248016172023L,
         1331668248016172023L,
         1331668248016194935L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668259054136697L,
         1331668259054285979L,
-        1331668259054285979L,
-        1331668259054285979L,
         1331668248016556933L,
         1331668248016556933L,
         1331668248016592456L,
         1331668252511012367L,
-        1331668259054285979L,
         1331668248016623209L,
         1331668248016623209L,
         1331668248016645047L,
         1331668252843104826L,
-        1331668259054285979L,
         1331668248015041609L,
         1331668248486545657L,
         1331668248502954816L,
         1331668248502954816L,
         1331668248503000162L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248020364249L,
         1331668248020364249L,
         1331668248020419523L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248020866943L,
         1331668248020866943L,
         1331668248020888352L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248531200073L,
         1331668248531200073L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248019005964L,
         1331668257323835062L,
         1331668257323879563L,
@@ -1009,13 +867,10 @@ interface TestValues {
         1331668259054285979L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
-        1331668259054285979L,
         1331668259051873438L,
         1331668259051873438L,
         1331668259051879701L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248751061201L,
         1331668248751061201L,
         1331668259054285979L,
@@ -1024,18 +879,14 @@ interface TestValues {
         1331668259054285979L,
         1331668259054285979L,
         1331668259054285979L,
-        1331668259054285979L,
-        1331668259054285979L,
         1331668259051838247L,
         1331668259051838247L,
         1331668259051846351L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668257325265220L,
         1331668257325265220L,
         1331668257325277639L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668250005943125L,
         1331668250005943125L,
         1331668248014565260L,
@@ -1046,329 +897,263 @@ interface TestValues {
         1331668250004649129L,
         1331668250006228246L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668250005962644L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668250004668081L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248014624125L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248414826115L,
         1331668248414826115L,
         1331668248414875444L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248420327828L,
         1331668248420327828L,
         1331668248420342919L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248015353903L,
         1331668248015353903L,
         1331668248015428919L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248420617453L,
         1331668248420617453L,
         1331668248420709272L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248421112139L,
         1331668248421112139L,
         1331668248421137268L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248421291701L,
         1331668248421291701L,
         1331668248014188534L,
         1331668248015518081L,
         1331668248014188534L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248421940554L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248014548923L,
         1331668248016397030L,
         1331668248014550770L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248422509298L,
         1331668248422509298L,
         1331668248422523601L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248424325503L,
         1331668248424325503L,
         1331668248424394073L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248140683324L,
         1331668248140686546L,
         1331668248140727269L,
         1331668248140727269L,
         1331668248140780012L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668251031789570L,
         1331668251031789570L,
         1331668251031812282L,
         1331668252047037657L,
-        1331668259054285979L,
         1331668248269586770L,
         1331668248269586770L,
         1331668248269613258L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248141167328L,
         1331668248141167328L,
         1331668248141400164L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248141004006L,
         1331668248141004006L,
         1331668248141028631L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248141324868L,
         1331668248141324868L,
         1331668248141345677L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248014185078L,
         1331668248015165243L,
         1331668248014185078L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248539549580L,
         1331668248539549580L,
         1331668248539579511L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668255234884605L,
         1331668255234884605L,
         1331668255234905622L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668255234936617L,
         1331668255234936617L,
         1331668255234941684L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252778982101L,
         1331668252778982101L,
         1331668252779007563L,
         1331668252779007563L,
         1331668252781320133L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252781341690L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248869653287L,
         1331668248869653287L,
         1331668248869679933L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668248941858743L,
         1331668248941858743L,
         1331668248941885421L,
         1331668252782929207L,
-        1331668259054285979L,
         1331668248207116451L,
         1331668248207116451L,
         1331668248207177650L,
         1331668248207163589L,
-        1331668259054285979L,
         1331668248207165629L,
         1331668248207165629L,
         1331668248207212201L,
         1331668248207197204L,
-        1331668259054285979L,
         1331668248763171129L,
         1331668248763171129L,
         1331668259054285979L,
         1331668248763179780L,
-        1331668259054285979L,
         1331668248895005379L,
         1331668248895005379L,
         1331668248895062414L,
         1331668248895035146L,
-        1331668259054285979L,
         1331668249000328909L,
         1331668249000328909L,
         1331668249000373092L,
         1331668249000350716L,
-        1331668259054285979L,
         1331668249548101920L,
         1331668249947171998L,
         1331668249947171998L,
         1331668249947269897L,
         1331668249947249018L,
-        1331668259054285979L,
         1331668249951033184L,
         1331668249951033184L,
         1331668249951077605L,
         1331668249951058138L,
-        1331668259054285979L,
         1331668249959079406L,
         1331668249959079406L,
         1331668259054285979L,
         1331668249959100633L,
-        1331668259054285979L,
         1331668249970937981L,
         1331668249970937981L,
         1331668259054285979L,
         1331668249970963407L,
-        1331668259054285979L,
         1331668250007423753L,
         1331668250007423753L,
         1331668250007449251L,
         1331668250007428034L,
-        1331668259054285979L,
         1331668250231124169L,
         1331668250231124169L,
         1331668250231169946L,
         1331668250231148973L,
-        1331668259054285979L,
         1331668250326525622L,
         1331668250326525622L,
         1331668250329519305L,
         1331668250329507458L,
-        1331668259054285979L,
         1331668251063191270L,
         1331668251063191270L,
         1331668251063256143L,
         1331668251063222335L,
-        1331668259054285979L,
         1331668251065026369L,
         1331668251065026369L,
         1331668251065048462L,
         1331668251065030498L,
-        1331668259054285979L,
         1331668251065058051L,
         1331668251065058051L,
         1331668251065091761L,
         1331668251065069765L,
-        1331668259054285979L,
         1331668251065364590L,
         1331668251065364590L,
         1331668251065412381L,
         1331668251065407607L,
-        1331668259054285979L,
         1331668251065462500L,
         1331668251065462500L,
         1331668251065477027L,
         1331668251065465604L,
-        1331668259054285979L,
         1331668251065780572L,
         1331668251065780572L,
         1331668251065836719L,
         1331668251065829440L,
-        1331668259054285979L,
         1331668251065899750L,
         1331668251065899750L,
         1331668251065913891L,
         1331668251065902892L,
-        1331668259054285979L,
         1331668251066057402L,
         1331668251066057402L,
         1331668251066070617L,
         1331668251066060363L,
-        1331668259054285979L,
         1331668251066495616L,
         1331668251066495616L,
         1331668251066520321L,
         1331668251066506338L,
-        1331668259054285979L,
         1331668251066532840L,
         1331668251066532840L,
         1331668251066546436L,
         1331668251066535866L,
-        1331668259054285979L,
         1331668251066658006L,
         1331668251066658006L,
         1331668251066671812L,
         1331668251066660635L,
-        1331668259054285979L,
         1331668251066883302L,
         1331668251066883302L,
         1331668251066906446L,
         1331668251066887423L,
-        1331668259054285979L,
         1331668251067153808L,
         1331668251067153808L,
         1331668251067176405L,
         1331668251067157534L,
-        1331668259054285979L,
         1331668251067407214L,
         1331668251067407214L,
         1331668251067420770L,
         1331668251067410220L,
-        1331668259054285979L,
         1331668251067763731L,
         1331668251067763731L,
         1331668251067818612L,
         1331668251067811009L,
-        1331668259054285979L,
         1331668251067884367L,
         1331668251067884367L,
         1331668251067897382L,
         1331668251067887136L,
-        1331668259054285979L,
         1331668251068275691L,
         1331668251068275691L,
         1331668251068288692L,
         1331668251068278423L,
-        1331668259054285979L,
         1331668251068706355L,
         1331668251068706355L,
         1331668251068719015L,
         1331668251068709290L,
-        1331668259054285979L,
         1331668251069067645L,
         1331668251069067645L,
         1331668251069122518L,
         1331668251069116275L,
-        1331668259054285979L,
         1331668251069178617L,
         1331668251069178617L,
         1331668251069191305L,
         1331668251069181300L,
-        1331668259054285979L,
         1331668251069664884L,
         1331668251069664884L,
         1331668251069684555L,
         1331668251069668097L,
-        1331668259054285979L,
         1331668251069682852L,
         1331668251069682852L,
         1331668251069708201L,
         1331668251069690226L,
-        1331668259054285979L,
         1331668251715054925L,
         1331668251715054925L,
         1331668259054285979L,
         1331668251715066022L,
-        1331668259054285979L,
         1331668251803784493L,
         1331668251803784493L,
         1331668251803827591L,
         1331668251803808547L,
-        1331668259054285979L,
         1331668251983438636L,
         1331668251983438636L,
         1331668251983448709L,
         1331668251983441583L,
-        1331668259054285979L,
         1331668251992993580L,
         1331668251992993580L,
         1331668251993008591L,
         1331668251992998928L,
-        1331668259054285979L,
         1331668252022091542L,
         1331668252022091542L,
         1331668252022091542L,
@@ -1378,82 +1163,66 @@ interface TestValues {
         1331668252031771660L,
         1331668252031777595L,
         1331668252031773847L,
-        1331668259054285979L,
         1331668252032463013L,
         1331668252032463013L,
         1331668252032502964L,
         1331668252032497700L,
-        1331668259054285979L,
         1331668252032506884L,
         1331668252032506884L,
         1331668252032559227L,
         1331668252032539402L,
-        1331668259054285979L,
         1331668252039535067L,
         1331668252039535067L,
         1331668259054285979L,
         1331668252039537404L,
-        1331668259054285979L,
         1331668252044008981L,
         1331668252044008981L,
         1331668252044014257L,
         1331668252044010861L,
-        1331668259054285979L,
         1331668252044059151L,
         1331668252044059151L,
         1331668252044064004L,
         1331668252044060420L,
-        1331668259054285979L,
         1331668252179391423L,
         1331668252179391423L,
         1331668252184781913L,
         1331668252184772369L,
-        1331668259054285979L,
         1331668252193425490L,
         1331668252193425490L,
         1331668252193432385L,
         1331668252193427706L,
-        1331668259054285979L,
         1331668252253575716L,
         1331668252253575716L,
         1331668252253592491L,
         1331668252253581852L,
-        1331668259054285979L,
         1331668252472449352L,
         1331668252472449352L,
         1331668252472474547L,
         1331668252472458163L,
-        1331668259054285979L,
         1331668252487295286L,
         1331668252487295286L,
         1331668252487300925L,
         1331668252487297683L,
-        1331668259054285979L,
         1331668252495759849L,
         1331668252495759849L,
         1331668252495766026L,
         1331668252495762178L,
-        1331668259054285979L,
         1331668252496219924L,
         1331668252496219924L,
         1331668252496245837L,
         1331668252496228816L,
-        1331668259054285979L,
         1331668252523291829L,
         1331668252523291829L,
         1331668252523482082L,
         1331668252523469395L,
-        1331668259054285979L,
         1331668252764810964L,
         1331668252764810964L,
         1331668252764829827L,
         1331668252764814570L,
-        1331668259054285979L,
         1331668252765021775L,
         1331668252765021775L,
         1331668252765026623L,
         1331668252765023841L,
-        1331668259054285979L,
         1331668252769399706L,
         1331668252769399706L,
         1331668252769401404L,
@@ -1461,36 +1230,29 @@ interface TestValues {
         1331668259054285979L,
         1331668252769446847L,
         1331668259054285979L,
-        1331668259054285979L,
         1331668252769456141L,
-        1331668259054285979L,
         1331668252784988923L,
         1331668252784988923L,
         1331668259054285979L,
         1331668252785262589L,
-        1331668259054285979L,
         1331668252795062126L,
         1331668252795062126L,
         1331668259054285979L,
         1331668252795122600L,
-        1331668259054285979L,
         1331668252828832090L,
         1331668252828832090L,
         1331668252828859292L,
         1331668252828859292L,
         1331668252828904216L,
         1331668252828866041L,
-        1331668259054285979L,
         1331668252829060434L,
         1331668252828992804L,
-        1331668259054285979L,
         1331668252829505108L,
         1331668252829505108L,
         1331668252829527974L,
         1331668252829527974L,
         1331668252829719292L,
         1331668252829638887L,
-        1331668259054285979L,
         1331668252829643060L,
         1331668252829643060L,
         1331668252829660274L,
@@ -1511,39 +1273,28 @@ interface TestValues {
         1331668252829976501L,
         1331668252830107659L,
         1331668252830085595L,
-        1331668259054285979L,
         1331668252830154848L,
         1331668252830139534L,
-        1331668259054285979L,
         1331668252830212497L,
         1331668252830194969L,
-        1331668259054285979L,
         1331668252830382459L,
         1331668252830368625L,
-        1331668259054285979L,
         1331668252830526491L,
         1331668252830499169L,
-        1331668259054285979L,
         1331668252830576634L,
         1331668252830564658L,
-        1331668259054285979L,
         1331668252831112505L,
         1331668252831083126L,
-        1331668259054285979L,
         1331668252831228714L,
         1331668252831228714L,
         1331668252831318123L,
         1331668252831301843L,
-        1331668259054285979L,
         1331668252831543926L,
         1331668252831527998L,
-        1331668259054285979L,
         1331668252831834393L,
         1331668252831817197L,
-        1331668259054285979L,
         1331668252832056760L,
         1331668252832046333L,
-        1331668259054285979L,
         1331668252883172744L,
         1331668252883172744L,
         1331668252883172744L,
@@ -1563,7 +1314,6 @@ interface TestValues {
         1331668252889399649L,
         1331668252901232798L,
         1331668252901118256L,
-        1331668259054285979L,
         1331668252901540914L,
         1331668252901540914L,
         1331668252901540914L,
@@ -1573,7 +1323,6 @@ interface TestValues {
         1331668252901573889L,
         1331668252901586635L,
         1331668252901577276L,
-        1331668259054285979L,
         1331668252906764880L,
         1331668252906764880L,
         1331668252906764880L,
@@ -1583,7 +1332,6 @@ interface TestValues {
         1331668252912042743L,
         1331668259054285979L,
         1331668252912048618L,
-        1331668259054285979L,
         1331668252927449371L,
         1331668252927449371L,
         1331668252927449371L,
@@ -1648,12 +1396,10 @@ interface TestValues {
         1331668253267104284L,
         1331668253267117055L,
         1331668253267107624L,
-        1331668259054285979L,
         1331668253267342015L,
         1331668253267342015L,
         1331668253267378405L,
         1331668253267367303L,
-        1331668259054285979L,
         1331668253278218713L,
         1331668253278218713L,
         1331668253278218713L,
@@ -1683,7 +1429,6 @@ interface TestValues {
         1331668253621486721L,
         1331668253621508851L,
         1331668253621491536L,
-        1331668259054285979L,
         1331668253622429608L,
         1331668253622429608L,
         1331668253622429608L,
@@ -1743,7 +1488,6 @@ interface TestValues {
         1331668255157088064L,
         1331668255157101973L,
         1331668255157091812L,
-        1331668259054285979L,
         1331668256244508635L,
         1331668256244508635L,
         1331668256244508635L,
@@ -1753,7 +1497,6 @@ interface TestValues {
         1331668257246987050L,
         1331668257247036372L,
         1331668257247027684L,
-        1331668259054285979L,
         1331668259045096840L,
         1331668259045096840L,
         1331668259045096840L,
@@ -1768,7 +1511,6 @@ interface TestValues {
         1331668259053345550L,
         1331668259054285979L,
         1331668259053349544L,
-        1331668259054285979L,
     };
 
     ITmfStateValue[] values = {
@@ -1781,7 +1523,6 @@ interface TestValues {
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueInt(20),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(2),
         TmfStateValue.newValueInt(1397),
         TmfStateValue.nullValue(),
@@ -1793,12 +1534,10 @@ interface TestValues {
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(5),
         TmfStateValue.nullValue(),
         TmfStateValue.newValueString("swapper/0"),
         TmfStateValue.newValueInt(20),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(5),
         TmfStateValue.newValueString("swapper/1"),
         TmfStateValue.newValueInt(20),
@@ -1827,43 +1566,34 @@ interface TestValues {
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(-6),
         TmfStateValue.newValueString("sys_ppoll"),
         TmfStateValue.newValueString("alsa-sink"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueString("sys_epoll_wait"),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_futex"),
         TmfStateValue.newValueString("firefox"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("firefox"),
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("gnome-terminal"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_select"),
         TmfStateValue.newValueString("Xorg"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("metacity"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.nullValue(),
@@ -1872,22 +1602,18 @@ 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.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_read"),
         TmfStateValue.newValueString("rsyslogd"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_futex"),
         TmfStateValue.newValueString("rs:main Q:Reg"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.nullValue(),
@@ -1896,18 +1622,14 @@ 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.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_read"),
         TmfStateValue.newValueString("bash"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueInt(1),
@@ -1918,133 +1640,106 @@ interface TestValues {
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("bamfdaemon"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("gnome-settings-"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("unity-2d-shell"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("unity-2d-panel"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("indicator-multi"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("gdbus"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("dbus-daemon"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("gdbus"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("indicator-appli"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueInt(3),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("gdbus"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("gdbus"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(5),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_futex"),
         TmfStateValue.newValueString("unity-panel-ser"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("hud-service"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("gdbus"),
         TmfStateValue.nullValue(),
         TmfStateValue.nullValue(),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("openvpn"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("firefox"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_futex"),
         TmfStateValue.newValueString("thunderbird-bin"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("thunderbird-bin"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("thunderbird-bin"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_futex"),
         TmfStateValue.newValueString("thunderbird-bin"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(2),
         TmfStateValue.newValueInt(20),
         TmfStateValue.nullValue(),
         TmfStateValue.newValueString("gdbus"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_nanosleep"),
         TmfStateValue.newValueString("gvfs-afc-volume"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("rtkit-daemon"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(-100),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("rtkit-daemon"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("thunderbird-bin"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueString("sys_poll"),
         TmfStateValue.newValueString("thunderbird-bin"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_futex"),
         TmfStateValue.newValueString("thunderbird-bin"),
-        TmfStateValue.nullValue(),
         TmfStateValue.newValueInt(1),
         TmfStateValue.newValueInt(20),
         TmfStateValue.newValueString("sys_futex"),
@@ -2559,87 +2254,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(),
     };
 }