X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=trunk%2Fltt-control%2Flttctl%2Fltt-disarmall.sh;h=2473b815bf4c2a713b8ef71300717c5878a4edd9;hb=27828bc1b0010ee87c2f68e31fb77fd4ae39fa6b;hp=12b6eff3386febef5cf3348f09c5c6d3bf587eb7;hpb=8eb22efba4f605903730d8b7560d326743003ed5;p=lttv.git

diff --git a/trunk/ltt-control/lttctl/ltt-disarmall.sh b/trunk/ltt-control/lttctl/ltt-disarmall.sh
index 12b6eff3..2473b815 100755
--- a/trunk/ltt-control/lttctl/ltt-disarmall.sh
+++ b/trunk/ltt-control/lttctl/ltt-disarmall.sh
@@ -1,23 +1,38 @@
-#excluding locking
-#excluding core markers, not connected to default.
-echo Disconnecting all markers
-MARKERS=`cat /proc/ltt|grep -v %k|awk '{print $2 " " $4}'|sort -u|grep -v ^metadata|grep -v ^locking|grep -v ^lockdep|grep -v ^tap`
-
-#separator is newline
-IFS=$
-for a in $MARKERS; do echo Disconnecting $a; echo "disconnect $a" > /proc/ltt; done
-
-# Markers starting with "tap_" are considered high-speed.
-echo Disconnecting high-rate markers to tap
-MARKERS=`cat /proc/ltt|grep -v %k|awk '{print $2 " " $4}'|sort -u |grep ^tap`
+#excluding core markers (already connected)
+#excluding locking markers (high traffic)
 
-#Uncomment the following to also stop recording lockdep events.
-#MARKERS=`cat /proc/ltt|grep -v %k|awk '{print $2}'|sort -u|grep -e ^tap_ -e ^lockdep`
+DEBUGFSROOT=$(grep ^debugfs /proc/mounts | head -1 | awk '{print $2}')
+MARKERSROOT=${DEBUGFSROOT}/ltt/markers
 
-#separator is newline
-IFS=$
-for a in $MARKERS; do
-	echo Disconnecting $a
+echo Disconnecting all markers
 
-	echo "disconnect $a ltt_tap_marker" > /proc/ltt
+for c in ${MARKERSROOT}/*; do
+	case ${c} in
+	${MARKERSROOT}/metadata)
+		;;
+	${MARKERSROOT}/locking)
+		;;
+	${MARKERSROOT}/lockdep)
+		;;
+	*)
+		for m in ${c}/*; do
+			echo Disconnecting ${m}
+			echo 0 > ${m}/enable
+		done
+		;;
+	esac
 done
+
+## Markers starting with "tap_" are considered high-speed.
+#echo Disconnecting high-rate markers to tap
+#MARKERS=`cat /proc/ltt|grep -v %k|awk '{print $2 " " $4}'|sort -u |grep ^tap`
+#
+##Uncomment the following to also stop recording lockdep events.
+##MARKERS=`cat /proc/ltt|grep -v %k|awk '{print $2}'|sort -u|grep -e ^tap_ -e ^lockdep`
+#
+#IFS=${N}
+#for a in $MARKERS; do
+#	echo Disconnecting $a
+#
+#	echo "disconnect $a ltt_tap_marker" > /proc/ltt
+#done