From c90f61251594be2e5f43357053c213a43c4ccd2f Mon Sep 17 00:00:00 2001
From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Sat, 13 Dec 2008 21:25:04 +0000
Subject: [PATCH] update lttctl

git-svn-id: http://ltt.polymtl.ca/svn@3174 04897980-b3bd-0310-b5e0-8ef037075253
---
 trunk/ltt-control/configure.in            |  2 +-
 trunk/ltt-control/lttctl/ltt-armall.sh    | 43 ++++++++++++-----------
 trunk/ltt-control/lttctl/ltt-disarmall.sh |  7 ++--
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/trunk/ltt-control/configure.in b/trunk/ltt-control/configure.in
index 014028df..41aa9681 100644
--- a/trunk/ltt-control/configure.in
+++ b/trunk/ltt-control/configure.in
@@ -23,7 +23,7 @@
 AC_PREREQ(2.57)
 AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
 #AC_WITH_LTDL  # not needed ?
-AM_INIT_AUTOMAKE(ltt-control,0.59-25112008)
+AM_INIT_AUTOMAKE(ltt-control,0.60-13122008)
 AM_CONFIG_HEADER(config.h)
 AM_PROG_LIBTOOL
 
diff --git a/trunk/ltt-control/lttctl/ltt-armall.sh b/trunk/ltt-control/lttctl/ltt-armall.sh
index d71828bd..ee029fbe 100755
--- a/trunk/ltt-control/lttctl/ltt-armall.sh
+++ b/trunk/ltt-control/lttctl/ltt-armall.sh
@@ -2,31 +2,32 @@
 #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_|grep -v ^lockdep_`
+MARKERS=`cat /proc/ltt|grep -v %k|awk '{print $2 " " $4}'|sort -u|grep -v ^metadata|grep -v ^locking|grep -v ^lockdep`
 
+IFS=$'\n'
 for a in $MARKERS; do
 	echo Connecting $a
 
-	#redirect markers carrying state information to dedicated channels
-	case $a in
-	list_process_state|list_file_descriptor|user_generic_thread_brand|fs_exec|kernel_process_fork|kernel_process_free|kernel_process_exit|kernel_arch_kthread_create|list_statedump_end|list_vm_map)
-		CHANNEL=processes
-		;;
-	list_interrupt|statedump_idt_table|statedump_sys_call_table|statedump_softirq_vec)
-		CHANNEL=interrupts
-		;;
-	list_network_ipv4_interface|list_network_ip_interface)
-		CHANNEL=network
-		;;
-	list_module|kernel_module_load|kernel_module_free)
-		CHANNEL=modules
-		;;
-	*)
-		CHANNEL=
-		;;
-	esac
+	echo "connect $a default" > /proc/ltt
+#	#redirect markers carrying state information to dedicated channels
+#	case $a in
+#	list_process_state|list_file_descriptor|user_generic_thread_brand|fs_exec|kernel_process_fork|kernel_process_free|kernel_process_exit|kernel_arch_kthread_create|list_statedump_end|list_vm_map)
+#		CHANNEL=processes
+#		;;
+#	list_interrupt|statedump_idt_table|statedump_sys_call_table|statedump_softirq_vec)
+#		CHANNEL=interrupts
+#		;;
+#	list_network_ipv4_interface|list_network_ip_interface)
+#		CHANNEL=network
+#		;;
+#	list_module|kernel_module_load|kernel_module_free)
+#		CHANNEL=modules
+#		;;
+#	*)
+#		CHANNEL=
+#		;;
+#	esac
 
-	echo "connect $a default dynamic $CHANNEL" > /proc/ltt
 done
 
 
@@ -48,5 +49,5 @@ for a in $MARKERS; do
 		;;
 	esac
 
-	echo "connect $a ltt_tap_marker dynamic $CHANNEL" > /proc/ltt
+	echo "connect $a ltt_tap_marker" > /proc/ltt
 done
diff --git a/trunk/ltt-control/lttctl/ltt-disarmall.sh b/trunk/ltt-control/lttctl/ltt-disarmall.sh
index 027fb2e3..bf97a5f3 100755
--- a/trunk/ltt-control/lttctl/ltt-disarmall.sh
+++ b/trunk/ltt-control/lttctl/ltt-disarmall.sh
@@ -1,16 +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_|grep -v ^lockdep_|grep -v ^lockdep|grep -v ^tap_`
+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`
+
+IFS=$'\n'
 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}'|sort -u |grep ^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
 
-- 
2.34.1