From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Tue, 5 Jul 2016 22:10:17 +0000 (-0400)
Subject: Rename normal_* template to discard_*
X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=commitdiff_plain;h=b9ab74355457a5600cf761391e3a19b6e2dfbb75

Rename normal_* template to discard_*
---

diff --git a/extras/templates/session/Makefile.am b/extras/templates/session/Makefile.am
index c2d39a395..7be37ab50 100644
--- a/extras/templates/session/Makefile.am
+++ b/extras/templates/session/Makefile.am
@@ -1,17 +1,17 @@
 templatedir = $(datadir)/xml/lttng/template/session
 
-dist_template_DATA = normal_block.lttng live_block.lttng snapshot_block.lttng \
-		     normal_cpu.lttng live_cpu.lttng snapshot_cpu.lttng normal_memory.lttng \
-		     live_memory.lttng snapshot_memory.lttng normal_network.lttng live_network.lttng \
-		     snapshot_network.lttng normal_interrupt.lttng live_interrupt.lttng \
-		     snapshot_interrupt.lttng normal_sched_latency.lttng live_sched_latency.lttng \
-		     snapshot_sched_latency.lttng normal_syscall.lttng live_syscall.lttng \
-		     snapshot_syscall.lttng normal_lttng_analyses.lttng snapshot_lttng_analyses.lttng
+dist_template_DATA = discard_block.lttng live_block.lttng snapshot_block.lttng \
+		     discard_cpu.lttng live_cpu.lttng snapshot_cpu.lttng discard_memory.lttng \
+		     live_memory.lttng snapshot_memory.lttng discard_network.lttng live_network.lttng \
+		     snapshot_network.lttng discard_interrupt.lttng live_interrupt.lttng \
+		     snapshot_interrupt.lttng discard_sched_latency.lttng live_sched_latency.lttng \
+		     snapshot_sched_latency.lttng discard_syscall.lttng live_syscall.lttng \
+		     snapshot_syscall.lttng discard_lttng_analyses.lttng snapshot_lttng_analyses.lttng
 
