lttngtrace update todo

[ltt-control.git] / lttctl / ltt-armall.sh

diff --git a/lttctl/ltt-armall.sh b/lttctl/ltt-armall.sh
index d73cdbaaf349f94bd5996ad681f5a2bae8f44a50..d2548b86a610ce193656bc419dac0ef87dd6978b 100755 (executable)
--- a/lttctl/ltt-armall.sh
+++ b/lttctl/ltt-armall.sh
@@ -1,4 +1,5 @@
 # Copyright (C) 2009 Benjamin Poirier
+# Copyright (C) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,8 +15,9 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-DEBUGFSROOT=$(grep ^debugfs /proc/mounts | head -n 1 | awk '{print $2}')
+DEBUGFSROOT=$(awk '{if ($3 == "debugfs") print $2}' /proc/mounts | head -n 1)
 MARKERSROOT=${DEBUGFSROOT}/ltt/markers
+DEFAULTMODULES="ltt-trace-control ltt-marker-control ltt-tracer ltt-relay ltt-kprobes ltt-userspace-event ltt-statedump ipc-trace kernel-trace mm-trace net-trace fs-trace jbd2-trace syscall-trace trap-trace block-trace rcu-trace"
 
 usage () {
        echo "Usage: $0 [OPTION]..." > /dev/stderr
@@ -31,14 +33,25 @@ usage () {
        echo "" > /dev/stderr
 }
 
+if [ "$(id -u)" != "0" ]; then
+       echo "Error: This script needs to be run as root." > /dev/stderr
+       exit 1;
+fi
+
 if [ ! "${DEBUGFSROOT}" ]; then
        echo "Error: debugfs not mounted" > /dev/stderr
        exit 1;
 fi
 
 if [ ! -d "${MARKERSROOT}" ]; then
-       echo "Error: LTT trace controller not found (did you compile and load LTTng?)" > /dev/stderr
-       exit 1;
+       #Try loading the kernel modules first
+       for i in ${DEFAULTMODULES}; do
+               modprobe $i
+       done
+       if [ ! -d "${MARKERSROOT}" ]; then
+               echo "Error: LTT trace controller not found (did you compile and load LTTng?)" > /dev/stderr
+               exit 1;
+       fi
 fi
 
 while getopts "lnqh" options; do
@@ -58,10 +71,14 @@ shift $((${OPTIND} - 1))
 
 if [ ! ${LOCKING} ]; then
        TESTS="${TESTS} -name lockdep -prune -o -name locking -prune -o"
+else
+       modprobe lockdep-trace
 fi
 
 if [ ! ${NETWORK} ]; then
        TESTS="${TESTS} -path '*/net/*_extended' -prune -o"
+else
+       modprobe net-extended-trace
 fi
 
 if [ ! ${INPUT} ]; then