X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=trunk%2Fltt-control%2Flttctl%2Fltt-armall.sh;h=f0824c819eebab7a9656b2ebf69714a10b5b46c1;hb=27828bc1b0010ee87c2f68e31fb77fd4ae39fa6b;hp=fe103d14a98ea3dc3c8e6a61a2f33c0911d0336c;hpb=68e706073e952526392e4e69bf995b72ac332fd0;p=lttv.git

diff --git a/trunk/ltt-control/lttctl/ltt-armall.sh b/trunk/ltt-control/lttctl/ltt-armall.sh
index fe103d14..f0824c81 100755
--- a/trunk/ltt-control/lttctl/ltt-armall.sh
+++ b/trunk/ltt-control/lttctl/ltt-armall.sh
@@ -1,58 +1,47 @@
 #excluding core markers (already connected)
 #excluding locking markers (high traffic)
 
+DEBUGFSROOT=$(grep ^debugfs /proc/mounts | head -1 | awk '{print $2}')
+MARKERSROOT=${DEBUGFSROOT}/ltt/markers
+
 echo Connecting all markers
-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
-N="
-"
+for c in ${MARKERSROOT}/*; do
+	case ${c} in
+	${MARKERSROOT}/metadata)
+		;;
+	${MARKERSROOT}/locking)
+		;;
+	${MARKERSROOT}/lockdep)
+		;;
+	*)
+		for m in ${c}/*; do
+			echo Connecting ${m}
+			echo 1 > ${m}/enable
+		done
+		;;
+	esac
+done
 
-IFS=${N}
-for a in $MARKERS; do
-	echo Connecting $a
 
-	echo "connect $a default" > /proc/ltt
+# 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 -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`
+#
+#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
-
-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 -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`
-
-IFS=${N}
-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" > /proc/ltt
-done
+#
+#	echo "connect $a ltt_tap_marker" > /proc/ltt
+#done