-EXTRA_DIST = normal_block.lttng live_block.lttng snapshot_block.lttng \
-	     normal_cpu.lttng live_cpu.lttng snapshot_cpu.lttng normal_memory.lttng \
-	     live_memory.lttng snapshot_memory.lttng normal_network.lttng live_network.lttng \
-	     snapshot_network.lttng normal_interrupt.lttng live_interrupt.lttng \
-	     snapshot_interrupt.lttng normal_sched_latency.lttng live_sched_latency.lttng \
-	     snapshot_sched_latency.lttng normal_syscall.lttng live_syscall.lttng \
-	     snapshot_syscall.lttng normal_lttng_analyses.lttng
+EXTRA_DIST = discard_block.lttng live_block.lttng snapshot_block.lttng \
+	     discard_cpu.lttng live_cpu.lttng snapshot_cpu.lttng discard_memory.lttng \
+	     live_memory.lttng snapshot_memory.lttng discard_network.lttng live_network.lttng \
+	     snapshot_network.lttng discard_interrupt.lttng live_interrupt.lttng \
+	     snapshot_interrupt.lttng discard_sched_latency.lttng live_sched_latency.lttng \
+	     snapshot_sched_latency.lttng discard_syscall.lttng live_syscall.lttng \
+	     snapshot_syscall.lttng discard_lttng_analyses.lttng
diff --git a/extras/templates/session/discard_block.lttng b/extras/templates/session/discard_block.lttng
new file mode 100644
index 000000000..f03785a77
--- /dev/null
+++ b/extras/templates/session/discard_block.lttng
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sessions>
+	<session>
+		<domains>
+			<domain>
+				<type>KERNEL</type>
+				<buffer_type>GLOBAL</buffer_type>
+				<channels>
+					<channel>
+						<name>channel0</name>
+						<enabled>false</enabled>
+						<overwrite_mode>DISCARD</overwrite_mode>
+						<subbuffer_size>262144</subbuffer_size>
+						<subbuffer_count>4</subbuffer_count>
+						<switch_timer_interval>0</switch_timer_interval>
+						<read_timer_interval>200000</read_timer_interval>
+						<output_type>SPLICE</output_type>
+						<tracefile_size>0</tracefile_size>
+						<tracefile_count>0</tracefile_count>
+						<live_timer_interval>0</live_timer_interval>
+						<events>
+							<event>
+								<name>lttng_statedump_file_descriptor</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_process_state</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_block_device</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_exec</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_fork</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>block_bio_backmerge</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>block_bio_remap</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>block_dirty_buffer</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>block_rq_complete</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>block_rq_issue</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+						</events>
+						<contexts>
+							<context>
+								<type>PID</type>
+							</context>
+							<context>
+								<type>PROCNAME</type>
+							</context>
+							<context>
+								<type>VPID</type>
+							</context>
+						</contexts>
+					</channel>
+				</channels>
+				<trackers/>
+			</domain>
+		</domains>
+		<started>false</started>
+	</session>
+</sessions>
diff --git a/extras/templates/session/discard_cpu.lttng b/extras/templates/session/discard_cpu.lttng
new file mode 100644
index 000000000..ef06b33f3
--- /dev/null
+++ b/extras/templates/session/discard_cpu.lttng
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sessions>
+	<session>
+		<domains>
+			<domain>
+				<type>KERNEL</type>
+				<buffer_type>GLOBAL</buffer_type>
+				<channels>
+					<channel>
+						<name>channel0</name>
+						<enabled>false</enabled>
+						<overwrite_mode>DISCARD</overwrite_mode>
+						<subbuffer_size>262144</subbuffer_size>
+						<subbuffer_count>4</subbuffer_count>
+						<switch_timer_interval>0</switch_timer_interval>
+						<read_timer_interval>200000</read_timer_interval>
+						<output_type>SPLICE</output_type>
+						<tracefile_size>0</tracefile_size>
+						<tracefile_count>0</tracefile_count>
+						<live_timer_interval>0</live_timer_interval>
+						<events>
+							<event>
+								<name>lttng_statedump_file_descriptor</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_process_state</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_block_device</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_exec</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_fork</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_switch</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+						</events>
+						<contexts>
+							<context>
+								<type>PID</type>
+							</context>
+							<context>
+								<type>PROCNAME</type>
+							</context>
+							<context>
+								<type>VPID</type>
+							</context>
+						</contexts>
+					</channel>
+				</channels>
+				<trackers/>
+			</domain>
+		</domains>
+		<started>false</started>
+	</session>
+</sessions>
diff --git a/extras/templates/session/discard_interrupt.lttng b/extras/templates/session/discard_interrupt.lttng
new file mode 100644
index 000000000..6ed72e447
--- /dev/null
+++ b/extras/templates/session/discard_interrupt.lttng
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sessions>
+	<session>
+		<domains>
+			<domain>
+				<type>KERNEL</type>
+				<buffer_type>GLOBAL</buffer_type>
+				<channels>
+					<channel>
+						<name>channel0</name>
+						<enabled>false</enabled>
+						<overwrite_mode>DISCARD</overwrite_mode>
+						<subbuffer_size>262144</subbuffer_size>
+						<subbuffer_count>4</subbuffer_count>
+						<switch_timer_interval>0</switch_timer_interval>
+						<read_timer_interval>200000</read_timer_interval>
+						<output_type>SPLICE</output_type>
+						<tracefile_size>0</tracefile_size>
+						<tracefile_count>0</tracefile_count>
+						<live_timer_interval>0</live_timer_interval>
+						<events>
+							<event>
+								<name>lttng_statedump_file_descriptor</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_process_state</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_block_device</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_exec</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_fork</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>irq_softirq_entry</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>irq_softirq_exit</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>irq_softirq_raise</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>irq_handler_entry</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>irq_handler_exit</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+						</events>
+						<contexts>
+							<context>
+								<type>PID</type>
+							</context>
+							<context>
+								<type>PROCNAME</type>
+							</context>
+							<context>
+								<type>VPID</type>
+							</context>
+						</contexts>
+					</channel>
+				</channels>
+				<trackers/>
+			</domain>
+		</domains>
+		<started>false</started>
+	</session>
+</sessions>
diff --git a/extras/templates/session/discard_lttng_analyses.lttng b/extras/templates/session/discard_lttng_analyses.lttng
new file mode 100644
index 000000000..28e53f0d1
--- /dev/null
+++ b/extras/templates/session/discard_lttng_analyses.lttng
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sessions>
+	<session>
+		<domains>
+			<domain>
+				<type>KERNEL</type>
+				<buffer_type>GLOBAL</buffer_type>
+				<channels>
+					<channel>
+						<name>channel0</name>
+						<enabled>false</enabled>
+						<overwrite_mode>DISCARD</overwrite_mode>
+						<subbuffer_size>262144</subbuffer_size>
+						<subbuffer_count>4</subbuffer_count>
+						<switch_timer_interval>0</switch_timer_interval>
+						<read_timer_interval>200000</read_timer_interval>
+						<output_type>SPLICE</output_type>
+						<tracefile_size>0</tracefile_size>
+						<tracefile_count>0</tracefile_count>
+						<live_timer_interval>0</live_timer_interval>
+						<events>
+							<event>
+								<name>*</name>
+								<enabled>true</enabled>
+								<type>SYSCALL</type>
+							</event>
+							<event>
+								<name>sched_wakeup</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_waking</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>irq_softirq_entry</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>irq_softirq_exit</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>irq_softirq_raise</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>irq_handler_entry</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>irq_handler_exit</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>net_dev_xmit</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>netif_receive_skb</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>kmem_mm_page_alloc</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>kmem_mm_page_free</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>mm_vmscan_wakeup_kswapd</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_file_descriptor</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_process_state</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_block_device</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_exec</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_fork</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_switch</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+						</events>
+					</channel>
+				</channels>
+				<trackers/>
+			</domain>
+		</domains>
+		<started>false</started>
+	</session>
+</sessions>
diff --git a/extras/templates/session/discard_memory.lttng b/extras/templates/session/discard_memory.lttng
new file mode 100644
index 000000000..9d0644678
--- /dev/null
+++ b/extras/templates/session/discard_memory.lttng
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sessions>
+	<session>
+		<domains>
+			<domain>
+				<type>KERNEL</type>
+				<buffer_type>GLOBAL</buffer_type>
+				<channels>
+					<channel>
+						<name>channel0</name>
+						<enabled>false</enabled>
+						<overwrite_mode>DISCARD</overwrite_mode>
+						<subbuffer_size>262144</subbuffer_size>
+						<subbuffer_count>4</subbuffer_count>
+						<switch_timer_interval>0</switch_timer_interval>
+						<read_timer_interval>200000</read_timer_interval>
+						<output_type>SPLICE</output_type>
+						<tracefile_size>0</tracefile_size>
+						<tracefile_count>0</tracefile_count>
+						<live_timer_interval>0</live_timer_interval>
+						<events>
+							<event>
+								<name>lttng_statedump_file_descriptor</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_process_state</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_block_device</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_exec</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_fork</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>kmem_mm_page_alloc</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>kmem_mm_page_free</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>mm_vmscan_wakeup_kswapd</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+						</events>
+						<contexts>
+							<context>
+								<type>PID</type>
+							</context>
+							<context>
+								<type>PROCNAME</type>
+							</context>
+							<context>
+								<type>VPID</type>
+							</context>
+						</contexts>
+					</channel>
+				</channels>
+				<trackers/>
+			</domain>
+		</domains>
+		<started>false</started>
+	</session>
+</sessions>
diff --git a/extras/templates/session/discard_network.lttng b/extras/templates/session/discard_network.lttng
new file mode 100644
index 000000000..7b391e8a7
--- /dev/null
+++ b/extras/templates/session/discard_network.lttng
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sessions>
+	<session>
+		<domains>
+			<domain>
+				<type>KERNEL</type>
+				<buffer_type>GLOBAL</buffer_type>
+				<channels>
+					<channel>
+						<name>channel0</name>
+						<enabled>false</enabled>
+						<overwrite_mode>DISCARD</overwrite_mode>
+						<subbuffer_size>262144</subbuffer_size>
+						<subbuffer_count>4</subbuffer_count>
+						<switch_timer_interval>0</switch_timer_interval>
+						<read_timer_interval>200000</read_timer_interval>
+						<output_type>SPLICE</output_type>
+						<tracefile_size>0</tracefile_size>
+						<tracefile_count>0</tracefile_count>
+						<live_timer_interval>0</live_timer_interval>
+						<events>
+							<event>
+								<name>lttng_statedump_file_descriptor</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_process_state</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_block_device</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_exec</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_fork</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>net_dev_xmit</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>netif_receive_skb</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+						</events>
+						<contexts>
+							<context>
+								<type>PID</type>
+							</context>
+							<context>
+								<type>PROCNAME</type>
+							</context>
+							<context>
+								<type>VPID</type>
+							</context>
+						</contexts>
+					</channel>
+				</channels>
+				<trackers/>
+			</domain>
+		</domains>
+		<started>false</started>
+	</session>
+</sessions>
diff --git a/extras/templates/session/discard_sched_latency.lttng b/extras/templates/session/discard_sched_latency.lttng
new file mode 100644
index 000000000..1b7585353
--- /dev/null
+++ b/extras/templates/session/discard_sched_latency.lttng
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sessions>
+	<session>
+		<domains>
+			<domain>
+				<type>KERNEL</type>
+				<buffer_type>GLOBAL</buffer_type>
+				<channels>
+					<channel>
+						<name>channel0</name>
+						<enabled>false</enabled>
+						<overwrite_mode>DISCARD</overwrite_mode>
+						<subbuffer_size>262144</subbuffer_size>
+						<subbuffer_count>4</subbuffer_count>
+						<switch_timer_interval>0</switch_timer_interval>
+						<read_timer_interval>200000</read_timer_interval>
+						<output_type>SPLICE</output_type>
+						<tracefile_size>0</tracefile_size>
+						<tracefile_count>0</tracefile_count>
+						<live_timer_interval>0</live_timer_interval>
+						<events>
+							<event>
+								<name>lttng_statedump_file_descriptor</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_process_state</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_block_device</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_exec</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_fork</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_wakeup</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_waking</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+						</events>
+						<contexts>
+							<context>
+								<type>PID</type>
+							</context>
+							<context>
+								<type>PROCNAME</type>
+							</context>
+							<context>
+								<type>VPID</type>
+							</context>
+						</contexts>
+					</channel>
+				</channels>
+				<trackers/>
+			</domain>
+		</domains>
+		<started>false</started>
+	</session>
+</sessions>
diff --git a/extras/templates/session/discard_syscall.lttng b/extras/templates/session/discard_syscall.lttng
new file mode 100644
index 000000000..8912e1324
--- /dev/null
+++ b/extras/templates/session/discard_syscall.lttng
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sessions>
+	<session>
+		<domains>
+			<domain>
+				<type>KERNEL</type>
+				<buffer_type>GLOBAL</buffer_type>
+				<channels>
+					<channel>
+						<name>channel0</name>
+						<enabled>false</enabled>
+						<overwrite_mode>DISCARD</overwrite_mode>
+						<subbuffer_size>262144</subbuffer_size>
+						<subbuffer_count>4</subbuffer_count>
+						<switch_timer_interval>0</switch_timer_interval>
+						<read_timer_interval>200000</read_timer_interval>
+						<output_type>SPLICE</output_type>
+						<tracefile_size>0</tracefile_size>
+						<tracefile_count>0</tracefile_count>
+						<live_timer_interval>0</live_timer_interval>
+						<events>
+							<event>
+								<name>lttng_statedump_file_descriptor</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_process_state</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>lttng_statedump_block_device</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_exec</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>sched_process_fork</name>
+								<enabled>true</enabled>
+								<type>TRACEPOINT</type>
+							</event>
+							<event>
+								<name>*</name>
+								<enabled>true</enabled>
+								<type>SYSCALL</type>
+							</event>
+						</events>
+						<contexts>
+							<context>
+								<type>PID</type>
+							</context>
+							<context>
+								<type>PROCNAME</type>
+							</context>
+							<context>
+								<type>VPID</type>
+							</context>
+						</contexts>
+					</channel>
+				</channels>
+				<trackers/>
+			</domain>
+		</domains>
+		<started>false</started>
+	</session>
+</sessions>
diff --git a/extras/templates/session/normal_block.lttng b/extras/templates/session/normal_block.lttng
deleted file mode 100644
index f03785a77..000000000
--- a/extras/templates/session/normal_block.lttng
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sessions>
-	<session>
-		<domains>
-			<domain>
-				<type>KERNEL</type>
-				<buffer_type>GLOBAL</buffer_type>
-				<channels>
-					<channel>
-						<name>channel0</name>
-						<enabled>false</enabled>
-						<overwrite_mode>DISCARD</overwrite_mode>
-						<subbuffer_size>262144</subbuffer_size>
-						<subbuffer_count>4</subbuffer_count>
-						<switch_timer_interval>0</switch_timer_interval>
-						<read_timer_interval>200000</read_timer_interval>
-						<output_type>SPLICE</output_type>
-						<tracefile_size>0</tracefile_size>
-						<tracefile_count>0</tracefile_count>
-						<live_timer_interval>0</live_timer_interval>
-						<events>
-							<event>
-								<name>lttng_statedump_file_descriptor</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_process_state</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_block_device</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_exec</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_fork</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>block_bio_backmerge</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>block_bio_remap</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>block_dirty_buffer</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>block_rq_complete</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>block_rq_issue</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-						</events>
-						<contexts>
-							<context>
-								<type>PID</type>
-							</context>
-							<context>
-								<type>PROCNAME</type>
-							</context>
-							<context>
-								<type>VPID</type>
-							</context>
-						</contexts>
-					</channel>
-				</channels>
-				<trackers/>
-			</domain>
-		</domains>
-		<started>false</started>
-	</session>
-</sessions>
diff --git a/extras/templates/session/normal_cpu.lttng b/extras/templates/session/normal_cpu.lttng
deleted file mode 100644
index ef06b33f3..000000000
--- a/extras/templates/session/normal_cpu.lttng
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sessions>
-	<session>
-		<domains>
-			<domain>
-				<type>KERNEL</type>
-				<buffer_type>GLOBAL</buffer_type>
-				<channels>
-					<channel>
-						<name>channel0</name>
-						<enabled>false</enabled>
-						<overwrite_mode>DISCARD</overwrite_mode>
-						<subbuffer_size>262144</subbuffer_size>
-						<subbuffer_count>4</subbuffer_count>
-						<switch_timer_interval>0</switch_timer_interval>
-						<read_timer_interval>200000</read_timer_interval>
-						<output_type>SPLICE</output_type>
-						<tracefile_size>0</tracefile_size>
-						<tracefile_count>0</tracefile_count>
-						<live_timer_interval>0</live_timer_interval>
-						<events>
-							<event>
-								<name>lttng_statedump_file_descriptor</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_process_state</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_block_device</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_exec</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_fork</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_switch</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-						</events>
-						<contexts>
-							<context>
-								<type>PID</type>
-							</context>
-							<context>
-								<type>PROCNAME</type>
-							</context>
-							<context>
-								<type>VPID</type>
-							</context>
-						</contexts>
-					</channel>
-				</channels>
-				<trackers/>
-			</domain>
-		</domains>
-		<started>false</started>
-	</session>
-</sessions>
diff --git a/extras/templates/session/normal_interrupt.lttng b/extras/templates/session/normal_interrupt.lttng
deleted file mode 100644
index 6ed72e447..000000000
--- a/extras/templates/session/normal_interrupt.lttng
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sessions>
-	<session>
-		<domains>
-			<domain>
-				<type>KERNEL</type>
-				<buffer_type>GLOBAL</buffer_type>
-				<channels>
-					<channel>
-						<name>channel0</name>
-						<enabled>false</enabled>
-						<overwrite_mode>DISCARD</overwrite_mode>
-						<subbuffer_size>262144</subbuffer_size>
-						<subbuffer_count>4</subbuffer_count>
-						<switch_timer_interval>0</switch_timer_interval>
-						<read_timer_interval>200000</read_timer_interval>
-						<output_type>SPLICE</output_type>
-						<tracefile_size>0</tracefile_size>
-						<tracefile_count>0</tracefile_count>
-						<live_timer_interval>0</live_timer_interval>
-						<events>
-							<event>
-								<name>lttng_statedump_file_descriptor</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_process_state</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_block_device</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_exec</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_fork</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>irq_softirq_entry</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>irq_softirq_exit</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>irq_softirq_raise</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>irq_handler_entry</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>irq_handler_exit</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-						</events>
-						<contexts>
-							<context>
-								<type>PID</type>
-							</context>
-							<context>
-								<type>PROCNAME</type>
-							</context>
-							<context>
-								<type>VPID</type>
-							</context>
-						</contexts>
-					</channel>
-				</channels>
-				<trackers/>
-			</domain>
-		</domains>
-		<started>false</started>
-	</session>
-</sessions>
diff --git a/extras/templates/session/normal_lttng_analyses.lttng b/extras/templates/session/normal_lttng_analyses.lttng
deleted file mode 100644
index 28e53f0d1..000000000
--- a/extras/templates/session/normal_lttng_analyses.lttng
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sessions>
-	<session>
-		<domains>
-			<domain>
-				<type>KERNEL</type>
-				<buffer_type>GLOBAL</buffer_type>
-				<channels>
-					<channel>
-						<name>channel0</name>
-						<enabled>false</enabled>
-						<overwrite_mode>DISCARD</overwrite_mode>
-						<subbuffer_size>262144</subbuffer_size>
-						<subbuffer_count>4</subbuffer_count>
-						<switch_timer_interval>0</switch_timer_interval>
-						<read_timer_interval>200000</read_timer_interval>
-						<output_type>SPLICE</output_type>
-						<tracefile_size>0</tracefile_size>
-						<tracefile_count>0</tracefile_count>
-						<live_timer_interval>0</live_timer_interval>
-						<events>
-							<event>
-								<name>*</name>
-								<enabled>true</enabled>
-								<type>SYSCALL</type>
-							</event>
-							<event>
-								<name>sched_wakeup</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_waking</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>irq_softirq_entry</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>irq_softirq_exit</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>irq_softirq_raise</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>irq_handler_entry</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>irq_handler_exit</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>net_dev_xmit</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>netif_receive_skb</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>kmem_mm_page_alloc</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>kmem_mm_page_free</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>mm_vmscan_wakeup_kswapd</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_file_descriptor</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_process_state</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_block_device</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_exec</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_fork</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_switch</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-						</events>
-					</channel>
-				</channels>
-				<trackers/>
-			</domain>
-		</domains>
-		<started>false</started>
-	</session>
-</sessions>
diff --git a/extras/templates/session/normal_memory.lttng b/extras/templates/session/normal_memory.lttng
deleted file mode 100644
index 9d0644678..000000000
--- a/extras/templates/session/normal_memory.lttng
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sessions>
-	<session>
-		<domains>
-			<domain>
-				<type>KERNEL</type>
-				<buffer_type>GLOBAL</buffer_type>
-				<channels>
-					<channel>
-						<name>channel0</name>
-						<enabled>false</enabled>
-						<overwrite_mode>DISCARD</overwrite_mode>
-						<subbuffer_size>262144</subbuffer_size>
-						<subbuffer_count>4</subbuffer_count>
-						<switch_timer_interval>0</switch_timer_interval>
-						<read_timer_interval>200000</read_timer_interval>
-						<output_type>SPLICE</output_type>
-						<tracefile_size>0</tracefile_size>
-						<tracefile_count>0</tracefile_count>
-						<live_timer_interval>0</live_timer_interval>
-						<events>
-							<event>
-								<name>lttng_statedump_file_descriptor</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_process_state</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_block_device</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_exec</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_fork</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>kmem_mm_page_alloc</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>kmem_mm_page_free</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>mm_vmscan_wakeup_kswapd</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-						</events>
-						<contexts>
-							<context>
-								<type>PID</type>
-							</context>
-							<context>
-								<type>PROCNAME</type>
-							</context>
-							<context>
-								<type>VPID</type>
-							</context>
-						</contexts>
-					</channel>
-				</channels>
-				<trackers/>
-			</domain>
-		</domains>
-		<started>false</started>
-	</session>
-</sessions>
diff --git a/extras/templates/session/normal_network.lttng b/extras/templates/session/normal_network.lttng
deleted file mode 100644
index 7b391e8a7..000000000
--- a/extras/templates/session/normal_network.lttng
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sessions>
-	<session>
-		<domains>
-			<domain>
-				<type>KERNEL</type>
-				<buffer_type>GLOBAL</buffer_type>
-				<channels>
-					<channel>
-						<name>channel0</name>
-						<enabled>false</enabled>
-						<overwrite_mode>DISCARD</overwrite_mode>
-						<subbuffer_size>262144</subbuffer_size>
-						<subbuffer_count>4</subbuffer_count>
-						<switch_timer_interval>0</switch_timer_interval>
-						<read_timer_interval>200000</read_timer_interval>
-						<output_type>SPLICE</output_type>
-						<tracefile_size>0</tracefile_size>
-						<tracefile_count>0</tracefile_count>
-						<live_timer_interval>0</live_timer_interval>
-						<events>
-							<event>
-								<name>lttng_statedump_file_descriptor</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_process_state</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_block_device</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_exec</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_fork</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>net_dev_xmit</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>netif_receive_skb</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-						</events>
-						<contexts>
-							<context>
-								<type>PID</type>
-							</context>
-							<context>
-								<type>PROCNAME</type>
-							</context>
-							<context>
-								<type>VPID</type>
-							</context>
-						</contexts>
-					</channel>
-				</channels>
-				<trackers/>
-			</domain>
-		</domains>
-		<started>false</started>
-	</session>
-</sessions>
diff --git a/extras/templates/session/normal_sched_latency.lttng b/extras/templates/session/normal_sched_latency.lttng
deleted file mode 100644
index 1b7585353..000000000
--- a/extras/templates/session/normal_sched_latency.lttng
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sessions>
-	<session>
-		<domains>
-			<domain>
-				<type>KERNEL</type>
-				<buffer_type>GLOBAL</buffer_type>
-				<channels>
-					<channel>
-						<name>channel0</name>
-						<enabled>false</enabled>
-						<overwrite_mode>DISCARD</overwrite_mode>
-						<subbuffer_size>262144</subbuffer_size>
-						<subbuffer_count>4</subbuffer_count>
-						<switch_timer_interval>0</switch_timer_interval>
-						<read_timer_interval>200000</read_timer_interval>
-						<output_type>SPLICE</output_type>
-						<tracefile_size>0</tracefile_size>
-						<tracefile_count>0</tracefile_count>
-						<live_timer_interval>0</live_timer_interval>
-						<events>
-							<event>
-								<name>lttng_statedump_file_descriptor</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_process_state</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_block_device</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_exec</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_fork</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_wakeup</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_waking</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-						</events>
-						<contexts>
-							<context>
-								<type>PID</type>
-							</context>
-							<context>
-								<type>PROCNAME</type>
-							</context>
-							<context>
-								<type>VPID</type>
-							</context>
-						</contexts>
-					</channel>
-				</channels>
-				<trackers/>
-			</domain>
-		</domains>
-		<started>false</started>
-	</session>
-</sessions>
diff --git a/extras/templates/session/normal_syscall.lttng b/extras/templates/session/normal_syscall.lttng
deleted file mode 100644
index 8912e1324..000000000
--- a/extras/templates/session/normal_syscall.lttng
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sessions>
-	<session>
-		<domains>
-			<domain>
-				<type>KERNEL</type>
-				<buffer_type>GLOBAL</buffer_type>
-				<channels>
-					<channel>
-						<name>channel0</name>
-						<enabled>false</enabled>
-						<overwrite_mode>DISCARD</overwrite_mode>
-						<subbuffer_size>262144</subbuffer_size>
-						<subbuffer_count>4</subbuffer_count>
-						<switch_timer_interval>0</switch_timer_interval>
-						<read_timer_interval>200000</read_timer_interval>
-						<output_type>SPLICE</output_type>
-						<tracefile_size>0</tracefile_size>
-						<tracefile_count>0</tracefile_count>
-						<live_timer_interval>0</live_timer_interval>
-						<events>
-							<event>
-								<name>lttng_statedump_file_descriptor</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_process_state</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>lttng_statedump_block_device</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_exec</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>sched_process_fork</name>
-								<enabled>true</enabled>
-								<type>TRACEPOINT</type>
-							</event>
-							<event>
-								<name>*</name>
-								<enabled>true</enabled>
-								<type>SYSCALL</type>
-							</event>
-						</events>
-						<contexts>
-							<context>
-								<type>PID</type>
-							</context>
-							<context>
-								<type>PROCNAME</type>
-							</context>
-							<context>
-								<type>VPID</type>
-							</context>
-						</contexts>
-					</channel>
-				</channels>
-				<trackers/>
-			</domain>
-		</domains>
-		<started>false</started>
-	</session>
-</sessions>