Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2012-06-13 06:26:13 +0000
committerAlexander Kurtakov2012-06-13 06:26:13 +0000
commita9dfa6cda20d6df67bc2dac2ba2ab2399c5e3b53 (patch)
tree405132bffea087b963f695deed273f0bbb3ad17b
parent29a03dd09ce210b560b6f8bd58616fc254ea023f (diff)
downloadorg.eclipse.linuxtools-a9dfa6cda20d6df67bc2dac2ba2ab2399c5e3b53.tar.gz
org.eclipse.linuxtools-a9dfa6cda20d6df67bc2dac2ba2ab2399c5e3b53.tar.xz
org.eclipse.linuxtools-a9dfa6cda20d6df67bc2dac2ba2ab2399c5e3b53.zip
Restore valgrind massif tests.
Lost during git conversion.
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.classpath7
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.project34
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/about.html26
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/build.properties10
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/alloctest/.cproject593
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/alloctest/.project81
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/alloctest/alloctest.c53
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/multiProcTest/.cproject598
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/multiProcTest/.project82
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/multiProcTest/parent.c21
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/AbstractMassifTest.java83
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/AllTests.java38
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/BasicMassifTest.java38
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartExportTest.java66
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartTests.java176
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ExportWizardTest.java192
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/MassifTestsPlugin.java60
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/MultiProcessTest.java137
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/SortTest.java118
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/test.xml54
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAlignment/massif_3500.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAlignment/template_massif_3500.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAlignment/template_valgrind_3500.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFn/massif_3140.txt122
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFn/template_massif_3140.txt122
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFn/template_valgrind_3140.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnMultiple/massif_3180.txt122
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnMultiple/template_massif_3180.txt122
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnMultiple/template_valgrind_3180.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnSpace/massif_3220.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnSpace/template_massif_3220.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnSpace/template_valgrind_3220.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingGiB/massif_2637.txt863
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingGiB/template_massif_2637.txt863
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingGiB/template_valgrind_2637.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingKiB/massif_2556.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingKiB/template_massif_2556.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingKiB/template_valgrind_2556.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingMiB/massif_2596.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingMiB/template_massif_2596.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingMiB/template_valgrind_2596.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingTiB/massif_2680.txt759
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingTiB/template_massif_2680.txt759
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingTiB/template_valgrind_2680.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testChartCallback/massif_2779.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testChartCallback/template_massif_2779.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testChartCallback/template_valgrind_2779.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDefaults/massif_4357.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDefaults/template_massif_4357.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDefaults/template_valgrind_4357.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDepth/massif_3100.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDepth/template_massif_3100.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDepth/template_valgrind_3100.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDetailedFreq/massif_3420.txt195
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDetailedFreq/template_massif_3420.txt195
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDetailedFreq/template_valgrind_3420.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickFile/massif_2419.txt153
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickFile/template_massif_2419.txt153
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickFile/template_valgrind_2419.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickLine/massif_2469.txt153
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickLine/template_massif_2469.txt153
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickLine/template_valgrind_2469.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testEditorName/massif_2509.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testEditorName/template_massif_2509.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testEditorName/template_valgrind_2509.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/massif_3995.txt71
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/massif_4000.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_massif_3995.txt71
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_massif_4000.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_valgrind_3995.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_valgrind_4000.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExport/massif_3769.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExport/template_massif_3769.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExport/template_valgrind_3769.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeap/massif_2980.txt11
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeap/template_massif_2980.txt11
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeap/template_valgrind_2980.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeapAdmin/massif_3020.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeapAdmin/template_massif_3020.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeapAdmin/template_valgrind_3020.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testMaxSpapshots/massif_3460.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testMaxSpapshots/template_massif_3460.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testMaxSpapshots/template_valgrind_3460.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoDetailed/massif_2860.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoDetailed/template_massif_2860.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoDetailed/template_valgrind_2860.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoExec/massif_3847.txt71
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoExec/template_massif_3847.txt71
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoExec/template_valgrind_3847.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNumSnapshots/massif_2900.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNumSnapshots/template_massif_2900.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNumSnapshots/template_valgrind_2900.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testPeakInaccuracy/massif_3300.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testPeakInaccuracy/template_massif_3300.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testPeakInaccuracy/template_valgrind_3300.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testStacks/massif_4317.txt506
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testStacks/template_massif_4317.txt506
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testStacks/template_valgrind_4317.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testThreshold/massif_3260.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testThreshold/template_massif_3260.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testThreshold/template_valgrind_3260.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitBytes/massif_3340.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitBytes/template_massif_3340.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitBytes/template_valgrind_3340.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitMilliseconds/massif_3380.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitMilliseconds/template_massif_3380.txt123
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitMilliseconds/template_valgrind_3380.txt0
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTreeNodes/massif_2820.txt153
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTreeNodes/template_massif_2820.txt153
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTreeNodes/template_valgrind_2820.txt0
111 files changed, 13260 insertions, 0 deletions
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.classpath
new file mode 100644
index 0000000000..64c5e31b7a
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.project b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.project
new file mode 100644
index 0000000000..a4b8b49942
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.linuxtools.valgrind.massif.tests</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+ </natures>
+</projectDescription>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..61b81fdf80
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Mon Dec 15 15:08:24 EST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/about.html b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/about.html
new file mode 100644
index 0000000000..e6a2741fc0
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/about.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+
+
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>About</title>
+</head><body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>October 24, 2008</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body></html> \ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/build.properties b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/build.properties
new file mode 100644
index 0000000000..118522991a
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/build.properties
@@ -0,0 +1,10 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.properties,\
+ resources/,\
+ about.html,\
+ valgrindFiles/,\
+ test.xml
+
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/alloctest/.cproject b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/alloctest/.cproject
new file mode 100644
index 0000000000..a53f0b4f69
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/alloctest/.cproject
@@ -0,0 +1,593 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?>
+
+<cproject>
+<storageModule moduleId="org.eclipse.cdt.core.settings">
+<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.558688055">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.558688055" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="alloctest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.558688055" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
+<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.558688055." name="/" resourcePath="">
+<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1553639182" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
+<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.930970241" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
+<builder buildPath="${workspace_loc:/alloctest/Debug}" id="cdt.managedbuild.target.gnu.builder.exe.debug.1027317050" managedBuildOn="true" name="Gnu Make Builder.Debug" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
+<tool id="cdt.managedbuild.tool.gnu.archiver.base.628989124" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.998849290" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
+<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.984020833" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.215620373" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1985855997" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
+<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.2008189820" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
+<option id="gnu.c.compiler.exe.debug.option.debugging.level.1871634291" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
+<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.710416077" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1681416185" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug">
+<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1607276387" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
+<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+</inputType>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.233209948" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"/>
+<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.693656462" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
+<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1942751486" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+</tool>
+</toolChain>
+</folderInfo>
+</configuration>
+</storageModule>
+<storageModule moduleId="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1843335050;cdt.managedbuild.config.gnu.exe.release.1843335050.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1731562352;cdt.managedbuild.tool.gnu.c.compiler.input.1354508894">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.558688055;cdt.managedbuild.config.gnu.exe.debug.558688055.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1985855997;cdt.managedbuild.tool.gnu.c.compiler.input.710416077">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+</cconfiguration>
+<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.1843335050">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.1843335050" moduleId="org.eclipse.cdt.core.settings" name="Release">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="alloctest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1843335050" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
+<folderInfo id="cdt.managedbuild.config.gnu.exe.release.1843335050." name="/" resourcePath="">
+<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1538991542" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
+<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1264481039" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
+<builder buildPath="${workspace_loc:/alloctest/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.2088301363" managedBuildOn="true" name="Gnu Make Builder.Release" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
+<tool id="cdt.managedbuild.tool.gnu.archiver.base.588443825" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1567078160" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
+<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1694052336" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.exe.release.option.debugging.level.661433144" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1731562352" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
+<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.275422102" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
+<option id="gnu.c.compiler.exe.release.option.debugging.level.541314912" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
+<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1354508894" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1584524011" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release">
+<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.682261922" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
+<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+</inputType>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.1885869502" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release"/>
+<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.674017790" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
+<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1830449625" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+</tool>
+</toolChain>
+</folderInfo>
+</configuration>
+</storageModule>
+<storageModule moduleId="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1843335050;cdt.managedbuild.config.gnu.exe.release.1843335050.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1731562352;cdt.managedbuild.tool.gnu.c.compiler.input.1354508894">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.558688055;cdt.managedbuild.config.gnu.exe.debug.558688055.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1985855997;cdt.managedbuild.tool.gnu.c.compiler.input.710416077">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+</storageModule>
+</cconfiguration>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<project id="alloctest.cdt.managedbuild.target.gnu.exe.1405871172" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
+</storageModule>
+</cproject>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/alloctest/.project b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/alloctest/.project
new file mode 100644
index 0000000000..e8f3d30678
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/alloctest/.project
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>alloctest</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+ <triggers>clean,full,incremental,</triggers>
+ <arguments>
+ <dictionary>
+ <key>?name?</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.append_environment</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildArguments</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildCommand</key>
+ <value>make</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildLocation</key>
+ <value>${workspace_loc:/alloctest/Debug}</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+ <value>clean</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.contents</key>
+ <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+ <value>false</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableFullBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.stopOnError</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+ <value>true</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+ <nature>org.eclipse.cdt.core.cnature</nature>
+ </natures>
+</projectDescription>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/alloctest/alloctest.c b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/alloctest/alloctest.c
new file mode 100644
index 0000000000..f514d1631c
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/alloctest/alloctest.c
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+#include <stdlib.h>
+#include <unistd.h>
+
+int main(int argc, char **argv) {
+ long long bytes = 40;
+ long long times = 1;
+ if (argc > 1) {
+ bytes = atoll(argv[1]);
+ if (argc > 2) {
+ times = atoll(argv[2]);
+ }
+ }
+ else {
+ bytes = 40;
+ }
+
+ while (times-- > 0) {
+ int *foo();
+ void bar(int *);
+ int *ptr1 = (int *)malloc(bytes);
+ int *ptr2 = foo();
+ int *ptr3 = (int *)malloc(bytes);
+ int *ptr4 = foo();
+ int *ptr5 = (int *)malloc(bytes);
+ int *ptr6 = foo();
+
+ free(ptr1);
+ bar(ptr2);
+ free(ptr3);
+ bar(ptr4);
+ free(ptr5);
+ bar(ptr6);
+ }
+ return 0;
+}
+
+int *foo(long long bytes) {
+ return (int *)malloc(bytes);
+}
+
+void bar(int *ptr) {
+ free(ptr);
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/multiProcTest/.cproject b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/multiProcTest/.cproject
new file mode 100644
index 0000000000..757bf2ba61
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/multiProcTest/.cproject
@@ -0,0 +1,598 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?>
+
+<cproject>
+<storageModule moduleId="org.eclipse.cdt.core.settings">
+<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.1481301840">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1481301840" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="multiProcTest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.1481301840" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
+<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1481301840." name="/" resourcePath="">
+<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1292667418" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
+<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.97467557" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
+<builder buildPath="${workspace_loc:/multiProcTest/Debug}" id="cdt.managedbuild.target.gnu.builder.exe.debug.1822614167" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
+<tool id="cdt.managedbuild.tool.gnu.archiver.base.2005580352" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1978428508" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
+<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.329871985" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.1040146511" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.898608396" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
+<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.966774365" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
+<option id="gnu.c.compiler.exe.debug.option.debugging.level.1618572184" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
+<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.536982859" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1866112856" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug">
+<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.998244771" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
+<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+</inputType>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1754049892" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"/>
+<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.839055610" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
+<inputType id="cdt.managedbuild.tool.gnu.assembler.input.340634089" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+</tool>
+</toolChain>
+</folderInfo>
+</configuration>
+</storageModule>
+<storageModule moduleId="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1325288242;cdt.managedbuild.config.gnu.exe.release.1325288242.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.540648720;cdt.managedbuild.tool.gnu.c.compiler.input.1882339444">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1481301840;cdt.managedbuild.config.gnu.exe.debug.1481301840.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.898608396;cdt.managedbuild.tool.gnu.c.compiler.input.536982859">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+</cconfiguration>
+<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.1325288242">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.1325288242" moduleId="org.eclipse.cdt.core.settings" name="Release">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="multiProcTest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1325288242" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
+<folderInfo id="cdt.managedbuild.config.gnu.exe.release.1325288242." name="/" resourcePath="">
+<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.121595033" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
+<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1857389583" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
+<builder buildPath="${workspace_loc:/multiProcTest/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.263913414" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
+<tool id="cdt.managedbuild.tool.gnu.archiver.base.336142425" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1557110882" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
+<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1076432821" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.exe.release.option.debugging.level.715438677" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.540648720" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
+<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1190281036" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
+<option id="gnu.c.compiler.exe.release.option.debugging.level.1933437673" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
+<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1882339444" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.410886480" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release">
+<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.810055799" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
+<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+</inputType>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.529441391" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release"/>
+<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.1870428101" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
+<inputType id="cdt.managedbuild.tool.gnu.assembler.input.996545386" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+</tool>
+</toolChain>
+</folderInfo>
+</configuration>
+</storageModule>
+<storageModule moduleId="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1325288242;cdt.managedbuild.config.gnu.exe.release.1325288242.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.540648720;cdt.managedbuild.tool.gnu.c.compiler.input.1882339444">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1481301840;cdt.managedbuild.config.gnu.exe.debug.1481301840.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.898608396;cdt.managedbuild.tool.gnu.c.compiler.input.536982859">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+</cconfiguration>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<project id="multiProcTest.cdt.managedbuild.target.gnu.exe.1534870325" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
+</storageModule>
+</cproject>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/multiProcTest/.project b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/multiProcTest/.project
new file mode 100644
index 0000000000..aa4c193e1c
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/multiProcTest/.project
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>multiProcTest</name>
+ <comment></comment>
+ <projects>
+ <project>alloctest</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+ <triggers>clean,full,incremental,</triggers>
+ <arguments>
+ <dictionary>
+ <key>?name?</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.append_environment</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildArguments</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildCommand</key>
+ <value>make</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildLocation</key>
+ <value>${workspace_loc:/multiProcTest/Debug}</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+ <value>clean</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.contents</key>
+ <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+ <value>false</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableFullBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.stopOnError</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+ <value>true</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+ <nature>org.eclipse.cdt.core.cnature</nature>
+ </natures>
+</projectDescription>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/multiProcTest/parent.c b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/multiProcTest/parent.c
new file mode 100644
index 0000000000..b2ec946618
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/resources/multiProcTest/parent.c
@@ -0,0 +1,21 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#define SIZE 100
+int main() {
+ if (fork()) {
+ int *a = (int *)malloc(sizeof(int) * SIZE);
+ int *b = (int *)malloc(sizeof(int) * SIZE);
+ int *c = (int *)malloc(sizeof(int) * SIZE);
+ free(a);
+ free(b);
+ free(c);
+ }
+ else {
+ execv("../alloctest/Debug/alloctest", NULL);
+ perror("execv");
+ }
+ return 0;
+}
+
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/AbstractMassifTest.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/AbstractMassifTest.java
new file mode 100644
index 0000000000..ff17c22a15
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/AbstractMassifTest.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.massif.tests;
+
+import java.io.File;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.text.TextSelection;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.linuxtools.internal.valgrind.massif.MassifHeapTreeNode;
+import org.eclipse.linuxtools.internal.valgrind.massif.MassifPlugin;
+import org.eclipse.linuxtools.internal.valgrind.tests.AbstractValgrindTest;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.osgi.framework.Bundle;
+
+
+public abstract class AbstractMassifTest extends AbstractValgrindTest {
+
+ @Override
+ protected Bundle getBundle() {
+ return MassifTestsPlugin.getDefault().getBundle();
+ }
+
+ @Override
+ protected String getToolID() {
+ return MassifPlugin.TOOL_ID;
+ }
+
+ protected void checkFile(IProject proj, MassifHeapTreeNode node) {
+ IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ IEditorInput input = editor.getEditorInput();
+ if (input instanceof IFileEditorInput) {
+ IFileEditorInput fileInput = (IFileEditorInput) input;
+ IResource expectedResource = proj.findMember(node.getFilename());
+ if (expectedResource != null) {
+ File expectedFile = expectedResource.getLocation().toFile();
+ File actualFile = fileInput.getFile().getLocation().toFile();
+ assertEquals(expectedFile, actualFile);
+ }
+ else {
+ fail();
+ }
+ }
+ else {
+ fail();
+ }
+ }
+
+ protected void checkLine(MassifHeapTreeNode node) {
+ IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ if (editor instanceof ITextEditor) {
+ ITextEditor textEditor = (ITextEditor) editor;
+
+ ISelection selection = textEditor.getSelectionProvider().getSelection();
+ if (selection instanceof TextSelection) {
+ TextSelection textSelection = (TextSelection) selection;
+ int line = textSelection.getStartLine() + 1; // zero-indexed
+
+ assertEquals(node.getLine(), line);
+ }
+ else {
+ fail();
+ }
+ }
+ else {
+ fail();
+ }
+ }
+
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/AllTests.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/AllTests.java
new file mode 100644
index 0000000000..b845b8f996
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/AllTests.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.massif.tests;
+
+import org.eclipse.linuxtools.internal.valgrind.massif.MassifPlugin;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite(
+ "Tests for " + MassifPlugin.PLUGIN_ID); //$NON-NLS-1$
+ //$JUnit-BEGIN$
+ suite.addTestSuite(DoubleClickTest.class);
+ suite.addTestSuite(ChartTests.class);
+ suite.addTestSuite(TreeTest.class);
+ suite.addTestSuite(BasicMassifTest.class);
+ suite.addTestSuite(LaunchConfigTabTest.class);
+ suite.addTestSuite(ExportWizardTest.class);
+ suite.addTestSuite(MultiProcessTest.class);
+ suite.addTestSuite(ExpandCollapseTest.class);
+ suite.addTestSuite(SortTest.class);
+ suite.addTestSuite(ChartExportTest.class);
+ //$JUnit-END$
+ return suite;
+ }
+
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/BasicMassifTest.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/BasicMassifTest.java
new file mode 100644
index 0000000000..58f2fdc68c
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/BasicMassifTest.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.massif.tests;
+
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.linuxtools.internal.valgrind.massif.MassifViewPart;
+import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindUIPlugin;
+
+public class BasicMassifTest extends AbstractMassifTest {
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ proj = createProjectAndBuild("alloctest"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ deleteProject(proj);
+ super.tearDown();
+ }
+
+ public void testNumSnapshots() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testNumSnapshots"); //$NON-NLS-1$
+
+ MassifViewPart view = (MassifViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ assertEquals(14, view.getSnapshots().length);
+ }
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartExportTest.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartExportTest.java
new file mode 100644
index 0000000000..1fecd0cd0c
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartExportTest.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.massif.tests;
+
+import java.io.File;
+
+import org.eclipse.birt.chart.model.Chart;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.linuxtools.internal.valgrind.massif.birt.ChartEditorInput;
+import org.eclipse.linuxtools.internal.valgrind.massif.birt.ChartSVG;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.PlatformUI;
+
+public class ChartExportTest extends AbstractMassifTest {
+ private IPath svgPath;
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ proj = createProjectAndBuild("alloctest"); //$NON-NLS-1$
+
+ svgPath = ResourcesPlugin.getWorkspace().getRoot().getLocation();
+ assertNotNull(svgPath);
+ svgPath = svgPath.append("alloctest").append("chart.svg"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ File chartFile = svgPath.toFile();
+ if (chartFile.exists()) {
+ chartFile.delete();
+ }
+
+ deleteProject(proj);
+ super.tearDown();
+ }
+
+ public void testChartExportSVG() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testDefaults"); //$NON-NLS-1$
+
+ IEditorInput input = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().getEditorInput();
+ if (input instanceof ChartEditorInput) {
+ Chart chart = ((ChartEditorInput) input).getChart();
+
+ ChartSVG svg = new ChartSVG(chart);
+ svg.renderSVG(svgPath);
+
+ File chartFile = svgPath.toFile();
+ assertTrue(chartFile.exists());
+ assertTrue(chartFile.length() > 0);
+ } else {
+ fail();
+ }
+ }
+
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartTests.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartTests.java
new file mode 100644
index 0000000000..5b49aed90a
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartTests.java
@@ -0,0 +1,176 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.massif.tests;
+
+import java.util.Arrays;
+
+import org.eclipse.birt.chart.computation.DataPointHints;
+import org.eclipse.birt.chart.event.WrappedStructureSource;
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.linuxtools.internal.valgrind.massif.MassifHeapTreeNode;
+import org.eclipse.linuxtools.internal.valgrind.massif.MassifLaunchConstants;
+import org.eclipse.linuxtools.internal.valgrind.massif.MassifSnapshot;
+import org.eclipse.linuxtools.internal.valgrind.massif.MassifViewPart;
+import org.eclipse.linuxtools.internal.valgrind.massif.birt.ChartControl;
+import org.eclipse.linuxtools.internal.valgrind.massif.birt.ChartEditor;
+import org.eclipse.linuxtools.internal.valgrind.massif.birt.ChartEditorInput;
+import org.eclipse.linuxtools.internal.valgrind.massif.birt.ChartLocationsDialog;
+import org.eclipse.linuxtools.internal.valgrind.massif.birt.HeapChart;
+import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindUIPlugin;
+import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindViewPart;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.PlatformUI;
+
+public class ChartTests extends AbstractMassifTest {
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ proj = createProjectAndBuild("alloctest"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ deleteProject(proj);
+ super.tearDown();
+ }
+
+ public void testEditorName() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testEditorName"); //$NON-NLS-1$
+
+ ValgrindViewPart view = ValgrindUIPlugin.getDefault().getView();
+ IAction chartAction = getChartAction(view);
+ assertNotNull(chartAction);
+ chartAction.run();
+
+ IEditorPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ assertEquals("Heap Chart - alloctest", part.getTitle()); //$NON-NLS-1$
+ }
+
+ public void testByteScalingKiB() throws Exception {
+ byteScalingHelper(1, 1, 1024 * 10, "testByteScalingKiB"); //$NON-NLS-1$
+ }
+
+ public void testByteScalingMiB() throws Exception {
+ byteScalingHelper(2, 1, 1024 * 1024 * 10, "testByteScalingMiB"); //$NON-NLS-1$
+ }
+
+ public void testByteScalingGiB() throws Exception {
+ byteScalingHelper(3, 1024, 1024 * 1024 * 10, "testByteScalingGiB"); //$NON-NLS-1$
+ }
+
+ public void testByteScalingTiB() throws Exception {
+ byteScalingHelper(4, 1024 * 1024, 1024 * 1024 *10, "testByteScalingTiB"); //$NON-NLS-1$
+ }
+
+ public void testChartCallback() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testChartCallback"); //$NON-NLS-1$
+
+ ValgrindViewPart view = ValgrindUIPlugin.getDefault().getView();
+ IAction chartAction = getChartAction(view);
+ assertNotNull(chartAction);
+ chartAction.run();
+
+ IEditorPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ if (part instanceof ChartEditor) {
+ ChartControl control = ((ChartEditor) part).getControl();
+ Event event = new Event();
+ event.button = 1;
+ event.count = 1;
+ event.widget = control;
+ MouseEvent mEvent = new MouseEvent(event);
+ DataPointHints source = new DataPointHints(null, null, null, null, null, null, null, null, null, 4, null, 0, null);
+ control.callback(mEvent, new WrappedStructureSource(source), null);
+
+ TableViewer viewer = ((MassifViewPart) view.getDynamicView()).getTableViewer();
+ MassifSnapshot[] snapshots = (MassifSnapshot[]) viewer.getInput();
+ MassifSnapshot snapshot = (MassifSnapshot) ((StructuredSelection) viewer.getSelection()).getFirstElement();
+ assertEquals(4, Arrays.asList(snapshots).indexOf(snapshot));
+ } else {
+ fail();
+ }
+ }
+
+ public void testChartLocationsDialog() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testChartCallback"); //$NON-NLS-1$
+
+ MassifViewPart view = (MassifViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ MassifSnapshot snapshot = view.getSnapshots()[7]; // peak
+ assertTrue(snapshot.isDetailed());
+
+ Shell parent = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+ ChartLocationsDialog dialog = new ChartLocationsDialog(parent);
+ dialog.setInput(snapshot);
+ dialog.setBlockOnOpen(false);
+ dialog.open();
+
+ MassifHeapTreeNode element = snapshot.getRoot().getChildren()[1];
+ dialog.getTableViewer().setSelection(new StructuredSelection(element));
+ dialog.getOkButton().notifyListeners(SWT.Selection, null);
+ dialog.openEditorForResult();
+
+ checkFile(proj.getProject(), element);
+ checkLine(element);
+ }
+
+ private void byteScalingHelper(int ix, long times, long bytes, String testName) throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
+ wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, String.valueOf(bytes) + " " + String.valueOf(times)); //$NON-NLS-1$
+ wc.setAttribute(MassifLaunchConstants.ATTR_MASSIF_TIMEUNIT, MassifLaunchConstants.TIME_B);
+ config = wc.doSave();
+
+ doLaunch(config, testName);
+
+ ValgrindViewPart view = ValgrindUIPlugin.getDefault().getView();
+ IAction chartAction = getChartAction(view);
+ assertNotNull(chartAction);
+ chartAction.run();
+
+ IEditorPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ if (part.getEditorInput() instanceof ChartEditorInput) {
+ ChartEditorInput input = (ChartEditorInput) part.getEditorInput();
+ HeapChart chart = input.getChart();
+ assertEquals(HeapChart.getByteUnits()[ix], chart.getXUnits());
+ } else {
+ fail();
+ }
+ }
+
+ private IAction getChartAction(IViewPart view) {
+ IAction result = null;
+ IToolBarManager manager = view.getViewSite().getActionBars().getToolBarManager();
+ for (IContributionItem item : manager.getItems()) {
+ if (item instanceof ActionContributionItem) {
+ ActionContributionItem actionItem = (ActionContributionItem) item;
+ if (actionItem.getAction().getId().equals(MassifViewPart.CHART_ACTION)) {
+ result = actionItem.getAction();
+ }
+ }
+ }
+ return result;
+ }
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ExportWizardTest.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ExportWizardTest.java
new file mode 100644
index 0000000000..c366bf882e
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ExportWizardTest.java
@@ -0,0 +1,192 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.massif.tests;
+
+import java.io.File;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.linuxtools.internal.valgrind.launch.ValgrindExportWizard;
+import org.eclipse.linuxtools.internal.valgrind.launch.ValgrindExportWizardPage;
+import org.eclipse.ui.PlatformUI;
+
+public class ExportWizardTest extends AbstractMassifTest {
+
+ protected ValgrindExportWizard wizard;
+ protected WizardDialog dialog;
+ protected ValgrindExportWizardPage page;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ proj = createProjectAndBuild("alloctest"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ deleteProject(proj);
+
+ // close dialog just in case
+ if (dialog != null) {
+ dialog.close();
+ }
+ super.tearDown();
+ }
+
+ public void testExportNoLaunch() throws Exception {
+ // No Valgrind launch to export
+ createWizard();
+
+ assertNotNull(page.getErrorMessage());
+ }
+
+ public void testExportBadPath() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ ILaunch launch = doLaunch(config, "testExport"); //$NON-NLS-1$
+
+ IProcess p = launch.getProcesses()[0];
+ assertEquals(0, p.getExitValue());
+
+ createWizard();
+
+ // set the output path, should trigger modify listener
+ page.getDestText().setText("DOESNOTEXIST"); //$NON-NLS-1$
+
+ assertNotNull(page.getErrorMessage());
+ assertFalse(page.isPageComplete());
+ assertFalse(wizard.canFinish());
+ }
+
+ public void testExportNotDir() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ ILaunch launch = doLaunch(config, "testExport"); //$NON-NLS-1$
+
+ IProcess p = launch.getProcesses()[0];
+ assertEquals(0, p.getExitValue());
+
+ createWizard();
+
+ // set the output path, should trigger modify listener
+ IPath pathToFiles = proj.getProject().getLocation();
+ pathToFiles = pathToFiles.append("alloctest.c"); //$NON-NLS-1$
+ assertTrue(pathToFiles.toFile().exists());
+ page.getDestText().setText(pathToFiles.toOSString());
+
+ assertNotNull(page.getErrorMessage());
+ assertFalse(page.isPageComplete());
+ assertFalse(wizard.canFinish());
+ }
+
+ public void testExportBoth() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ ILaunch launch = doLaunch(config, "testExport"); //$NON-NLS-1$
+
+ IProcess p = launch.getProcesses()[0];
+ assertEquals(0, p.getExitValue());
+
+ createWizard();
+
+ // set the output path, should trigger modify listener
+ File[] selectedFiles = page.getSelectedFiles();
+ IPath pathToFiles = proj.getProject().getLocation();
+ page.getDestText().setText(pathToFiles.toOSString());
+
+ assertTrue(page.isPageComplete());
+ assertTrue(wizard.canFinish());
+
+ assertTrue(wizard.performFinish());
+
+ // check files were copied
+ for (File log : selectedFiles) {
+ File copy = new File(pathToFiles.toFile(), log.getName());
+ assertTrue(copy.exists());
+ }
+ }
+
+ public void testExportOne() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ ILaunch launch = doLaunch(config, "testExport"); //$NON-NLS-1$
+
+ IProcess p = launch.getProcesses()[0];
+ assertEquals(0, p.getExitValue());
+
+ createWizard();
+
+ // set the output path, should trigger modify listener
+ File[] selectedFiles = page.getSelectedFiles();
+ // uncheck first file
+ File unselectedFile = selectedFiles[0];
+ page.getViewer().setChecked(unselectedFile, false);
+ selectedFiles = page.getSelectedFiles();
+
+ IPath pathToFiles = proj.getProject().getLocation();
+ page.getDestText().setText(pathToFiles.toOSString());
+
+ assertTrue(page.isPageComplete());
+ assertTrue(wizard.canFinish());
+
+ assertTrue(wizard.performFinish());
+
+ // check only selected file was copied
+ for (File log : selectedFiles) {
+ File copy = new File(pathToFiles.toFile(), log.getName());
+ assertTrue(copy.exists());
+ }
+ File copy = new File(pathToFiles.toFile(), unselectedFile.getName());
+ assertFalse(copy.exists());
+ }
+
+ public void testExportNone() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ ILaunch launch = doLaunch(config, "testExport"); //$NON-NLS-1$
+
+ IProcess p = launch.getProcesses()[0];
+ assertEquals(0, p.getExitValue());
+
+ createWizard();
+
+ // set the output path, should trigger modify listener
+ File[] selectedFiles = page.getSelectedFiles();
+ page.getViewer().setCheckedElements(new Object[0]);
+ assertEquals(0, page.getSelectedFiles().length);
+
+ IPath pathToFiles = proj.getProject().getLocation();
+ page.getDestText().setText(pathToFiles.toOSString());
+
+ assertTrue(page.isPageComplete());
+ assertTrue(wizard.canFinish());
+
+ assertTrue(wizard.performFinish());
+
+ // check files were not copied
+ for (File log : selectedFiles) {
+ File copy = new File(pathToFiles.toFile(), log.getName());
+ assertFalse(copy.exists());
+ }
+ }
+
+ protected void createWizard() {
+ wizard = new ValgrindExportWizard();
+ wizard.init(PlatformUI.getWorkbench(), null);
+
+ dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);
+ dialog.setBlockOnOpen(false);
+ dialog.open();
+
+ assertFalse(wizard.canFinish());
+
+ page = (ValgrindExportWizardPage) wizard.getPages()[0];
+ assertFalse(page.isPageComplete());
+ }
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/MassifTestsPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/MassifTestsPlugin.java
new file mode 100644
index 0000000000..c917c7d811
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/MassifTestsPlugin.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.massif.tests;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class MassifTestsPlugin extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.eclipse.linuxtools.valgrind.massif.tests"; //$NON-NLS-1$
+
+ // The shared instance
+ private static MassifTestsPlugin plugin;
+
+ /**
+ * The constructor
+ */
+ public MassifTestsPlugin() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static MassifTestsPlugin getDefault() {
+ return plugin;
+ }
+
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/MultiProcessTest.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/MultiProcessTest.java
new file mode 100644
index 0000000000..6df7e40c47
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/MultiProcessTest.java
@@ -0,0 +1,137 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.massif.tests;
+
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.linuxtools.internal.valgrind.core.LaunchConfigurationConstants;
+import org.eclipse.linuxtools.internal.valgrind.massif.MassifOutput;
+import org.eclipse.linuxtools.internal.valgrind.massif.MassifPidMenuAction;
+import org.eclipse.linuxtools.internal.valgrind.massif.MassifSnapshot;
+import org.eclipse.linuxtools.internal.valgrind.massif.MassifViewPart;
+import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindUIPlugin;
+import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindViewPart;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Shell;
+
+public class MultiProcessTest extends AbstractMassifTest {
+ ICProject refProj;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ refProj = createProjectAndBuild("alloctest"); //$NON-NLS-1$
+ proj = createProjectAndBuild("multiProcTest"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ deleteProject(proj);
+ deleteProject(refProj);
+ super.tearDown();
+ }
+
+ public void testNoExec() throws Exception {
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ doLaunch(config, "testNoExec"); //$NON-NLS-1$
+
+ MassifViewPart view = (MassifViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ MassifOutput output = view.getOutput();
+ assertEquals(1, output.getPids().length);
+ assertEquals(8, view.getSnapshots().length);
+ }
+
+ public void testExec() throws Exception {
+ ILaunchConfigurationWorkingCopy config = createConfiguration(proj.getProject()).getWorkingCopy();
+ config.setAttribute(LaunchConfigurationConstants.ATTR_GENERAL_TRACECHILD, true);
+ config.doSave();
+ doLaunch(config, "testExec"); //$NON-NLS-1$
+
+ MassifViewPart view = (MassifViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
+ MassifOutput output = view.getOutput();
+
+ Integer[] pids = output.getPids();
+ assertEquals(2, pids.length);
+
+ // child not necessarily higher PID than parent
+ MassifSnapshot[] snapshots1 = output.getSnapshots(pids[0]);
+ assertTrue(snapshots1.length == 8 || snapshots1.length == 14);
+ MassifSnapshot[] snapshots2 = output.getSnapshots(pids[1]);
+ assertTrue(snapshots2.length == 8 || snapshots2.length == 14);
+ assertTrue(snapshots1.length != snapshots2.length);
+ }
+
+ public void testExecPidMenu() throws Exception {
+ ILaunchConfigurationWorkingCopy config = createConfiguration(proj.getProject()).getWorkingCopy();
+ config.setAttribute(LaunchConfigurationConstants.ATTR_GENERAL_TRACECHILD, true);
+ config.doSave();
+ doLaunch(config, "testExec"); //$NON-NLS-1$
+
+ ValgrindViewPart view = ValgrindUIPlugin.getDefault().getView();
+ MassifViewPart dynamicView = (MassifViewPart) view.getDynamicView();
+ MassifOutput output = dynamicView.getOutput();
+
+ MassifPidMenuAction menuAction = null;
+ IToolBarManager manager = view.getViewSite().getActionBars().getToolBarManager();
+ for (IContributionItem item : manager.getItems()) {
+ if (item instanceof ActionContributionItem
+ && ((ActionContributionItem) item).getAction() instanceof MassifPidMenuAction) {
+ menuAction = (MassifPidMenuAction) ((ActionContributionItem) item).getAction();
+ }
+ }
+
+ assertNotNull(menuAction);
+
+ Integer[] pids = dynamicView.getOutput().getPids();
+ Shell shell = new Shell(Display.getCurrent());
+ Menu pidMenu = menuAction.getMenu(shell);
+
+ assertEquals(2, pidMenu.getItemCount());
+ ActionContributionItem firstPid = (ActionContributionItem) pidMenu.getItem(0).getData();
+ ActionContributionItem secondPid = (ActionContributionItem) pidMenu.getItem(1).getData();
+
+ // check initial state
+ assertTrue(firstPid.getAction().isChecked());
+ assertFalse(secondPid.getAction().isChecked());
+ assertEquals(output.getSnapshots(pids[0]), dynamicView.getSnapshots());
+
+ // select second pid
+ selectItem(pidMenu, 1);
+
+ assertFalse(firstPid.getAction().isChecked());
+ assertTrue(secondPid.getAction().isChecked());
+ assertEquals(output.getSnapshots(pids[1]), dynamicView.getSnapshots());
+
+ // select second pid again
+ selectItem(pidMenu, 1);
+
+ assertFalse(firstPid.getAction().isChecked());
+ assertTrue(secondPid.getAction().isChecked());
+ assertEquals(output.getSnapshots(pids[1]), dynamicView.getSnapshots());
+
+ // select first pid
+ selectItem(pidMenu, 0);
+
+ assertTrue(firstPid.getAction().isChecked());
+ assertFalse(secondPid.getAction().isChecked());
+ assertEquals(output.getSnapshots(pids[0]), dynamicView.getSnapshots());
+ }
+
+ protected void selectItem(Menu pidMenu, int index) {
+ pidMenu.getItem(index).notifyListeners(SWT.Selection, null);
+ }
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/SortTest.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/SortTest.java
new file mode 100644
index 0000000000..2969aa4cf2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/SortTest.java
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Elliott Baron <ebaron@redhat.com> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.valgrind.massif.tests;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.linuxtools.internal.valgrind.massif.MassifLaunchConstants;
+import org.eclipse.linuxtools.internal.valgrind.massif.MassifSnapshot;
+import org.eclipse.linuxtools.internal.valgrind.massif.MassifViewPart;
+import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindUIPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
+
+public class SortTest extends AbstractMassifTest {
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ proj = createProjectAndBuild("alloctest"); //$NON-NLS-1$
+
+ ILaunchConfiguration config = createConfiguration(proj.getProject());
+ ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
+ wc.setAttribute(MassifLaunchConstants.ATTR_MASSIF_STACKS, true);
+ wc.doSave();
+ doLaunch(config, "testStacks"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ deleteProject(proj);
+ super.tearDown();
+ }
+
+ public void testSortSnapshots() throws Exception {
+ checkSortColumn(0);
+ }
+
+ public void testSortTime() throws Exception {
+ checkSortColumn(1);
+ }
+
+ public void testSortTotal() throws Exception {
+ checkSortColumn(2);
+ }
+
+ public void testSortUseful() throws Exception {
+ checkSortColumn(3);
+ }
+
+ public void testSortExtra() throws Exception {
+ checkSortColumn(4);
+ }
+
+ public void testSortStacks() throws Exception {
+ checkSortColumn(5);
+ }
+
+ private void checkSortColumn(int column) throws CoreException, Exception {
+ MassifViewPart view = (MassifViewPart) ValgrindUIPlugin.getDefault()
+ .getView().getDynamicView();
+ TableViewer viewer = view.getTableViewer();
+ TableColumn control = viewer.getTable().getColumn(column);
+
+ // Test ascending
+ control.notifyListeners(SWT.Selection, null);
+ assertEquals(SWT.UP, viewer.getTable().getSortDirection());
+ assertEquals(control, viewer.getTable().getSortColumn());
+ checkOrder(viewer, column, true);
+
+ // Test descending
+ control.notifyListeners(SWT.Selection, null);
+ assertEquals(SWT.DOWN, viewer.getTable().getSortDirection());
+ assertEquals(control, viewer.getTable().getSortColumn());
+ checkOrder(viewer, column, false);
+ }
+
+ private void checkOrder(TableViewer viewer, int column, boolean ascending) {
+ TableItem[] items = viewer.getTable().getItems();
+ for (int i = 0; i < items.length - 1; i++) {
+ MassifSnapshot first = (MassifSnapshot) items[i].getData();
+ MassifSnapshot second = (MassifSnapshot) items[i + 1].getData();
+
+ switch (column) {
+ case 0:
+ assertTrue(ascending ? first.getNumber() <= second.getNumber() : first.getNumber() >= second.getNumber());
+ break;
+ case 1:
+ assertTrue(ascending ? first.getTime() <= second.getTime() : first.getTime() >= second.getTime());
+ break;
+ case 2:
+ assertTrue(ascending ? first.getTotal() <= second.getTotal() : first.getTotal() >= second.getTotal());
+ break;
+ case 3:
+ assertTrue(ascending ? first.getHeapBytes() <= second.getHeapBytes() : first.getHeapBytes() >= second.getHeapBytes());
+ break;
+ case 4:
+ assertTrue(ascending ? first.getHeapExtra() <= second.getHeapExtra() : first.getHeapExtra() >= second.getHeapExtra());
+ break;
+ case 5:
+ assertTrue(ascending ? first.getStacks() <= second.getStacks() : first.getStacks() >= second.getStacks());
+ break;
+ default:
+ fail();
+ }
+ }
+ }
+}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/test.xml b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/test.xml
new file mode 100644
index 0000000000..f43672afe3
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/test.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+
+<project name="testsuite" default="run" basedir=".">
+ <property name="massif_classname" value="org.eclipse.linuxtools.internal.valgrind.massif.tests.AllTests" />
+ <property name="massif-plugin-name" value="org.eclipse.linuxtools.valgrind.massif.tests" />
+
+ <property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />
+
+ <!-- The property ${eclipse-home} should be passed into this script -->
+ <!-- Set a meaningful default value for when it is not. -->
+ <property name="eclipse-home" value="${basedir}/../.." />
+
+ <!-- This target holds all initialization code that needs to be done for -->
+ <!-- all tests that are to be run. Initialization for individual tests -->
+ <!-- should be done within the body of the suite target. -->
+ <target name="init">
+ <tstamp />
+ <delete>
+ <fileset dir="${eclipse-home}" includes="org*.xml" />
+ </delete>
+ </target>
+
+ <!-- This target defines the tests that need to be run. -->
+ <target name="massif_suite">
+ <property name="massif-folder" value="${eclipse-home}/massif_folder" />
+ <delete dir="${massif-folder}" quiet="true" />
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${massif-folder}" />
+ <property name="plugin-name" value="${massif-plugin-name}" />
+ <property name="classname" value="${massif_classname}" />
+ </ant>
+ </target>
+
+ <!-- This target holds code to cleanup the testing environment after -->
+ <!-- after all of the tests have been run. You can use this target to -->
+ <!-- delete temporary files that have been created. -->
+ <target name="cleanup">
+ <mkdir dir="${results}/consolelogs" />
+ <copy failonerror="false" file="${eclipse-home}/results/${massif_classname}.txt" tofile="${results}/consolelogs/${massif_classname}_${platform}.metadata.log.txt" />
+ </target>
+
+ <!-- This target runs the test suite. Any actions that need to happen -->
+ <!-- after all the tests have been run should go here. -->
+ <target name="run" depends="init,massif_suite,cleanup">
+ <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="includes" value="org*.xml" />
+ <property name="output-file" value="${massif-plugin-name}.xml" />
+ </ant>
+ </target>
+
+ <target name="all" depends="run" description="Dummy target to run all tests">
+ </target>
+
+</project>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAlignment/massif_3500.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAlignment/massif_3500.txt
new file mode 100644
index 0000000000..adb1e7292a
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAlignment/massif_3500.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testAlignment/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100 --alignment=512
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=304
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=624
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=1056
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=1088
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=1232
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=1232
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=1136
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=928
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=608
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=176
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=144
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAlignment/template_massif_3500.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAlignment/template_massif_3500.txt
new file mode 100644
index 0000000000..10c097f6c9
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAlignment/template_massif_3500.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testAlignment/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100 --alignment=512
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=304
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=624
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=1056
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=1088
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=1232
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=1232
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=1136
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=928
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=608
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=176
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=144
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAlignment/template_valgrind_3500.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAlignment/template_valgrind_3500.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAlignment/template_valgrind_3500.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFn/massif_3140.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFn/massif_3140.txt
new file mode 100644
index 0000000000..8c8835f08f
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFn/massif_3140.txt
@@ -0,0 +1,122 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testAllocFn/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --alloc-fn=foo --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n6: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 40 0x400617: main (alloctest.c:35)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFn/template_massif_3140.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFn/template_massif_3140.txt
new file mode 100644
index 0000000000..a170506abb
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFn/template_massif_3140.txt
@@ -0,0 +1,122 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testAllocFn/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --alloc-fn=foo --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n6: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 40 0x400617: main (alloctest.c:35)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFn/template_valgrind_3140.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFn/template_valgrind_3140.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFn/template_valgrind_3140.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnMultiple/massif_3180.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnMultiple/massif_3180.txt
new file mode 100644
index 0000000000..6f08eb0093
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnMultiple/massif_3180.txt
@@ -0,0 +1,122 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testAllocFnMultiple/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --alloc-fn=foo --alloc-fn=bar --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n6: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 40 0x400617: main (alloctest.c:35)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnMultiple/template_massif_3180.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnMultiple/template_massif_3180.txt
new file mode 100644
index 0000000000..6c48e9a3c7
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnMultiple/template_massif_3180.txt
@@ -0,0 +1,122 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testAllocFnMultiple/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --alloc-fn=foo --alloc-fn=bar --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n6: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 40 0x400617: main (alloctest.c:35)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnMultiple/template_valgrind_3180.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnMultiple/template_valgrind_3180.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnMultiple/template_valgrind_3180.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnSpace/massif_3220.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnSpace/massif_3220.txt
new file mode 100644
index 0000000000..7ca885b360
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnSpace/massif_3220.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testAllocFnSpace/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --alloc-fn=operator new(unsigned) --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnSpace/template_massif_3220.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnSpace/template_massif_3220.txt
new file mode 100644
index 0000000000..a6d64e50af
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnSpace/template_massif_3220.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testAllocFnSpace/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --alloc-fn=operator new(unsigned) --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnSpace/template_valgrind_3220.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnSpace/template_valgrind_3220.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testAllocFnSpace/template_valgrind_3220.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingGiB/massif_2637.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingGiB/massif_2637.txt
new file mode 100644
index 0000000000..f5c0d73606
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingGiB/massif_2637.txt
@@ -0,0 +1,863 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testByteScalingGiB/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=B --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest 10485760 1024
+time_unit: B
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=62914608
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=peak
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=2
+#-----------
+time=2747271216
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=4089449520
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=4
+#-----------
+time=5431627824
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=6773806128
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=8367642864
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=9709821168
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=8
+#-----------
+time=11051999472
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=12394177776
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=13736356080
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=15078534384
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=16420712688
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=13
+#-----------
+time=17762890992
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=14
+#-----------
+time=19105069296
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=15
+#-----------
+time=20447247600
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=16
+#-----------
+time=21789425904
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=17
+#-----------
+time=23131604208
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=18
+#-----------
+time=24473782512
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=19
+#-----------
+time=25815960816
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=20
+#-----------
+time=27158139120
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=21
+#-----------
+time=28500317424
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=22
+#-----------
+time=29842495728
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=23
+#-----------
+time=31184674032
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=24
+#-----------
+time=33533486064
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=25
+#-----------
+time=34875664368
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=26
+#-----------
+time=36217842672
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=27
+#-----------
+time=37560020976
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=28
+#-----------
+time=38902199280
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=29
+#-----------
+time=40244377584
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=30
+#-----------
+time=41586555888
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=31
+#-----------
+time=42928734192
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=32
+#-----------
+time=44270912496
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=33
+#-----------
+time=45613090800
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=34
+#-----------
+time=46955269104
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=35
+#-----------
+time=48297447408
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=36
+#-----------
+time=49639625712
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=37
+#-----------
+time=50981804016
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=38
+#-----------
+time=52323982320
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=39
+#-----------
+time=53666160624
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=40
+#-----------
+time=55008338928
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=41
+#-----------
+time=56350517232
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=42
+#-----------
+time=57692695536
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=43
+#-----------
+time=59034873840
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=44
+#-----------
+time=60377052144
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=45
+#-----------
+time=61719230448
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=46
+#-----------
+time=63061408752
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=47
+#-----------
+time=64403587056
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=48
+#-----------
+time=65745765360
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=49
+#-----------
+time=67087943664
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=50
+#-----------
+time=68430121968
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=51
+#-----------
+time=69772300272
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=52
+#-----------
+time=71114478576
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=53
+#-----------
+time=72456656880
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=54
+#-----------
+time=73798835184
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=55
+#-----------
+time=75141013488
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=56
+#-----------
+time=76483191792
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=57
+#-----------
+time=77825370096
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=58
+#-----------
+time=79167548400
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=59
+#-----------
+time=80509726704
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=60
+#-----------
+time=81851905008
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=61
+#-----------
+time=83194083312
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=62
+#-----------
+time=84536261616
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=63
+#-----------
+time=85878439920
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=64
+#-----------
+time=87220618224
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=65
+#-----------
+time=88562796528
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=66
+#-----------
+time=89904974832
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=67
+#-----------
+time=91247153136
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=68
+#-----------
+time=92589331440
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=69
+#-----------
+time=93931509744
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=70
+#-----------
+time=95273688048
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=71
+#-----------
+time=96615866352
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=72
+#-----------
+time=97958044656
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=73
+#-----------
+time=99300222960
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=74
+#-----------
+time=100642401264
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=75
+#-----------
+time=101984579568
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=76
+#-----------
+time=103326757872
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=77
+#-----------
+time=104668936176
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=78
+#-----------
+time=106011114480
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=79
+#-----------
+time=107353292784
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=80
+#-----------
+time=108695471088
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=81
+#-----------
+time=110037649392
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=82
+#-----------
+time=111379827696
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=83
+#-----------
+time=112722006000
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=84
+#-----------
+time=114064184304
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=85
+#-----------
+time=115406362608
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=86
+#-----------
+time=116748540912
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=87
+#-----------
+time=118090719216
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=88
+#-----------
+time=119432897520
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=89
+#-----------
+time=120775075824
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=90
+#-----------
+time=122117254128
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=91
+#-----------
+time=123459432432
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=92
+#-----------
+time=124801610736
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=93
+#-----------
+time=126143789040
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=94
+#-----------
+time=127485967344
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=95
+#-----------
+time=128828145648
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingGiB/template_massif_2637.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingGiB/template_massif_2637.txt
new file mode 100644
index 0000000000..dd30326a1d
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingGiB/template_massif_2637.txt
@@ -0,0 +1,863 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testByteScalingGiB/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=B --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest 10485760 1024
+time_unit: B
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=62914608
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=peak
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=2
+#-----------
+time=2747271216
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=4089449520
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=4
+#-----------
+time=5431627824
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=6773806128
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=8367642864
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=9709821168
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=8
+#-----------
+time=11051999472
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=12394177776
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=13736356080
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=15078534384
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=16420712688
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=13
+#-----------
+time=17762890992
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=14
+#-----------
+time=19105069296
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=15
+#-----------
+time=20447247600
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=16
+#-----------
+time=21789425904
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=17
+#-----------
+time=23131604208
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=18
+#-----------
+time=24473782512
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=19
+#-----------
+time=25815960816
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=20
+#-----------
+time=27158139120
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=21
+#-----------
+time=28500317424
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=22
+#-----------
+time=29842495728
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=23
+#-----------
+time=31184674032
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=24
+#-----------
+time=33533486064
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=25
+#-----------
+time=34875664368
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=26
+#-----------
+time=36217842672
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=27
+#-----------
+time=37560020976
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=28
+#-----------
+time=38902199280
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=29
+#-----------
+time=40244377584
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=30
+#-----------
+time=41586555888
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=31
+#-----------
+time=42928734192
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=32
+#-----------
+time=44270912496
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=33
+#-----------
+time=45613090800
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=34
+#-----------
+time=46955269104
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=35
+#-----------
+time=48297447408
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=36
+#-----------
+time=49639625712
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=37
+#-----------
+time=50981804016
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=38
+#-----------
+time=52323982320
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=39
+#-----------
+time=53666160624
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=40
+#-----------
+time=55008338928
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=41
+#-----------
+time=56350517232
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=42
+#-----------
+time=57692695536
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=43
+#-----------
+time=59034873840
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=44
+#-----------
+time=60377052144
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=45
+#-----------
+time=61719230448
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=46
+#-----------
+time=63061408752
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=47
+#-----------
+time=64403587056
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=48
+#-----------
+time=65745765360
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=49
+#-----------
+time=67087943664
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=50
+#-----------
+time=68430121968
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=51
+#-----------
+time=69772300272
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=52
+#-----------
+time=71114478576
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=53
+#-----------
+time=72456656880
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=54
+#-----------
+time=73798835184
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=55
+#-----------
+time=75141013488
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=56
+#-----------
+time=76483191792
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=57
+#-----------
+time=77825370096
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=58
+#-----------
+time=79167548400
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=59
+#-----------
+time=80509726704
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=60
+#-----------
+time=81851905008
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=61
+#-----------
+time=83194083312
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=62
+#-----------
+time=84536261616
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=63
+#-----------
+time=85878439920
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=64
+#-----------
+time=87220618224
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=65
+#-----------
+time=88562796528
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=66
+#-----------
+time=89904974832
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=67
+#-----------
+time=91247153136
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=68
+#-----------
+time=92589331440
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=69
+#-----------
+time=93931509744
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=70
+#-----------
+time=95273688048
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=71
+#-----------
+time=96615866352
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=72
+#-----------
+time=97958044656
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=73
+#-----------
+time=99300222960
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=74
+#-----------
+time=100642401264
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=75
+#-----------
+time=101984579568
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=76
+#-----------
+time=103326757872
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=77
+#-----------
+time=104668936176
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=78
+#-----------
+time=106011114480
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=79
+#-----------
+time=107353292784
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=80
+#-----------
+time=108695471088
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=81
+#-----------
+time=110037649392
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=82
+#-----------
+time=111379827696
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=83
+#-----------
+time=112722006000
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=84
+#-----------
+time=114064184304
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=85
+#-----------
+time=115406362608
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=86
+#-----------
+time=116748540912
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=87
+#-----------
+time=118090719216
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=88
+#-----------
+time=119432897520
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=89
+#-----------
+time=120775075824
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=90
+#-----------
+time=122117254128
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=91
+#-----------
+time=123459432432
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=92
+#-----------
+time=124801610736
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=93
+#-----------
+time=126143789040
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=94
+#-----------
+time=127485967344
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=95
+#-----------
+time=128828145648
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingGiB/template_valgrind_2637.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingGiB/template_valgrind_2637.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingGiB/template_valgrind_2637.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingKiB/massif_2556.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingKiB/massif_2556.txt
new file mode 100644
index 0000000000..5b40bc5345
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingKiB/massif_2556.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testByteScalingKiB/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=B --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest 10240 1
+time_unit: B
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=10248
+mem_heap_B=10240
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=20496
+mem_heap_B=20480
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=30744
+mem_heap_B=30720
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=40992
+mem_heap_B=40960
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=51240
+mem_heap_B=51200
+mem_heap_extra_B=40
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=61488
+mem_heap_B=61440
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=61488
+mem_heap_B=61440
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=peak
+n4: 61440 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 30720 0x40069A: foo (alloctest.c:48)
+ n0: 10240 0x4005DB: main (alloctest.c:31)
+ n0: 10240 0x4005F9: main (alloctest.c:33)
+ n0: 10240 0x400617: main (alloctest.c:35)
+ n0: 10240 0x4005CD: main (alloctest.c:30)
+ n0: 10240 0x4005EB: main (alloctest.c:32)
+ n0: 10240 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=71736
+mem_heap_B=51200
+mem_heap_extra_B=40
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=81984
+mem_heap_B=40960
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=92232
+mem_heap_B=30720
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=102480
+mem_heap_B=20480
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112728
+mem_heap_B=10240
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=122976
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingKiB/template_massif_2556.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingKiB/template_massif_2556.txt
new file mode 100644
index 0000000000..70b1852792
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingKiB/template_massif_2556.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testByteScalingKiB/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=B --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest 10240 1
+time_unit: B
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=10248
+mem_heap_B=10240
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=20496
+mem_heap_B=20480
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=30744
+mem_heap_B=30720
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=40992
+mem_heap_B=40960
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=51240
+mem_heap_B=51200
+mem_heap_extra_B=40
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=61488
+mem_heap_B=61440
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=61488
+mem_heap_B=61440
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=peak
+n4: 61440 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 30720 0x40069A: foo (alloctest.c:48)
+ n0: 10240 0x4005DB: main (alloctest.c:31)
+ n0: 10240 0x4005F9: main (alloctest.c:33)
+ n0: 10240 0x400617: main (alloctest.c:35)
+ n0: 10240 0x4005CD: main (alloctest.c:30)
+ n0: 10240 0x4005EB: main (alloctest.c:32)
+ n0: 10240 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=71736
+mem_heap_B=51200
+mem_heap_extra_B=40
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=81984
+mem_heap_B=40960
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=92232
+mem_heap_B=30720
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=102480
+mem_heap_B=20480
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112728
+mem_heap_B=10240
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=122976
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingKiB/template_valgrind_2556.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingKiB/template_valgrind_2556.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingKiB/template_valgrind_2556.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingMiB/massif_2596.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingMiB/massif_2596.txt
new file mode 100644
index 0000000000..8d79c3babb
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingMiB/massif_2596.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testByteScalingMiB/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=B --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest 10485760 1
+time_unit: B
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=10485768
+mem_heap_B=10485760
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=20971536
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=31457304
+mem_heap_B=31457280
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=41943072
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=52428840
+mem_heap_B=52428800
+mem_heap_extra_B=40
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=62914608
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=62914608
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=peak
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=73400376
+mem_heap_B=52428800
+mem_heap_extra_B=40
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=83886144
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=94371912
+mem_heap_B=31457280
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=104857680
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=115343448
+mem_heap_B=10485760
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=125829216
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingMiB/template_massif_2596.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingMiB/template_massif_2596.txt
new file mode 100644
index 0000000000..61494171f4
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingMiB/template_massif_2596.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testByteScalingMiB/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=B --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest 10485760 1
+time_unit: B
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=10485768
+mem_heap_B=10485760
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=20971536
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=31457304
+mem_heap_B=31457280
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=41943072
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=52428840
+mem_heap_B=52428800
+mem_heap_extra_B=40
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=62914608
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=62914608
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=peak
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=73400376
+mem_heap_B=52428800
+mem_heap_extra_B=40
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=83886144
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=94371912
+mem_heap_B=31457280
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=104857680
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=115343448
+mem_heap_B=10485760
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=125829216
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingMiB/template_valgrind_2596.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingMiB/template_valgrind_2596.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingMiB/template_valgrind_2596.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingTiB/massif_2680.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingTiB/massif_2680.txt
new file mode 100644
index 0000000000..68cf62f590
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingTiB/massif_2680.txt
@@ -0,0 +1,759 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testByteScalingTiB/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=B --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest 10485760 1048576
+time_unit: B
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=62914608
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=peak
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=2
+#-----------
+time=1957147625664
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=4990680308064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=6883885720464
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=10667675103264
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=13239309705264
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=16747847678064
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=8
+#-----------
+time=18768979460064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=20950019204064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=23378523072864
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=26283080808864
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=29523183120864
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=33025429632864
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=14
+#-----------
+time=34932790832064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=15
+#-----------
+time=38075375501664
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=16
+#-----------
+time=40212375020064
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=17
+#-----------
+time=42435357836064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=18
+#-----------
+time=45100315773264
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=19
+#-----------
+time=47945628920064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=20
+#-----------
+time=50864866731264
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=21
+#-----------
+time=54010072842864
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=22
+#-----------
+time=57337731317664
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=23
+#-----------
+time=60869337980064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=24
+#-----------
+time=62731610376864
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=25
+#-----------
+time=66407396349264
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=26
+#-----------
+time=68350933448064
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=27
+#-----------
+time=70331695023264
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=28
+#-----------
+time=72316126617264
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=29
+#-----------
+time=74300558211264
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=30
+#-----------
+time=76284989805264
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=31
+#-----------
+time=78468126702864
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=32
+#-----------
+time=80651263600464
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=33
+#-----------
+time=83036251532064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=34
+#-----------
+time=85563321620064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=35
+#-----------
+time=88185812196864
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=36
+#-----------
+time=90999143751264
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=37
+#-----------
+time=93860185550064
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=38
+#-----------
+time=96768937593264
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=39
+#-----------
+time=99773110125264
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=40
+#-----------
+time=102872703146064
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=41
+#-----------
+time=105892080041664
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=42
+#-----------
+time=108960740046864
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=43
+#-----------
+time=112221813894864
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=44
+#-----------
+time=115675301585664
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=45
+#-----------
+time=119128789276464
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=46
+#-----------
+time=122582276967264
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=47
+#-----------
+time=126228178500864
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=48
+#-----------
+time=129874080034464
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=49
+#-----------
+time=131837540092464
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=50
+#-----------
+time=131840098619856
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=51
+#-----------
+time=131842657147248
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=52
+#-----------
+time=131845215674640
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=53
+#-----------
+time=131847774202032
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=54
+#-----------
+time=131850332729424
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=55
+#-----------
+time=131852891256816
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=56
+#-----------
+time=131855449784208
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=57
+#-----------
+time=131858008311600
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=58
+#-----------
+time=131860566838992
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=59
+#-----------
+time=131863125366384
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=60
+#-----------
+time=131865683893776
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=61
+#-----------
+time=131868242421168
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=62
+#-----------
+time=131870800948560
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=63
+#-----------
+time=131873359475952
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=64
+#-----------
+time=131875918003344
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=65
+#-----------
+time=131878476530736
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=66
+#-----------
+time=131881035058128
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=67
+#-----------
+time=131883593585520
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=68
+#-----------
+time=131886152112912
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=69
+#-----------
+time=131888710640304
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=70
+#-----------
+time=131891269167696
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=71
+#-----------
+time=131893827695088
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=72
+#-----------
+time=131896386222480
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=73
+#-----------
+time=131898944749872
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=74
+#-----------
+time=131901503277264
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=75
+#-----------
+time=131904061804656
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=76
+#-----------
+time=131906620332048
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=77
+#-----------
+time=131909178859440
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=78
+#-----------
+time=131911737386832
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=79
+#-----------
+time=131914295914224
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=80
+#-----------
+time=131916854441616
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=81
+#-----------
+time=131919412969008
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=82
+#-----------
+time=131921971496400
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=83
+#-----------
+time=131924530023792
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=84
+#-----------
+time=131927088551184
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=85
+#-----------
+time=131929647078576
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=86
+#-----------
+time=131932205605968
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=87
+#-----------
+time=131934764133360
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=88
+#-----------
+time=131937322660752
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=89
+#-----------
+time=131939881188144
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingTiB/template_massif_2680.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingTiB/template_massif_2680.txt
new file mode 100644
index 0000000000..99a59855b3
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingTiB/template_massif_2680.txt
@@ -0,0 +1,759 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testByteScalingTiB/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=B --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest 10485760 1048576
+time_unit: B
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=62914608
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=peak
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=2
+#-----------
+time=1957147625664
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=4990680308064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=6883885720464
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=10667675103264
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=13239309705264
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=16747847678064
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=8
+#-----------
+time=18768979460064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=20950019204064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=23378523072864
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=26283080808864
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=29523183120864
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=33025429632864
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=14
+#-----------
+time=34932790832064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=15
+#-----------
+time=38075375501664
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=16
+#-----------
+time=40212375020064
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=17
+#-----------
+time=42435357836064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=18
+#-----------
+time=45100315773264
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=19
+#-----------
+time=47945628920064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=20
+#-----------
+time=50864866731264
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=21
+#-----------
+time=54010072842864
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=22
+#-----------
+time=57337731317664
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=23
+#-----------
+time=60869337980064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=24
+#-----------
+time=62731610376864
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=25
+#-----------
+time=66407396349264
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=26
+#-----------
+time=68350933448064
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=27
+#-----------
+time=70331695023264
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=28
+#-----------
+time=72316126617264
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=29
+#-----------
+time=74300558211264
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=30
+#-----------
+time=76284989805264
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=31
+#-----------
+time=78468126702864
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=32
+#-----------
+time=80651263600464
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=33
+#-----------
+time=83036251532064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=34
+#-----------
+time=85563321620064
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=35
+#-----------
+time=88185812196864
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=36
+#-----------
+time=90999143751264
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=37
+#-----------
+time=93860185550064
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=38
+#-----------
+time=96768937593264
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=39
+#-----------
+time=99773110125264
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=40
+#-----------
+time=102872703146064
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=41
+#-----------
+time=105892080041664
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=42
+#-----------
+time=108960740046864
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=43
+#-----------
+time=112221813894864
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=44
+#-----------
+time=115675301585664
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=45
+#-----------
+time=119128789276464
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=46
+#-----------
+time=122582276967264
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=47
+#-----------
+time=126228178500864
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=48
+#-----------
+time=129874080034464
+mem_heap_B=41943040
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=49
+#-----------
+time=131837540092464
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=50
+#-----------
+time=131840098619856
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=51
+#-----------
+time=131842657147248
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=52
+#-----------
+time=131845215674640
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=53
+#-----------
+time=131847774202032
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=54
+#-----------
+time=131850332729424
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=55
+#-----------
+time=131852891256816
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=56
+#-----------
+time=131855449784208
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=57
+#-----------
+time=131858008311600
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=58
+#-----------
+time=131860566838992
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=59
+#-----------
+time=131863125366384
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=60
+#-----------
+time=131865683893776
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=61
+#-----------
+time=131868242421168
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=62
+#-----------
+time=131870800948560
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=63
+#-----------
+time=131873359475952
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=64
+#-----------
+time=131875918003344
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=65
+#-----------
+time=131878476530736
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=66
+#-----------
+time=131881035058128
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=67
+#-----------
+time=131883593585520
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=68
+#-----------
+time=131886152112912
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=69
+#-----------
+time=131888710640304
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=70
+#-----------
+time=131891269167696
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=71
+#-----------
+time=131893827695088
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=72
+#-----------
+time=131896386222480
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=73
+#-----------
+time=131898944749872
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=74
+#-----------
+time=131901503277264
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=75
+#-----------
+time=131904061804656
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=76
+#-----------
+time=131906620332048
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=77
+#-----------
+time=131909178859440
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n3: 20971520 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n2: 10485760 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=78
+#-----------
+time=131911737386832
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=79
+#-----------
+time=131914295914224
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=80
+#-----------
+time=131916854441616
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=81
+#-----------
+time=131919412969008
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=82
+#-----------
+time=131921971496400
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=83
+#-----------
+time=131924530023792
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=84
+#-----------
+time=131927088551184
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=85
+#-----------
+time=131929647078576
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=86
+#-----------
+time=131932205605968
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=87
+#-----------
+time=131934764133360
+mem_heap_B=62914560
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n4: 62914560 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 31457280 0x40069A: foo (alloctest.c:48)
+ n0: 10485760 0x4005DB: main (alloctest.c:31)
+ n0: 10485760 0x4005F9: main (alloctest.c:33)
+ n0: 10485760 0x400617: main (alloctest.c:35)
+ n0: 10485760 0x4005CD: main (alloctest.c:30)
+ n0: 10485760 0x4005EB: main (alloctest.c:32)
+ n0: 10485760 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=88
+#-----------
+time=131937322660752
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=89
+#-----------
+time=131939881188144
+mem_heap_B=20971520
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingTiB/template_valgrind_2680.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingTiB/template_valgrind_2680.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testByteScalingTiB/template_valgrind_2680.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testChartCallback/massif_2779.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testChartCallback/massif_2779.txt
new file mode 100644
index 0000000000..305c053f87
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testChartCallback/massif_2779.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testChartCallback/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testChartCallback/template_massif_2779.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testChartCallback/template_massif_2779.txt
new file mode 100644
index 0000000000..3745aa3db8
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testChartCallback/template_massif_2779.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testChartCallback/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testChartCallback/template_valgrind_2779.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testChartCallback/template_valgrind_2779.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testChartCallback/template_valgrind_2779.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDefaults/massif_4357.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDefaults/massif_4357.txt
new file mode 100644
index 0000000000..281d4ebd48
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDefaults/massif_4357.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testDefaults/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDefaults/template_massif_4357.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDefaults/template_massif_4357.txt
new file mode 100644
index 0000000000..41fa0f28e0
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDefaults/template_massif_4357.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testDefaults/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDefaults/template_valgrind_4357.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDefaults/template_valgrind_4357.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDefaults/template_valgrind_4357.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDepth/massif_3100.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDepth/massif_3100.txt
new file mode 100644
index 0000000000..237dc23e8b
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDepth/massif_3100.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testDepth/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=50 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDepth/template_massif_3100.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDepth/template_massif_3100.txt
new file mode 100644
index 0000000000..670fd0a208
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDepth/template_massif_3100.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testDepth/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=50 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDepth/template_valgrind_3100.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDepth/template_valgrind_3100.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDepth/template_valgrind_3100.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDetailedFreq/massif_3420.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDetailedFreq/massif_3420.txt
new file mode 100644
index 0000000000..b3079e59a8
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDetailedFreq/massif_3420.txt
@@ -0,0 +1,195 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testDetailedFreq/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=1 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=detailed
+n0: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n1: 40 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=detailed
+n2: 80 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n1: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n3: 120 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n1: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=detailed
+n3: 160 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=detailed
+n4: 200 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=detailed
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=detailed
+n4: 200 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=detailed
+n4: 160 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n3: 120 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=detailed
+n3: 80 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n4: 40 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 0x4005DB: main (alloctest.c:31)
+ n0: 0 0x4005F9: main (alloctest.c:33)
+ n0: 0 0x4005CD: main (alloctest.c:30)
+ n0: 0 0x4005EB: main (alloctest.c:32)
+ n0: 0 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=detailed
+n1: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 0 in 4 places, all below massif's threshold (01.00%)
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDetailedFreq/template_massif_3420.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDetailedFreq/template_massif_3420.txt
new file mode 100644
index 0000000000..5bcdc95121
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDetailedFreq/template_massif_3420.txt
@@ -0,0 +1,195 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testDetailedFreq/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=1 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=detailed
+n0: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n1: 40 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=detailed
+n2: 80 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n1: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n3: 120 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n1: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=detailed
+n3: 160 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=detailed
+n4: 200 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=detailed
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=detailed
+n4: 200 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=detailed
+n4: 160 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n3: 120 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=detailed
+n3: 80 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n4: 40 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 0x4005DB: main (alloctest.c:31)
+ n0: 0 0x4005F9: main (alloctest.c:33)
+ n0: 0 0x4005CD: main (alloctest.c:30)
+ n0: 0 0x4005EB: main (alloctest.c:32)
+ n0: 0 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=detailed
+n1: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 0 in 4 places, all below massif's threshold (01.00%)
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDetailedFreq/template_valgrind_3420.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDetailedFreq/template_valgrind_3420.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDetailedFreq/template_valgrind_3420.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickFile/massif_2419.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickFile/massif_2419.txt
new file mode 100644
index 0000000000..1b23d34e21
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickFile/massif_2419.txt
@@ -0,0 +1,153 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testDoubleClickFile/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=2 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n1: 40 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n3: 120 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n1: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=detailed
+n4: 200 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=detailed
+n4: 160 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=detailed
+n3: 80 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=detailed
+n1: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 0 in 4 places, all below massif's threshold (01.00%)
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickFile/template_massif_2419.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickFile/template_massif_2419.txt
new file mode 100644
index 0000000000..7aeb095b27
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickFile/template_massif_2419.txt
@@ -0,0 +1,153 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testDoubleClickFile/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=2 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n1: 40 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n3: 120 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n1: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=detailed
+n4: 200 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=detailed
+n4: 160 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=detailed
+n3: 80 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=detailed
+n1: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 0 in 4 places, all below massif's threshold (01.00%)
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickFile/template_valgrind_2419.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickFile/template_valgrind_2419.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickFile/template_valgrind_2419.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickLine/massif_2469.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickLine/massif_2469.txt
new file mode 100644
index 0000000000..f8940c6a1f
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickLine/massif_2469.txt
@@ -0,0 +1,153 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testDoubleClickLine/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=2 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n1: 40 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n3: 120 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n1: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=detailed
+n4: 200 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=detailed
+n4: 160 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=detailed
+n3: 80 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=detailed
+n1: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 0 in 4 places, all below massif's threshold (01.00%)
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickLine/template_massif_2469.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickLine/template_massif_2469.txt
new file mode 100644
index 0000000000..5d6e28b33f
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickLine/template_massif_2469.txt
@@ -0,0 +1,153 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testDoubleClickLine/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=2 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n1: 40 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n3: 120 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n1: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=detailed
+n4: 200 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=detailed
+n4: 160 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=detailed
+n3: 80 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=detailed
+n1: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 0 in 4 places, all below massif's threshold (01.00%)
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickLine/template_valgrind_2469.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickLine/template_valgrind_2469.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testDoubleClickLine/template_valgrind_2469.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testEditorName/massif_2509.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testEditorName/massif_2509.txt
new file mode 100644
index 0000000000..6c649111df
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testEditorName/massif_2509.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testEditorName/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testEditorName/template_massif_2509.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testEditorName/template_massif_2509.txt
new file mode 100644
index 0000000000..3b25b42d42
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testEditorName/template_massif_2509.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testEditorName/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testEditorName/template_valgrind_2509.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testEditorName/template_valgrind_2509.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testEditorName/template_valgrind_2509.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/massif_3995.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/massif_3995.txt
new file mode 100644
index 0000000000..783fb16734
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/massif_3995.txt
@@ -0,0 +1,71 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testExec/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/multiProcTest/Debug/multiProcTest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=112155
+mem_heap_B=400
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=112187
+mem_heap_B=800
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=112219
+mem_heap_B=1200
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=113114
+mem_heap_B=1200
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=peak
+n3: 1200 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 400 0x4005FD: main (parent.c:8)
+ n0: 400 0x40060B: main (parent.c:9)
+ n0: 400 0x400619: main (parent.c:10)
+#-----------
+snapshot=5
+#-----------
+time=113114
+mem_heap_B=800
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=113145
+mem_heap_B=400
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=113176
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/massif_4000.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/massif_4000.txt
new file mode 100644
index 0000000000..bc5fdd028b
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/massif_4000.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testExec/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: ../alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111216
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111255
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111290
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111329
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111364
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111403
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112300
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112300
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112338
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112371
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112409
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112442
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112480
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_massif_3995.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_massif_3995.txt
new file mode 100644
index 0000000000..d3234de10f
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_massif_3995.txt
@@ -0,0 +1,71 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testExec/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/multiProcTest/Debug/multiProcTest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=112155
+mem_heap_B=400
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=112187
+mem_heap_B=800
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=112219
+mem_heap_B=1200
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=113114
+mem_heap_B=1200
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=peak
+n3: 1200 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 400 0x4005FD: main (parent.c:8)
+ n0: 400 0x40060B: main (parent.c:9)
+ n0: 400 0x400619: main (parent.c:10)
+#-----------
+snapshot=5
+#-----------
+time=113114
+mem_heap_B=800
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=113145
+mem_heap_B=400
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=113176
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_massif_4000.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_massif_4000.txt
new file mode 100644
index 0000000000..1b98b422a7
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_massif_4000.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testExec/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: ../alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111216
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111255
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111290
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111329
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111364
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111403
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112300
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112300
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112338
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112371
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112409
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112442
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112480
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_valgrind_3995.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_valgrind_3995.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_valgrind_3995.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_valgrind_4000.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_valgrind_4000.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExec/template_valgrind_4000.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExport/massif_3769.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExport/massif_3769.txt
new file mode 100644
index 0000000000..bd0582b66e
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExport/massif_3769.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testExport/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExport/template_massif_3769.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExport/template_massif_3769.txt
new file mode 100644
index 0000000000..81899d2807
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExport/template_massif_3769.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testExport/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExport/template_valgrind_3769.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExport/template_valgrind_3769.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testExport/template_valgrind_3769.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeap/massif_2980.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeap/massif_2980.txt
new file mode 100644
index 0000000000..1b030d4305
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeap/massif_2980.txt
@@ -0,0 +1,11 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testHeap/massif_%p.txt --heap=no --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeap/template_massif_2980.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeap/template_massif_2980.txt
new file mode 100644
index 0000000000..169e66ab26
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeap/template_massif_2980.txt
@@ -0,0 +1,11 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testHeap/massif_%p.txt --heap=no --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeap/template_valgrind_2980.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeap/template_valgrind_2980.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeap/template_valgrind_2980.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeapAdmin/massif_3020.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeapAdmin/massif_3020.txt
new file mode 100644
index 0000000000..cf9eccc266
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeapAdmin/massif_3020.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testHeapAdmin/massif_%p.txt --heap=yes --heap-admin=30 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=38
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=76
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=114
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=152
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=190
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=228
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=228
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=190
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=152
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=114
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=76
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=38
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeapAdmin/template_massif_3020.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeapAdmin/template_massif_3020.txt
new file mode 100644
index 0000000000..b2e83b4b1f
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeapAdmin/template_massif_3020.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testHeapAdmin/massif_%p.txt --heap=yes --heap-admin=30 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=38
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=76
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=114
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=152
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=190
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=228
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=228
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=190
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=152
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=114
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=76
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=38
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeapAdmin/template_valgrind_3020.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeapAdmin/template_valgrind_3020.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testHeapAdmin/template_valgrind_3020.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testMaxSpapshots/massif_3460.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testMaxSpapshots/massif_3460.txt
new file mode 100644
index 0000000000..d923a9e944
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testMaxSpapshots/massif_3460.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testMaxSpapshots/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=200
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testMaxSpapshots/template_massif_3460.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testMaxSpapshots/template_massif_3460.txt
new file mode 100644
index 0000000000..0c29853698
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testMaxSpapshots/template_massif_3460.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testMaxSpapshots/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=200
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testMaxSpapshots/template_valgrind_3460.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testMaxSpapshots/template_valgrind_3460.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testMaxSpapshots/template_valgrind_3460.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoDetailed/massif_2860.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoDetailed/massif_2860.txt
new file mode 100644
index 0000000000..50ef330cbc
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoDetailed/massif_2860.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testNoDetailed/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=12 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoDetailed/template_massif_2860.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoDetailed/template_massif_2860.txt
new file mode 100644
index 0000000000..803ddf2058
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoDetailed/template_massif_2860.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testNoDetailed/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=12 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoDetailed/template_valgrind_2860.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoDetailed/template_valgrind_2860.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoDetailed/template_valgrind_2860.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoExec/massif_3847.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoExec/massif_3847.txt
new file mode 100644
index 0000000000..9c070ebd2d
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoExec/massif_3847.txt
@@ -0,0 +1,71 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testNoExec/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/multiProcTest/Debug/multiProcTest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=112155
+mem_heap_B=400
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=112187
+mem_heap_B=800
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=112219
+mem_heap_B=1200
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=113114
+mem_heap_B=1200
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=peak
+n3: 1200 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 400 0x4005FD: main (parent.c:8)
+ n0: 400 0x40060B: main (parent.c:9)
+ n0: 400 0x400619: main (parent.c:10)
+#-----------
+snapshot=5
+#-----------
+time=113114
+mem_heap_B=800
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=113145
+mem_heap_B=400
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=113176
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoExec/template_massif_3847.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoExec/template_massif_3847.txt
new file mode 100644
index 0000000000..09d398cb80
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoExec/template_massif_3847.txt
@@ -0,0 +1,71 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testNoExec/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/multiProcTest/Debug/multiProcTest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=112155
+mem_heap_B=400
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=112187
+mem_heap_B=800
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=112219
+mem_heap_B=1200
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=113114
+mem_heap_B=1200
+mem_heap_extra_B=24
+mem_stacks_B=0
+heap_tree=peak
+n3: 1200 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 400 0x4005FD: main (parent.c:8)
+ n0: 400 0x40060B: main (parent.c:9)
+ n0: 400 0x400619: main (parent.c:10)
+#-----------
+snapshot=5
+#-----------
+time=113114
+mem_heap_B=800
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=113145
+mem_heap_B=400
+mem_heap_extra_B=8
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=113176
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoExec/template_valgrind_3847.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoExec/template_valgrind_3847.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNoExec/template_valgrind_3847.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNumSnapshots/massif_2900.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNumSnapshots/massif_2900.txt
new file mode 100644
index 0000000000..43d2b5c789
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNumSnapshots/massif_2900.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testNumSnapshots/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNumSnapshots/template_massif_2900.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNumSnapshots/template_massif_2900.txt
new file mode 100644
index 0000000000..483c09c227
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNumSnapshots/template_massif_2900.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testNumSnapshots/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNumSnapshots/template_valgrind_2900.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNumSnapshots/template_valgrind_2900.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testNumSnapshots/template_valgrind_2900.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testPeakInaccuracy/massif_3300.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testPeakInaccuracy/massif_3300.txt
new file mode 100644
index 0000000000..5307e6053b
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testPeakInaccuracy/massif_3300.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testPeakInaccuracy/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=0.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testPeakInaccuracy/template_massif_3300.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testPeakInaccuracy/template_massif_3300.txt
new file mode 100644
index 0000000000..23984a5099
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testPeakInaccuracy/template_massif_3300.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testPeakInaccuracy/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=0.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testPeakInaccuracy/template_valgrind_3300.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testPeakInaccuracy/template_valgrind_3300.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testPeakInaccuracy/template_valgrind_3300.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testStacks/massif_4317.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testStacks/massif_4317.txt
new file mode 100644
index 0000000000..33fd5a71a9
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testStacks/massif_4317.txt
@@ -0,0 +1,506 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testStacks/massif_%p.txt --heap=yes --heap-admin=8 --stacks=yes --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=1437
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=624
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=3230
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=848
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=4771
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=856
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=7531
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1000
+heap_tree=detailed
+n0: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+#-----------
+snapshot=5
+#-----------
+time=10368
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=672
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=12431
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=2616
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=14504
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=664
+heap_tree=empty
+#-----------
+snapshot=8
+#-----------
+time=17484
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1096
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=20410
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=2904
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=23476
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=3360
+heap_tree=peak
+n0: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+#-----------
+snapshot=11
+#-----------
+time=25600
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1848
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=27211
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1048
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=29813
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=14
+#-----------
+time=31415
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=15
+#-----------
+time=34202
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1488
+heap_tree=empty
+#-----------
+snapshot=16
+#-----------
+time=36369
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=17
+#-----------
+time=37878
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=18
+#-----------
+time=40224
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=19
+#-----------
+time=41792
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=20
+#-----------
+time=43757
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1256
+heap_tree=empty
+#-----------
+snapshot=21
+#-----------
+time=46677
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=22
+#-----------
+time=48495
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=23
+#-----------
+time=50143
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=24
+#-----------
+time=52295
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=25
+#-----------
+time=54982
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=26
+#-----------
+time=57816
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1256
+heap_tree=empty
+#-----------
+snapshot=27
+#-----------
+time=59548
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=28
+#-----------
+time=61798
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=29
+#-----------
+time=64361
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=30
+#-----------
+time=66273
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=31
+#-----------
+time=69317
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1488
+heap_tree=empty
+#-----------
+snapshot=32
+#-----------
+time=70874
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1496
+heap_tree=empty
+#-----------
+snapshot=33
+#-----------
+time=73153
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1488
+heap_tree=empty
+#-----------
+snapshot=34
+#-----------
+time=76283
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=35
+#-----------
+time=77814
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=36
+#-----------
+time=79556
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=37
+#-----------
+time=81109
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1496
+heap_tree=empty
+#-----------
+snapshot=38
+#-----------
+time=82775
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=39
+#-----------
+time=84435
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=40
+#-----------
+time=86887
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1256
+heap_tree=empty
+#-----------
+snapshot=41
+#-----------
+time=87868
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=42
+#-----------
+time=90333
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=43
+#-----------
+time=92161
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1304
+heap_tree=detailed
+n0: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+#-----------
+snapshot=44
+#-----------
+time=95293
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=45
+#-----------
+time=96911
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1488
+heap_tree=empty
+#-----------
+snapshot=46
+#-----------
+time=100010
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1488
+heap_tree=detailed
+n0: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+#-----------
+snapshot=47
+#-----------
+time=102283
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=984
+heap_tree=empty
+#-----------
+snapshot=48
+#-----------
+time=104556
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=488
+heap_tree=empty
+#-----------
+snapshot=49
+#-----------
+time=106071
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=568
+heap_tree=empty
+#-----------
+snapshot=50
+#-----------
+time=107062
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=560
+heap_tree=empty
+#-----------
+snapshot=51
+#-----------
+time=108050
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=568
+heap_tree=detailed
+n0: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+#-----------
+snapshot=52
+#-----------
+time=109056
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=168
+heap_tree=empty
+#-----------
+snapshot=53
+#-----------
+time=110055
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=120
+heap_tree=empty
+#-----------
+snapshot=54
+#-----------
+time=111078
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1008
+heap_tree=empty
+#-----------
+snapshot=55
+#-----------
+time=112073
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=1016
+heap_tree=empty
+#-----------
+snapshot=56
+#-----------
+time=113076
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=632
+heap_tree=empty
+#-----------
+snapshot=57
+#-----------
+time=114138
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=952
+heap_tree=empty
+#-----------
+snapshot=58
+#-----------
+time=115254
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=792
+heap_tree=empty
+#-----------
+snapshot=59
+#-----------
+time=116319
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=440
+heap_tree=empty
+#-----------
+snapshot=60
+#-----------
+time=117304
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=392
+heap_tree=empty
+#-----------
+snapshot=61
+#-----------
+time=118285
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=360
+heap_tree=detailed
+n1: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 0 in 4 places, all below massif's threshold (01.00%)
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testStacks/template_massif_4317.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testStacks/template_massif_4317.txt
new file mode 100644
index 0000000000..80a7c7bece
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testStacks/template_massif_4317.txt
@@ -0,0 +1,506 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testStacks/massif_%p.txt --heap=yes --heap-admin=8 --stacks=yes --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=1437
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=624
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=3230
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=848
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=4771
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=856
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=7531
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1000
+heap_tree=detailed
+n0: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+#-----------
+snapshot=5
+#-----------
+time=10368
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=672
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=12431
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=2616
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=14504
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=664
+heap_tree=empty
+#-----------
+snapshot=8
+#-----------
+time=17484
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1096
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=20410
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=2904
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=23476
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=3360
+heap_tree=peak
+n0: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+#-----------
+snapshot=11
+#-----------
+time=25600
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1848
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=27211
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1048
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=29813
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=14
+#-----------
+time=31415
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=15
+#-----------
+time=34202
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1488
+heap_tree=empty
+#-----------
+snapshot=16
+#-----------
+time=36369
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=17
+#-----------
+time=37878
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=18
+#-----------
+time=40224
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=19
+#-----------
+time=41792
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=20
+#-----------
+time=43757
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1256
+heap_tree=empty
+#-----------
+snapshot=21
+#-----------
+time=46677
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=22
+#-----------
+time=48495
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=23
+#-----------
+time=50143
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=24
+#-----------
+time=52295
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=25
+#-----------
+time=54982
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=26
+#-----------
+time=57816
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1256
+heap_tree=empty
+#-----------
+snapshot=27
+#-----------
+time=59548
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=28
+#-----------
+time=61798
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=29
+#-----------
+time=64361
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=30
+#-----------
+time=66273
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=31
+#-----------
+time=69317
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1488
+heap_tree=empty
+#-----------
+snapshot=32
+#-----------
+time=70874
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1496
+heap_tree=empty
+#-----------
+snapshot=33
+#-----------
+time=73153
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1488
+heap_tree=empty
+#-----------
+snapshot=34
+#-----------
+time=76283
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=35
+#-----------
+time=77814
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=36
+#-----------
+time=79556
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=37
+#-----------
+time=81109
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1496
+heap_tree=empty
+#-----------
+snapshot=38
+#-----------
+time=82775
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=39
+#-----------
+time=84435
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=40
+#-----------
+time=86887
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1256
+heap_tree=empty
+#-----------
+snapshot=41
+#-----------
+time=87868
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=42
+#-----------
+time=90333
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1432
+heap_tree=empty
+#-----------
+snapshot=43
+#-----------
+time=92161
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1304
+heap_tree=detailed
+n0: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+#-----------
+snapshot=44
+#-----------
+time=95293
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=936
+heap_tree=empty
+#-----------
+snapshot=45
+#-----------
+time=96911
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1488
+heap_tree=empty
+#-----------
+snapshot=46
+#-----------
+time=100010
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1488
+heap_tree=detailed
+n0: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+#-----------
+snapshot=47
+#-----------
+time=102283
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=984
+heap_tree=empty
+#-----------
+snapshot=48
+#-----------
+time=104556
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=488
+heap_tree=empty
+#-----------
+snapshot=49
+#-----------
+time=106071
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=568
+heap_tree=empty
+#-----------
+snapshot=50
+#-----------
+time=107062
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=560
+heap_tree=empty
+#-----------
+snapshot=51
+#-----------
+time=108050
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=568
+heap_tree=detailed
+n0: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+#-----------
+snapshot=52
+#-----------
+time=109056
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=168
+heap_tree=empty
+#-----------
+snapshot=53
+#-----------
+time=110055
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=120
+heap_tree=empty
+#-----------
+snapshot=54
+#-----------
+time=111078
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=1008
+heap_tree=empty
+#-----------
+snapshot=55
+#-----------
+time=112073
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=1016
+heap_tree=empty
+#-----------
+snapshot=56
+#-----------
+time=113076
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=632
+heap_tree=empty
+#-----------
+snapshot=57
+#-----------
+time=114138
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=952
+heap_tree=empty
+#-----------
+snapshot=58
+#-----------
+time=115254
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=792
+heap_tree=empty
+#-----------
+snapshot=59
+#-----------
+time=116319
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=440
+heap_tree=empty
+#-----------
+snapshot=60
+#-----------
+time=117304
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=392
+heap_tree=empty
+#-----------
+snapshot=61
+#-----------
+time=118285
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=360
+heap_tree=detailed
+n1: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 0 in 4 places, all below massif's threshold (01.00%)
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testStacks/template_valgrind_4317.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testStacks/template_valgrind_4317.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testStacks/template_valgrind_4317.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testThreshold/massif_3260.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testThreshold/massif_3260.txt
new file mode 100644
index 0000000000..83e5fe6e39
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testThreshold/massif_3260.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testThreshold/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=2.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testThreshold/template_massif_3260.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testThreshold/template_massif_3260.txt
new file mode 100644
index 0000000000..9d8406cc87
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testThreshold/template_massif_3260.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testThreshold/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=2.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testThreshold/template_valgrind_3260.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testThreshold/template_valgrind_3260.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testThreshold/template_valgrind_3260.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitBytes/massif_3340.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitBytes/massif_3340.txt
new file mode 100644
index 0000000000..883779c2db
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitBytes/massif_3340.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testTimeUnitBytes/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=B --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: B
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=56
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=112
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=168
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=224
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=280
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=336
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=336
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=392
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=448
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=504
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=560
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=616
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=672
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitBytes/template_massif_3340.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitBytes/template_massif_3340.txt
new file mode 100644
index 0000000000..7a93d1180a
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitBytes/template_massif_3340.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testTimeUnitBytes/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=B --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: B
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=56
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=112
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=168
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=224
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=280
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=336
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=336
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=392
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=448
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=504
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=560
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=616
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=672
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitBytes/template_valgrind_3340.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitBytes/template_valgrind_3340.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitBytes/template_valgrind_3340.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitMilliseconds/massif_3380.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitMilliseconds/massif_3380.txt
new file mode 100644
index 0000000000..34e4718973
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitMilliseconds/massif_3380.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testTimeUnitMilliseconds/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=ms --detailed-freq=10 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: ms
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=99
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=99
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=100
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=100
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=100
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=100
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=100
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=100
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=100
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=100
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=100
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=100
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=100
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitMilliseconds/template_massif_3380.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitMilliseconds/template_massif_3380.txt
new file mode 100644
index 0000000000..4970699fc0
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitMilliseconds/template_massif_3380.txt
@@ -0,0 +1,123 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testTimeUnitMilliseconds/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=ms --detailed-freq=10 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: ms
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=99
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=2
+#-----------
+time=99
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=100
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=4
+#-----------
+time=100
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=100
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=6
+#-----------
+time=100
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=100
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=100
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=100
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=10
+#-----------
+time=100
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=100
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=12
+#-----------
+time=100
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=100
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitMilliseconds/template_valgrind_3380.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitMilliseconds/template_valgrind_3380.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTimeUnitMilliseconds/template_valgrind_3380.txt
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTreeNodes/massif_2820.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTreeNodes/massif_2820.txt
new file mode 100644
index 0000000000..b6341252c3
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTreeNodes/massif_2820.txt
@@ -0,0 +1,153 @@
+desc: --massif-out-file=/home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif/target/org.eclipse.linuxtools.valgrind.massif-0.11.0-SNAPSHOT.jar/valgrindFiles/testTreeNodes/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=2 --max-snapshots=100
+cmd: /home/akurtakov/git/org.eclipse.linuxtools/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/target/work/data/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n1: 40 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n3: 120 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n1: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=detailed
+n4: 200 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=detailed
+n4: 160 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=detailed
+n3: 80 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=detailed
+n1: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 0 in 4 places, all below massif's threshold (01.00%)
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTreeNodes/template_massif_2820.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTreeNodes/template_massif_2820.txt
new file mode 100644
index 0000000000..046df620d0
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTreeNodes/template_massif_2820.txt
@@ -0,0 +1,153 @@
+desc: --massif-out-file=YYYYYYYYYYYY/valgrindFiles/testTreeNodes/massif_%p.txt --heap=yes --heap-admin=8 --stacks=no --depth=30 --threshold=1.0 --peak-inaccuracy=1.0 --time-unit=i --detailed-freq=2 --max-snapshots=100
+cmd: XXXXXXXXXXXX/alloctest/Debug/alloctest
+time_unit: i
+#-----------
+snapshot=0
+#-----------
+time=0
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=1
+#-----------
+time=111201
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=detailed
+n1: 40 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+#-----------
+snapshot=2
+#-----------
+time=111240
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=3
+#-----------
+time=111275
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=detailed
+n3: 120 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n1: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+#-----------
+snapshot=4
+#-----------
+time=111314
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=5
+#-----------
+time=111349
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=detailed
+n4: 200 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=6
+#-----------
+time=111388
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=7
+#-----------
+time=112285
+mem_heap_B=240
+mem_heap_extra_B=96
+mem_stacks_B=0
+heap_tree=peak
+n4: 240 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 120 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005DB: main (alloctest.c:31)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 40 0x4005CD: main (alloctest.c:30)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+#-----------
+snapshot=8
+#-----------
+time=112285
+mem_heap_B=200
+mem_heap_extra_B=80
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=9
+#-----------
+time=112323
+mem_heap_B=160
+mem_heap_extra_B=64
+mem_stacks_B=0
+heap_tree=detailed
+n4: 160 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n3: 80 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x4005F9: main (alloctest.c:33)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+ n0: 40 0x4005EB: main (alloctest.c:32)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 1 place, below massif's threshold (01.00%)
+#-----------
+snapshot=10
+#-----------
+time=112356
+mem_heap_B=120
+mem_heap_extra_B=48
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=11
+#-----------
+time=112394
+mem_heap_B=80
+mem_heap_extra_B=32
+mem_stacks_B=0
+heap_tree=detailed
+n3: 80 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n2: 40 0x40069A: foo (alloctest.c:48)
+ n0: 40 0x400617: main (alloctest.c:35)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+ n0: 40 0x400609: main (alloctest.c:34)
+ n0: 0 in 2 places, all below massif's threshold (01.00%)
+#-----------
+snapshot=12
+#-----------
+time=112427
+mem_heap_B=40
+mem_heap_extra_B=16
+mem_stacks_B=0
+heap_tree=empty
+#-----------
+snapshot=13
+#-----------
+time=112465
+mem_heap_B=0
+mem_heap_extra_B=0
+mem_stacks_B=0
+heap_tree=detailed
+n1: 0 (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+ n0: 0 in 4 places, all below massif's threshold (01.00%)
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTreeNodes/template_valgrind_2820.txt b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTreeNodes/template_valgrind_2820.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles/testTreeNodes/template_valgrind_2820.txt

Back to the top