X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=trunk%2Fltt-control%2Flttctl%2Fltt-armall.sh;h=5481b76148e4f2199c694ee90792af68d35b3b33;hb=d81c12176969a7e55583de8ada804dd1228c179d;hp=08cc32eb866d008f44556ece979e8a63b7e27e61;hpb=a17fd94a1c51dcd77cc10fc8ba7cd47fa3fd7e63;p=ltt-control.git

diff --git a/trunk/ltt-control/lttctl/ltt-armall.sh b/trunk/ltt-control/lttctl/ltt-armall.sh
index 08cc32e..5481b76 100755
--- a/trunk/ltt-control/lttctl/ltt-armall.sh
+++ b/trunk/ltt-control/lttctl/ltt-armall.sh
@@ -2,42 +2,46 @@
 #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`
 
+#separator is newline, ensure compatibility with bash and ash
+IFS=$'
'
 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
 
 
 # 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`
 
+#separator is newline, ensure compatibility with bash and ash
+IFS=$'
'
 for a in $MARKERS; do
 	echo Connecting $a
 
@@ -48,5 +52,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