X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=runlttv;h=983b50cb177227217d740091f643fae42e5c6284;hb=58f53b56557577b64911d0e7a2bba3fbb521d71d;hp=82296c3e50df15b7a6284fc14b1ee6cd4eb213fe;hpb=06ed3363a1e822db4bc0ee1b20dac59c0676eaa9;p=lttv.git

diff --git a/runlttv b/runlttv
index 82296c3e..983b50cb 100755
--- a/runlttv
+++ b/runlttv
@@ -4,6 +4,9 @@
 
 # This script runs LTTV in place in the compile directory without need for
 # installing it with make install.
+#
+# Run with the TF environment variable set to a trace directory to open it.
+#     ex: TF=/my/trace ./runlttv
 # 
 # The .runlttvrc file can be used to control its behavior.
 # - by setting the TRACEFILE variable, a trace can be automatically loaded
@@ -19,10 +22,22 @@
 
 RCFILE=".runlttvrc"
 
-ARGS="-L lttv/modules/gui/controlflow/.libs -m guicontrolflow -L lttv/modules/gui/lttvwindow/lttvwindow/.libs -m lttvwindow -L lttv/modules/gui/detailedevents/.libs -m guievents -L lttv/modules/gui/tracecontrol/.libs -m guitracecontrol -L lttv/modules/gui/statistics/.libs -m guistatistics -L lttv/modules/gui/resourceview/.libs -m resourceview -L lttv/modules/gui/filter/.libs -m guifilter -L lttv/modules/gui/interrupts/.libs -m interrupts -L lttv/modules/gui/histogram/.libs -m guihistogram"
-LTTV_EXEC="lttv/lttv/.libs/lttv.real"
+ARGS=\
+"-L lttv/modules/gui/lttvwindow/lttvwindow/.libs -m lttvwindow "\
+"-L lttv/modules/gui/controlflow/.libs -m guicontrolflow "\
+"-L lttv/modules/gui/detailedevents/.libs -m guievents "\
+"-L lttv/modules/gui/tracecontrol/.libs -m guitracecontrol "\
+"-L lttv/modules/gui/statistics/.libs -m guistatistics "\
+"-L lttv/modules/gui/resourceview/.libs -m resourceview "\
+"-L lttv/modules/gui/filter/.libs -m guifilter "\
+"-L lttv/modules/gui/interrupts/.libs -m interrupts "\
+"-L lttv/modules/gui/histogram/.libs -m guihistogram"
 
-if [ ! -e "$LTTV_EXEC" ]; then
+if [ -e "lttv/lttv/.libs/lttv.real" ]; then
+	LTTV_EXEC="lttv/lttv/.libs/lttv.real"
+elif [ -e "lttv/lttv/lttv.real" ]; then
+	LTTV_EXEC="lttv/lttv/lttv.real"
+else
 	echo "error: LTTV should be compiled before running this script." >/dev/stderr
 	exit 1
 fi
@@ -31,18 +46,20 @@ for a in $@; do
 	eval $(echo $a)"=1"
 done
 
+if [ -n "$TF" ]; then
+	TRACEFILE="-t $TF"
+fi
+
 if [ -e "$RCFILE" ]; then
 	source "$RCFILE";
 fi
 
 ARGS="$ARGS $LTTV_ARGS"
 
-echo $dbg
-
 if [ -n "$dbg" ]; then
 	LD_LIBRARY_PATH=ltt/.libs gdb --args $LTTV_EXEC $ARGS $TRACEFILE
 elif [ -n "$valgrind" ]; then
-	LD_LIBRARY_PATH=ltt/.libs valgrind --show-reachable=yes --leak-check=full $LTTV_EXEC $ARGS $TRACEFILE
+	LD_LIBRARY_PATH=ltt/.libs valgrind --track-origins=yes --show-reachable=yes --leak-check=full --error-limit=no $LTTV_EXEC $ARGS $TRACEFILE
 elif [ -n "$strace" ]; then
 	LD_LIBRARY_PATH=ltt/.libs strace $LTTV_EXEC $ARGS $TRACEFILE
 else