X-Git-Url: https://git.lttng.org/?p=lttv.git;a=blobdiff_plain;f=runlttv;h=70e9bf55adb74ee9f6e27164dff2d3d521a712ea;hp=a1be65facdf822fd871413cbe288a923240e1050;hb=HEAD;hpb=9a366873e0ed6ecc7f23e2d3a959ecddd4f2f91d

diff --git a/runlttv b/runlttv
index a1be65fa..70e9bf55 100755
--- a/runlttv
+++ b/runlttv
@@ -14,16 +14,18 @@ PROGNAME=$0
 BUILDPATH=$(dirname $0)
 RCFILE="$(dirname $0)/.runlttvrc"
 TEXTLIBS="-L ${BUILDPATH}/lttv/modules/text/.libs -m textDump"
+FORMATEDLIBS="-L ${BUILDPATH}/lttv/modules/text/.libs -m formatedDump"
 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/controlflow/.libs -m guicontrolflow "\
+"-L ${BUILDPATH}/lttv/modules/gui/detailedevents/.libs -m guievents "\
+"-L ${BUILDPATH}/lttv/modules/gui/histogram/.libs -m guihistogram "\
+"-L ${BUILDPATH}/lttv/modules/gui/resourceview/.libs -m resourceview "\
+"-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 "\
 #"-L ${BUILDPATH}/lttv/modules/gui/filter/.libs -m guifilter "\
-#"-L ${BUILDPATH}/lttv/modules/gui/interrupts/.libs -m interrupts "\
-#"-L ${BUILDPATH}/lttv/modules/gui/histogram/.libs -m guihistogram"
+#"-L ${BUILDPATH}/lttv/modules/gui/interrupts/.libs -m interrupts "
+
 DEFAULTMODE="gui"
 
 usage () {
@@ -32,9 +34,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
 }
 
@@ -47,12 +50,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;
@@ -76,6 +80,8 @@ fi
 
 if [ "$MODE" = "text" ]; then
 	LIBS="$TEXTLIBS"
+elif [ "$MODE" = "format" ]; then
+        LIBS="$FORMATLIBS"
 elif [ "$MODE" = "eval" ]; then
 	LIBS="$EVALLIBS"
 elif [ "$MODE" = "gui" ]; then
@@ -85,15 +91,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_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