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 /valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles
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.
Diffstat (limited to 'valgrind/org.eclipse.linuxtools.valgrind.massif.tests/valgrindFiles')
-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
90 files changed, 10786 insertions, 0 deletions
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