update armall

git-svn-id: http://ltt.polymtl.ca/svn@3089 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/trunk/ltt-control/lttctl/ltt-armall.sh b/trunk/ltt-control/lttctl/ltt-armall.sh
index 08cc32eb866d008f44556ece979e8a63b7e27e61..d71828bd70d31854c3984944c611ef401b0eacc7 100755 (executable)
--- a/trunk/ltt-control/lttctl/ltt-armall.sh
+++ b/trunk/ltt-control/lttctl/ltt-armall.sh
@@ -33,10 +33,10 @@ done
 # Connect the interesting high-speed markers to the marker tap.
 # Markers starting with "tap_" are considered high-speed.
 echo Connecting high-rate markers to tap
-MARKERS=`cat /proc/ltt | grep ^tap_`
+MARKERS=`cat /proc/ltt|grep -v %k|awk '{print $2}'|sort -u |grep ^tap_`
 
 #Uncomment the following to also record lockdep events.
-#MARKERS=`cat /proc/ltt | grep -e ^tap_ -e ^lockdep`
+#MARKERS=`cat /proc/ltt|grep -v %k|awk '{print $2}'|sort -u|grep -e ^tap_ -e ^lockdep`
 
 for a in $MARKERS; do
        echo Connecting $a

diff --git a/trunk/ltt-control/lttctl/ltt-disarmall.sh b/trunk/ltt-control/lttctl/ltt-disarmall.sh
index 4a3f92e446c8a57bbdffd4fab48c0fd53c73db06..027fb2e369d90627bfa6a1fccddc46655cf30f38 100755 (executable)
--- a/trunk/ltt-control/lttctl/ltt-disarmall.sh
+++ b/trunk/ltt-control/lttctl/ltt-disarmall.sh
@@ -4,13 +4,12 @@ echo Disconnecting all markers
 MARKERS=`cat /proc/ltt|grep -v %k|awk '{print $2}'|sort -u|grep -v ^core_|grep -v ^locking_|grep -v ^lockdep_|grep -v ^lockdep|grep -v ^tap_`
 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 from tap
-MARKERS=`cat /proc/ltt | grep ^tap_`
+echo Disconnecting high-rate markers to tap
+MARKERS=`cat /proc/ltt|grep -v %k|awk '{print $2}'|sort -u |grep ^tap_`
 
 #Uncomment the following to also stop recording lockdep events.
-#MARKERS=`cat /proc/ltt | grep -e ^tap_ -e ^lockdep`
+#MARKERS=`cat /proc/ltt|grep -v %k|awk '{print $2}'|sort -u|grep -e ^tap_ -e ^lockdep`
 
 for a in $MARKERS; do
        echo Disconnecting $a