X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=runlttv;h=8392d59953434ec2f5980bbccae823ff51086ad4;hb=f71db7f96a4acecf84b75a8841253e61b4c3541a;hp=ebb968f48a20f388211a5f9327de75fe7f59127e;hpb=64242d134638369e81510c880ae66a88beba9c1b;p=lttv.git

diff --git a/runlttv b/runlttv
index ebb968f4..8392d599 100755
--- a/runlttv
+++ b/runlttv
@@ -17,8 +17,8 @@ TEXTLIBS="-L ${BUILDPATH}/lttv/modules/text/.libs -m textDump"
 EVALLIBS="-L ${BUILDPATH}/lttv/modules/text/.libs -m sync_chain_batch"
 GRAPHLIBS="-L ${BUILDPATH}/lttv/modules/gui/lttvwindow/lttvwindow/.libs -m lttvwindow "\
 "-L ${BUILDPATH}/lttv/modules/gui/detailedevents/.libs -m guievents "\
-"-L ${BUILDPATH}/lttv/modules/gui/histogram/.libs -m guihistogram"
-#"-L ${BUILDPATH}/lttv/modules/gui/controlflow/.libs -m guicontrolflow "\
+"-L ${BUILDPATH}/lttv/modules/gui/histogram/.libs -m guihistogram "\
+"-L ${BUILDPATH}/lttv/modules/gui/controlflow/.libs -m guicontrolflow"
 #"-L ${BUILDPATH}/lttv/modules/gui/tracecontrol/.libs -m guitracecontrol "\
 #"-L ${BUILDPATH}/lttv/modules/gui/statistics/.libs -m guistatistics "\
 #"-L ${BUILDPATH}/lttv/modules/gui/resourceview/.libs -m resourceview "\
@@ -33,9 +33,10 @@ usage () {
 	echo "Options:" >/dev/stderr
 	printf "\t-m MODE      Output mode (modes: text, eval, gui)\n" >/dev/stderr
 	printf "\t-H HELPER    Invoke LTTV through a helper program\n" >/dev/stderr
-	printf "\t             (helpers: gdb, valgrind, massif, strace)\n" >/dev/stderr
+	printf "\t             (helpers: gdb, valgrind, massif, strace, callgrind)\n" >/dev/stderr
 	printf "\t-b OPTIONS   LTTV options to specify before the module list\n" >/dev/stderr
 	printf "\t-a OPTIONS   LTTV options to specify after the module list\n" >/dev/stderr
+	printf "\t-d           Activate LTTV debug level\n" >/dev/stderr
 	echo "" >/dev/stderr
 }
 
@@ -48,12 +49,13 @@ else
 	exit 1
 fi
 
-while getopts "H:m:b:a:h" options; do
+while getopts "H:m:b:a:dh" options; do
 	case $options in
 		H) HELPER=$OPTARG;;
 		m) MODE=$OPTARG;;
 		b) BOPTIONS="$BOPTIONS $OPTARG";;
 		a) AOPTIONS="$AOPTIONS $OPTARG";;
+		d) DEBUG_ARGS="--debug"; G_MESSAGES_DEBUG="all";;
 		h) usage;
 			exit 0;;
 		\?) usage;
@@ -86,17 +88,17 @@ else
 	exit 1
 fi
 
-LTTV_ARGS="$BOPTIONS $LIBS $TRACEFILES $AOPTIONS"
+LTTV_ARGS="$DEBUG_ARGS $BOPTIONS $LIBS $TRACEFILES $AOPTIONS"
 if [ "$HELPER" = "gdb" ]; then
-	LD_LIBRARY_PATH=${BUILDPATH}/ltt/.libs gdb --args $LTTV_EXEC $LTTV_ARGS
+	LD_LIBRARY_PATH=${BUILDPATH}/ltt/.libs G_MESSAGES_DEBUG=${G_MESSAGES_DEBUG} gdb --args $LTTV_EXEC $LTTV_ARGS
 elif [ "$HELPER" = "valgrind" ]; then
-	LD_LIBRARY_PATH=${BUILDPATH}/ltt/.libs G_SLICE=always-malloc G_DEBUG=gc-friendly valgrind  --show-reachable=yes --leak-check=full --tool=memcheck --suppressions=debug/gtk.suppression --track-origins=yes --error-limit=no $LTTV_EXEC $LTTV_ARGS
+	LD_LIBRARY_PATH=${BUILDPATH}/ltt/.libs G_MESSAGES_DEBUG=${G_MESSAGES_DEBUG} G_SLICE=always-malloc G_DEBUG=gc-friendly valgrind  --show-reachable=yes --leak-check=full --tool=memcheck --suppressions=debug/gtk.suppression --track-origins=yes --error-limit=no $LTTV_EXEC $LTTV_ARGS
 elif [ "$HELPER" = "callgrind" ]; then
-	LD_LIBRARY_PATH=${BUILDPATH}/ltt/.libs G_SLICE=always-malloc G_DEBUG=gc-friendly valgrind --tool=callgrind $LTTV_EXEC $LTTV_ARGS
+	LD_LIBRARY_PATH=${BUILDPATH}/ltt/.libs G_MESSAGES_DEBUG=${G_MESSAGES_DEBUG} G_SLICE=always-malloc G_DEBUG=gc-friendly valgrind --tool=callgrind $LTTV_EXEC $LTTV_ARGS
 elif [ "$HELPER" = "massif" ]; then
-	LD_LIBRARY_PATH=${BUILDPATH}/ltt/.libs valgrind --tool=massif $LTTV_EXEC $LTTV_ARGS
+	LD_LIBRARY_PATH=${BUILDPATH}/ltt/.libs G_MESSAGES_DEBUG=${G_MESSAGES_DEBUG} valgrind --tool=massif $LTTV_EXEC $LTTV_ARGS
 elif [ "$HELPER" = "strace" ]; then
-	LD_LIBRARY_PATH=${BUILDPATH}/ltt/.libs strace $LTTV_EXEC $LTTV_ARGS
+	LD_LIBRARY_PATH=${BUILDPATH}/ltt/.libs G_MESSAGES_DEBUG=${G_MESSAGES_DEBUG} strace $LTTV_EXEC $LTTV_ARGS
 else
-	LD_LIBRARY_PATH=${BUILDPATH}/ltt/.libs $LTTV_EXEC $LTTV_ARGS
+	LD_LIBRARY_PATH=${BUILDPATH}/ltt/.libs G_MESSAGES_DEBUG=${G_MESSAGES_DEBUG} $LTTV_EXEC $LTTV_ARGS
 fi