update tap scripts

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

diff --git a/trunk/ltt-control/lttctl/Makefile.am b/trunk/ltt-control/lttctl/Makefile.am
index fef77e038c4f4453667df7da187bade8af6cf031..12ad501bfc08cce9bcca9c0c7b58b976acc6d167 100644 (file)
--- a/trunk/ltt-control/lttctl/Makefile.am
+++ b/trunk/ltt-control/lttctl/Makefile.am
@@ -3,9 +3,12 @@
 AM_CFLAGS = -DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_BIN_DIR=\""$(bindir)"\"
 
 bin_PROGRAMS = lttctl
-bin_SCRIPTS = ltt-armall ltt-disarmall ltt-armalluser ltt-disarmalluser
+bin_SCRIPTS = ltt-armall ltt-disarmall ltt-armalluser ltt-disarmalluser \
+  ltt-armtap ltt-disarmtap
 CLEANFILES = $(bin_SCRIPTS)
-EXTRA_DIST = ltt-armall.sh ltt-disarmall.sh ltt-armalluser.sh ltt-disarmalluser.sh
+EXTRA_DIST = ltt-armall.sh ltt-disarmall.sh \
+  ltt-armalluser.sh ltt-disarmalluser.sh \
+  ltt-armtap.sh ltt-disarmtap.sh
 
 ltt-armall: ltt-armall.sh
        rm -f ltt-armall
@@ -19,6 +22,18 @@ ltt-disarmall: ltt-disarmall.sh
        cat $(srcdir)/ltt-disarmall.sh >> ltt-disarmall
        chmod ugo+x ltt-disarmall
 
+ltt-armtap: ltt-armtap.sh
+       rm -f ltt-armtap
+       echo "#!"$(BASH) > ltt-armtap
+       cat $(srcdir)/ltt-armtap.sh >> ltt-armtap
+       chmod ugo+x ltt-armtap
+
+ltt-disarmtap: ltt-disarmtap.sh
+       rm -f ltt-disarmtap
+       echo "#!"$(BASH) > ltt-disarmtap
+       cat $(srcdir)/ltt-disarmtap.sh >> ltt-disarmtap
+       chmod ugo+x ltt-disarmtap
+
 ltt-armalluser: ltt-armalluser.sh
        rm -f ltt-armalluser
        echo "#!"$(BASH) > ltt-armalluser

diff --git a/trunk/ltt-control/lttctl/ltt-armall.sh b/trunk/ltt-control/lttctl/ltt-armall.sh
index 562ef15cb862dd0eedf70ffa9f0d8a3b5edde29e..ae6867de4d33abe87f168164676bda4019dd5684 100755 (executable)
--- a/trunk/ltt-control/lttctl/ltt-armall.sh
+++ b/trunk/ltt-control/lttctl/ltt-armall.sh
@@ -2,7 +2,7 @@
 #excluding locking markers (high traffic)
 
 echo Connecting 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}'|sort -u|grep -v ^core_|grep -v ^locking_|grep -v ^lockdep_`
 
 for a in $MARKERS; do
        echo Connecting $a
@@ -28,3 +28,25 @@ for a in $MARKERS; do
 
        echo "connect $a default dynamic $CHANNEL" > /proc/ltt
 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_`
+
+#Uncomment the following to also record lockdep events.
+#MARKERS=`cat /proc/ltt | grep -e ^tap_ -e ^lockdep`
+
+for a in $MARKERS; do
+       echo Connecting $a
+
+       #redirect markers carrying state information to dedicated channels
+       case $a in
+       *)
+               CHANNEL=
+               ;;
+       esac
+
+       echo "connect $a ltt_tap_marker dynamic $CHANNEL" > /proc/ltt
+done

diff --git a/trunk/ltt-control/lttctl/ltt-disarmall.sh b/trunk/ltt-control/lttctl/ltt-disarmall.sh
index aedcd55ed9e420bf8c897baf80cb45e2654c82aa..4a3f92e446c8a57bbdffd4fab48c0fd53c73db06 100755 (executable)
--- a/trunk/ltt-control/lttctl/ltt-disarmall.sh
+++ b/trunk/ltt-control/lttctl/ltt-disarmall.sh
@@ -1,5 +1,19 @@
 #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}'|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_`
+
+#Uncomment the following to also stop recording lockdep events.
+#MARKERS=`cat /proc/ltt | grep -e ^tap_ -e ^lockdep`
+
+for a in $MARKERS; do
+       echo Disconnecting $a
+
+       echo "disconnect $a ltt_tap_marker" > /proc/ltt
+done