7 files changed, 131 insertions, 33 deletions
diff --git a/dev/scripts/launch/check.cachegrind.sh b/dev/scripts/launch/check.cachegrind.sh
index 5dd3814e..36c4b21a 100755
--- a/dev/scripts/launch/check.cachegrind.sh
+++ b/dev/scripts/launch/check.cachegrind.sh
@@ -1,4 +1,9 @@
-#!/bin/bash
+#/bin/bash
+
+# Name: check.cachegrind.sh
+# Author: Ladar Levison
+#
+# Description: Used for launching the magmad unit tests. The tests are executed atop the Valgrind helgrind utility.
 
 LINK=`readlink -f $0`
 BASE=`dirname $LINK`
@@ -11,8 +16,21 @@ MAGMA_DIST=`pwd`
 # self modifying code --smc-check=[none,stack,all]
 #
 
-valgrind --tool=cachegrind --trace-children=yes --child-silent-after-fork=yes --run-libc-freeres=yes --demangle=yes --num-callers=50 --error-limit=no \
---show-below-main=no --max-stackframe=20000000 --dsymutil=yes --fullpath-after= --read-var-info=yes \
---cache-sim=yes --branch-sim=no --cachegrind-out-file=$HOME/cachegrind.out.%p \
---suppressions=$MAGMA_DIST/res/config/magma.supp --suppressions=/usr/lib64/valgrind/default.supp \
-$MAGMA_DIST/check/.check/magmad.check $MAGMA_DIST/res/config/magma.sandbox.config
+valgrind --tool=cachegrind \
+--trace-children=yes \
+--child-silent-after-fork=yes \
+--run-libc-freeres=yes \
+--demangle=yes \
+--num-callers=50 \
+--error-limit=no \
+--show-below-main=no \
+--max-stackframe=20000000 \
+--dsymutil=yes \
+--fullpath-after= \
+--read-var-info=yes \
+--cache-sim=yes \
+--branch-sim=no \
+--cachegrind-out-file=$HOME/cachegrind.out.%p \
+--suppressions=/usr/lib64/valgrind/default.supp \
+--suppressions=$MAGMA_DIST/sandbox/etc/magma.suppressions \ 
+$MAGMA_DIST/magmad.check $MAGMA_DIST/sandbox/etc/magma.sandbox.config
diff --git a/dev/scripts/launch/check.callgrind.sh b/dev/scripts/launch/check.callgrind.sh
index 942828ff..3cb2c8e1 100755
--- a/dev/scripts/launch/check.callgrind.sh
+++ b/dev/scripts/launch/check.callgrind.sh
@@ -1,4 +1,9 @@
-#!/bin/bash
+#/bin/bash
+
+# Name: check.callgrind.sh
+# Author: Ladar Levison
+#
+# Description: Used for launching the magmad unit tests. The tests are executed atop the Valgrind callgrind utility.
 
 LINK=`readlink -f $0`
 BASE=`dirname $LINK`
@@ -13,13 +18,30 @@ MAGMA_DIST=`pwd`
 
 #### Still not tracking forks/threads properly!!
 
-valgrind --tool=callgrind --trace-children=yes --demangle=yes --num-callers=50 --error-limit=no \
---show-below-main=no --max-stackframe=20000000 --dsymutil=yes --fullpath-after= --read-var-info=yes \
---dump-line=yes --compress-strings=yes --compress-pos=yes --collect-systime=yes --collect-bus=yes \
---zero-before=main --dump-instr=yes --trace-jump=yes --collect-atstart=yes --instr-atstart=yes  \
---callgrind-out-file=$HOME/callgrind.out.%p \
---suppressions=$MAGMA_DIST/res/config/magma.supp --suppressions=/usr/lib64/valgrind/default.supp \
-$MAGMA_DIST/check/.check/magmad.check $MAGMA_DIST/res/config/magma.sandbox.config &
+valgrind --tool=callgrind \
+--trace-children=yes \
+--demangle=yes \
+--num-callers=50 \
+--error-limit=no \
+--show-below-main=no \
+--max-stackframe=20000000 \
+--dsymutil=yes \
+--fullpath-after= \
+--read-var-info=yes \
+--dump-line=yes \
+--compress-strings=yes \
+--compress-pos=yes \
+--collect-systime=yes \
+--collect-bus=yes \
+--zero-before=main \
+--dump-instr=yes \
+--trace-jump=yes \
+--collect-atstart=yes \
+--instr-atstart=yes  \
+--callgrind-out-file=$HOME/Desktop/callgrind.out.%p \
+--suppressions=/usr/lib64/valgrind/default.supp \
+--suppressions=$MAGMA_DIST/sandbox/etc/magma.suppressions \ 
+$MAGMA_DIST/magmad.check $MAGMA_DIST/sandbox/etc/magma.sandbox.config &
 
 export VPID=$!
 export VLOG=$HOME/Desktop/callgrind.out.$VPID
