runlttv: improvements

[lttv.git] / runlttv

diff --git a/runlttv b/runlttv
index 60fe83b53572fd6d11273ec9b1962f3f8f5c086c..983b50cb177227217d740091f643fae42e5c6284 100755 (executable)
--- a/runlttv
+++ b/runlttv
@@ -4,12 +4,16 @@
 
 # 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
 #     ex: TRACEFILE="-t /tmp/traces/dijkstra-20071212"
 # - by setting the ARGS variable, a different set of plugins can be loaded
 #     for an example see the ARGS= line below
+# - the LTTV_ARGS environment variable may be used to add additional arguments to lttv
 #
 # In order for icons to display correctly, it might be necessary to create a
 # symlink:
@@ -18,23 +22,45 @@
 
 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
 
+for a in $@; do
+       eval $(echo $a)"=1"
+done
+
+if [ -n "$TF" ]; then
+       TRACEFILE="-t $TF"
+fi
+
 if [ -e "$RCFILE" ]; then
        source "$RCFILE";
 fi
 
-if [ "$1" = "dbg" ]; then
+ARGS="$ARGS $LTTV_ARGS"
+
+if [ -n "$dbg" ]; then
        LD_LIBRARY_PATH=ltt/.libs gdb --args $LTTV_EXEC $ARGS $TRACEFILE
-elif [ "$1" = "valgrind" ]; then
-       LD_LIBRARY_PATH=ltt/.libs valgrind $LTTV_EXEC $ARGS $TRACEFILE
-elif [ "$1" = "strace" ]; then
+elif [ -n "$valgrind" ]; then
+       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
        LD_LIBRARY_PATH=ltt/.libs $LTTV_EXEC $ARGS $TRACEFILE