summaryrefslogtreecommitdiff
path: root/tools/valgrind-wireshark.sh
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-09-12 13:45:04 +0000
committerEvan Huus <eapache@gmail.com>2013-09-12 13:45:04 +0000
commita10254082be3c82362e8883c1a122942c240b931 (patch)
tree70a1c5316f46b0352544eb91cc38ef3c3e10c8e5 /tools/valgrind-wireshark.sh
parent58a9f5cb1ef9e40b6948edff08f6d172ae7d1ed1 (diff)
downloadwireshark-a10254082be3c82362e8883c1a122942c240b931.tar.gz
When profiling we are more interested in real-world performance than memory
errors, so we want to use the "fast" allocators rather than the ones that are friendly to memcheck. svn path=/trunk/; revision=51969
Diffstat (limited to 'tools/valgrind-wireshark.sh')
-rwxr-xr-xtools/valgrind-wireshark.sh18
1 files changed, 10 insertions, 8 deletions
diff --git a/tools/valgrind-wireshark.sh b/tools/valgrind-wireshark.sh
index b83adc686d..0ffedfdab0 100755
--- a/tools/valgrind-wireshark.sh
+++ b/tools/valgrind-wireshark.sh
@@ -34,7 +34,7 @@ COMMAND_ARGS="-nr"
COMMAND_ARGS2=
VALID=0
PCAP=""
-TOOL=""
+TOOL="memcheck"
while getopts ":2b:C:lmnprtTYwcevW" OPTCHAR ; do
case $OPTCHAR in
@@ -42,10 +42,10 @@ while getopts ":2b:C:lmnprtTYwcevW" OPTCHAR ; do
b) BIN_DIR=$OPTARG ;;
C) COMMAND_ARGS="-C $OPTARG $COMMAND_ARGS" ;;
l) LEAK_CHECK="--leak-check=full" ;;
- m) TOOL="--tool=massif" ;;
+ m) TOOL="massif" ;;
n) COMMAND_ARGS="-v"
VALID=1 ;;
- p) TOOL="--tool=callgrind" ;;
+ p) TOOL="callgrind" ;;
r) REACHABLE="--show-reachable=yes" ;;
t) TRACK_ORIGINS="--track-origins=yes" ;;
T) COMMAND_ARGS="-Vx $COMMAND_ARGS" ;; # "build the Tree"
@@ -84,10 +84,12 @@ if [ "$BIN_DIR" = "." ]; then
export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=
fi
-export WIRESHARK_DEBUG_EP_NO_CHUNKS=
-export WIRESHARK_DEBUG_SE_NO_CHUNKS=
-export WIRESHARK_DEBUG_WMEM_OVERRIDE=simple
-export G_SLICE=always-malloc # or debug-blocks
+if [ "$TOOL" != "callgrind" ]; then
+ export WIRESHARK_DEBUG_EP_NO_CHUNKS=
+ export WIRESHARK_DEBUG_SE_NO_CHUNKS=
+ export WIRESHARK_DEBUG_WMEM_OVERRIDE=simple
+ export G_SLICE=always-malloc # or debug-blocks
+fi
COMMAND="$BIN_DIR/$COMMAND"
@@ -102,4 +104,4 @@ else
LIBTOOL=""
fi
-$LIBTOOL valgrind --suppressions=`dirname $0`/vg-suppressions $TOOL $VERBOSE $LEAK_CHECK $REACHABLE $TRACK_ORIGINS $COMMAND $COMMAND_ARGS $PCAP $COMMAND_ARGS2 > /dev/null
+$LIBTOOL valgrind --suppressions=`dirname $0`/vg-suppressions --tool=$TOOL $VERBOSE $LEAK_CHECK $REACHABLE $TRACK_ORIGINS $COMMAND $COMMAND_ARGS $PCAP $COMMAND_ARGS2 > /dev/null