diff --git a/dev/scripts/launch/check.helgrind.sh b/dev/scripts/launch/check.helgrind.sh
index 2bd436b8..0c3bde2f 100755
--- a/dev/scripts/launch/check.helgrind.sh
+++ b/dev/scripts/launch/check.helgrind.sh
@@ -1,4 +1,9 @@
-#!/bin/bash
+#/bin/bash
+
+# Name: check.helgrind.sh
+# Author: Ladar Levison
+#
+# Description: Used for launching the magmad unit tests. The tests are executed atop the Valgrind helgrind utility.
 
 LINK=`readlink -f $0`
 BASE=`dirname $LINK`
@@ -11,8 +16,21 @@ MAGMA_DIST=`pwd`
 # self modifying code --smc-check=[none,stack,all]
 #
 
-valgrind --tool=helgrind --trace-children=yes --child-silent-after-fork=yes --run-libc-freeres=yes \
---demangle=yes --num-callers=50 --error-limit=no --show-below-main=no --max-stackframe=20000000 --dsymutil=yes --fullpath-after= --read-var-info=yes \
---suppressions=$MAGMA_DIST/res/config/magma.supp --suppressions=/usr/lib64/valgrind/default.supp \
---track-lockorders=yes --history-level=full --conflict-cache-size=1000000 \
-$MAGMA_DIST/check/.check/magmad.check $MAGMA_DIST/res/config/magma.sandbox.config
+valgrind --tool=helgrind \
+--trace-children=yes \
+--child-silent-after-fork=yes \
+--run-libc-freeres=yes \
+--demangle=yes \
+--num-callers=50 \
+--error-limit=no \
+--show-below-main=no \
+--max-stackframe=20000000 \
+--dsymutil=yes \
+--fullpath-after= \
+--read-var-info=yes \
+--track-lockorders=yes \
+--history-level=full \
+--conflict-cache-size=1000000 \
+--suppressions=/usr/lib64/valgrind/default.supp \
+--suppressions=$MAGMA_DIST/sandbox/etc/magma.suppressions \
+$MAGMA_DIST/magmad.check $MAGMA_DIST/sandbox/etc/magma.sandbox.config
diff --git a/dev/scripts/launch/check.massif.sh b/dev/scripts/launch/check.massif.sh
index 2ee3eb13..16eafc54 100755
--- a/dev/scripts/launch/check.massif.sh
+++ b/dev/scripts/launch/check.massif.sh
@@ -1,5 +1,9 @@
-#!/bin/bash
+#/bin/bash
 
+# Name: check.helgrind.sh
+# Author: Ladar Levison
+#
+# Description: Used for launching the magmad unit tests. The tests are executed atop the Valgrind massif utility.
 LINK=`readlink -f $0`
 BASE=`dirname $LINK`
 
@@ -11,9 +15,28 @@ MAGMA_DIST=`pwd`
 # self modifying code --smc-check=[none,stack,all]
 #
 
