update newline fix

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

diff --git a/trunk/ltt-control/lttctl/ltt-armall.sh b/trunk/ltt-control/lttctl/ltt-armall.sh
index d71828bd70d31854c3984944c611ef401b0eacc7..5481b76148e4f2199c694ee90792af68d35b3b33 100755 (executable)
--- a/trunk/ltt-control/lttctl/ltt-armall.sh
+++ b/trunk/ltt-control/lttctl/ltt-armall.sh
@@ -2,31 +2,33 @@
 #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=$'\r'
 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
 
 
@@ -38,6 +40,8 @@ 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 -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 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