update newline fix

[ltt-control.git] / trunk / ltt-control / lttctl / ltt-disarmall.sh

diff --git a/trunk/ltt-control/lttctl/ltt-disarmall.sh b/trunk/ltt-control/lttctl/ltt-disarmall.sh
index aedcd55ed9e420bf8c897baf80cb45e2654c82aa..f9c626d409b3348198d3493cba96d8020334f1f6 100755 (executable)
--- a/trunk/ltt-control/lttctl/ltt-disarmall.sh
+++ b/trunk/ltt-control/lttctl/ltt-disarmall.sh
@@ -1,5 +1,23 @@
 #excluding locking
 #excluding core markers, not connected to default.
 echo Disconnecting all markers
-MARKERS=`cat /proc/ltt|grep -v %k|awk '{print $2}'|sort -u|grep -v ^core_|grep -v ^locking_`
+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, ensure compatibility with bash and ash
+IFS=$'\r'
 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`
+
+#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`
+
+#separator is newline, ensure compatibility with bash and ash
+IFS=$'\r'
+for a in $MARKERS; do
+       echo Disconnecting $a
+
+       echo "disconnect $a ltt_tap_marker" > /proc/ltt
+done