X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttctl%2Fltt-armall.sh;h=d2548b86a610ce193656bc419dac0ef87dd6978b;hb=432a1b04774579cefbed4126a66427cb730c5a0a;hp=03143235431dfc7bf3cbaeeae6c5210190533111;hpb=6e8902bf55007831c1cbc3092f4f44b4106c9cff;p=ltt-control.git

diff --git a/lttctl/ltt-armall.sh b/lttctl/ltt-armall.sh
index 0314323..d2548b8 100755
--- 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
@@ -24,20 +26,32 @@ usage () {
 	echo "Options:" > /dev/stderr
 	printf "\t-l           Also activate locking markers (high traffic)\n" > /dev/stderr
 	printf "\t-n           Also activate detailed network markers (large size)\n" > /dev/stderr
+	printf "\t-i           Also activate input subsystem events (security implication: records keyboard inputs)\n" > /dev/stderr
 	echo "" > /dev/stderr
 	printf "\t-q           Quiet mode, suppress output\n" > /dev/stderr
 	printf "\t-h           Print this help\n" > /dev/stderr
 	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
@@ -45,6 +59,7 @@ while getopts "lnqh" options; do
 		l) LOCKING="0";;
 		n) NETWORK="0";;
 		q) QUIET="0";;
+		i) INPUT="0";;
 		h) usage;
 			exit 0;;
 		\?) usage;
@@ -56,10 +71,18 @@ 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
+	TESTS="${TESTS} -name input -prune -o"
 fi
 
 (eval "find '${MARKERSROOT}' ${TESTS} -name metadata -prune -o -name enable -print") | while read -r marker; do