-valgrind --tool=massif --trace-children=yes --child-silent-after-fork=yes --run-libc-freeres=yes --demangle=yes --num-callers=50 \
---error-limit=no --show-below-main=no --max-stackframe=20000000 --dsymutil=yes --fullpath-after= --read-var-info=yes \
---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 \
---suppressions=$MAGMA_DIST/res/config/magma.supp --suppressions=/usr/lib64/valgrind/default.supp \
+valgrind --tool=massif \
+--trace-children=yes \
+--child-silent-after-fork=yes \
+--run-libc-freeres=yes \
+--demangle=yes \
+--num-callers=50 \
+--error-limit=no \
+--show-below-main=no \
+--max-stackframe=20000000 \
+--dsymutil=yes \
+--fullpath-after= \
+--read-var-info=yes \
+--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 \
 --massif-out-file=$HOME/massif.out.%p \
-$MAGMA_DIST/check/.check/magmad.check $MAGMA_DIST/res/config/magma.sandbox.config
+--suppressions=/usr/lib64/valgrind/default.supp \
+--suppressions=$MAGMA_DIST/sandbox/etc/magma.suppressions \
+$MAGMA_DIST/magmad.check $MAGMA_DIST/sandbox/etc/magma.sandbox.config
diff --git a/dev/scripts/launch/check.run.sh b/dev/scripts/launch/check.run.sh
index 04b9a0cb..5000de8a 100755
--- a/dev/scripts/launch/check.run.sh
+++ b/dev/scripts/launch/check.run.sh
@@ -3,8 +3,8 @@
 LINK=`readlink -f $0`
 BASE=`dirname $LINK`
 
-cd $BASE/../..
+cd $BASE/../../../
 
 MAGMA_DIST=`pwd`
 
-$MAGMA_DIST/check/.check/magmad.check $MAGMA_DIST/res/config/magma.sandbox.config
+$MAGMA_DIST/magmad.check $MAGMA_DIST/sandbox/etc/magma.sandbox.config
diff --git a/dev/scripts/launch/check.vg.sh b/dev/scripts/launch/check.vg.sh
index f5f1f206..ac7f2b9a 100755
--- a/dev/scripts/launch/check.vg.sh
+++ b/dev/scripts/launch/check.vg.sh
@@ -11,8 +11,25 @@ MAGMA_DIST=`pwd`
 # self modifying code --smc-check=[none,stack,all]
 #
 
-valgrind --tool=memcheck --trace-children=yes --child-silent-after-fork=yes --run-libc-freeres=yes --demangle=yes --num-callers=50 \
---error-limit=no --show-below-main=no --undef-value-errors=yes --track-origins=yes --read-var-info=yes --smc-check=none --fullpath-after= \
---leak-check=yes --show-reachable=yes --leak-resolution=high --workaround-gcc296-bugs=no --partial-loads-ok=yes \
---suppressions=$MAGMA_DIST/res/config/magma.supp --suppressions=`locate /valgrind/default.sup` \
-$MAGMA_DIST/check/.check/magmad.check $MAGMA_DIST/res/config/magma.sandbox.config
+valgrind \
+--tool=memcheck \
+--trace-children=yes \
+--child-silent-after-fork=yes \
+--run-libc-freeres=yes \
+--demangle=yes \
+--num-callers=50 \
+--error-limit=no \
+--show-below-main=no \
+--undef-value-errors=yes \
+--track-origins=yes \
+--read-var-info=yes \
+--smc-check=none \
+--fullpath-after= \
+--leak-check=yes \
+--show-reachable=yes \
+--leak-resolution=high \
+--workaround-gcc296-bugs=no \
+--partial-loads-ok=yes \
+--suppressions=/usr/lib64/valgrind/default.supp \
+--suppressions=$MAGMA_DIST/sandbox/etc/magma.supp \
+$MAGMA_DIST/magmad.check $MAGMA_DIST/sandbox/etc/magma.sandbox.config
diff --git a/res/config/magma.supp b/sandbox/etc/magma.suppressions
index 8bfc6c08..8bfc6c08 100644
--- a/res/config/magma.supp
+++ b/sandbox/etc/magma.suppressions