X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttctl%2Fltt-armall.sh;h=1b1c3f9598f8470276c9e08e60ff2d42cf906e76;hb=825cbbaee78eb17f1381a6be2f36b8023ac433da;hp=7771505f6d3d494d2cf401191f0060ad3630d1a5;hpb=045880fb3602540472b3760832a73b431514bb7f;p=ltt-control.git

diff --git a/lttctl/ltt-armall.sh b/lttctl/ltt-armall.sh
index 7771505..1b1c3f9 100755
--- a/lttctl/ltt-armall.sh
+++ b/lttctl/ltt-armall.sh
@@ -1,5 +1,5 @@
-#!/bin/bash
 # 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
@@ -15,7 +15,7 @@
 # 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 -1 | awk '{print $2}')
+DEBUGFSROOT=$(awk '{if ($3 == "debugfs") print $2}' /proc/mounts | head -n 1)
 MARKERSROOT=${DEBUGFSROOT}/ltt/markers
 
 usage () {
@@ -25,47 +25,53 @@ 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 [ ! "$DEBUGFSROOT" ]; then
+if [ ! "${DEBUGFSROOT}" ]; then
 	echo "Error: debugfs not mounted" > /dev/stderr
 	exit 1;
 fi
 
-if [ ! -d "$MARKERSROOT" ]; then
+if [ ! -d "${MARKERSROOT}" ]; then
 	echo "Error: LTT trace controller not found (did you compile and load LTTng?)" > /dev/stderr
 	exit 1;
 fi
 
 while getopts "lnqh" options; do
-	case $options in
+	case ${options} in
 		l) LOCKING="0";;
 		n) NETWORK="0";;
 		q) QUIET="0";;
+		i) INPUT="0";;
 		h) usage;
 			exit 0;;
 		\?) usage;
 			exit 1;;
 	esac
 done
-shift $(($OPTIND - 1))
+shift $((${OPTIND} - 1))
 
 
-if [ ! $LOCKING ]; then
+if [ ! ${LOCKING} ]; then
 	TESTS="${TESTS} -name lockdep -prune -o -name locking -prune -o"
 fi
 
-if [ ! $NETWORK ]; then
+if [ ! ${NETWORK} ]; then
 	TESTS="${TESTS} -path '*/net/*_extended' -prune -o"
 fi
 
-while read -r -d $'\0' marker; do
-	if [ ! $QUIET ]; then
+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
+	if [ ! ${QUIET} ]; then
 		echo "Connecting ${marker%/enable}"
 	fi
-	echo 1 > $marker
-done < <(eval "find '$MARKERSROOT' $TESTS -name metadata -prune -o -name enable -print0")
+	echo 1 > ${marker}
+done