From 4498137bd23eb8b5782845678f414c8bacea3395 Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Sun, 26 Feb 2017 02:35:07 +0100
Subject: [PATCH] cpu_sampler: drop sub-init from run scripts

Now that environment sessions can be routed directly, the sub-init is not
needed anymore.

Fixes #2294
---
 repos/gems/run/cpu_sampler.run      | 25 +++++--------------------
 repos/gems/run/cpu_sampler_noux.run | 25 +++++--------------------
 2 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/repos/gems/run/cpu_sampler.run b/repos/gems/run/cpu_sampler.run
index 99a49ef249..e5746a5bef 100644
--- a/repos/gems/run/cpu_sampler.run
+++ b/repos/gems/run/cpu_sampler.run
@@ -48,27 +48,12 @@ install_config {
 				<service name="CPU"/>
 			</provides>
 			<config sample_interval_ms="100" sample_duration_s="1">
-				<policy label="init -> test-cpu_sampler -> ep" />
+				<policy label="test-cpu_sampler -> ep" />
 			</config>
 		</start>
-		<start name="init">
-			<resource name="RAM" quantum="2M"/>
-			<config>
-				<parent-provides>
-					<service name="LOG"/>
-					<service name="CPU"/>
-					<service name="RAM"/>
-					<service name="ROM"/>
-					<service name="PD"/>
-				</parent-provides>
-				<default-route>
-					<any-service> <parent/> </any-service>
-				</default-route>
-				<start name="test-cpu_sampler">
-					<resource name="RAM" quantum="1M"/>
-					<config ld_verbose="yes"/>
-				</start>
-			</config>
+		<start name="test-cpu_sampler">
+			<resource name="RAM" quantum="1M"/>
+			<config ld_verbose="yes"/>
 			<route>
 				<service name="CPU"> <child name="cpu_sampler"/> </service>
 				<any-service> <parent/> </any-service>
@@ -104,4 +89,4 @@ run_genode_until "$match_string" 10
 
 regexp $match_string $output all func
 
-run_genode_until "\\\[init -> cpu_sampler -> samples -> init -> test-cpu_sampler -> ep\\\.1] \[0\]*$func" 2 [output_spawn_id]
+run_genode_until "\\\[init -> cpu_sampler -> samples -> test-cpu_sampler -> ep\\\.1] \[0\]*$func" 2 [output_spawn_id]
diff --git a/repos/gems/run/cpu_sampler_noux.run b/repos/gems/run/cpu_sampler_noux.run
index 138f43d7ad..c9f0cf3779 100644
--- a/repos/gems/run/cpu_sampler_noux.run
+++ b/repos/gems/run/cpu_sampler_noux.run
@@ -136,7 +136,7 @@ append config {
 				<dir name="home">
 					<inline name=".bashrc"> }
 append_if [get_cmd_switch --autopilot] config {
-						FILE=/samples/cpu_sampler/samples/init/test-cpu_sampler/ep.*.log
+						FILE=/samples/cpu_sampler/samples/test-cpu_sampler/ep.*.log
 						while true; do if [ -e $FILE ]; then cat $FILE; fi; done }
 append_if [expr ![get_cmd_switch --autopilot]] config {
 						echo "The sample data will appear in the /samples directory" }
@@ -168,7 +168,7 @@ append config {
 			<service name="CPU"/>
 		</provides>
 		<config sample_interval_ms="1000" sample_duration_s="10">
-			<policy label_prefix="init -> test-cpu_sampler ->" />
+			<policy label_prefix="test-cpu_sampler ->" />
 		</config>
 		<route>
 			<service name="LOG" label_prefix="samples"> <child name="fs_log"/> </service>
@@ -176,24 +176,9 @@ append config {
 		</route>
 	</start>
 
-	<start name="init">
-		<resource name="RAM" quantum="2M"/>
-		<config>
-			<parent-provides>
-				<service name="CPU"/>
-				<service name="LOG"/>
-				<service name="RAM"/>
-				<service name="ROM"/>
-				<service name="PD"/>
-			</parent-provides>
-			<default-route>
-				<any-service> <parent/> </any-service>
-			</default-route>
-			<start name="test-cpu_sampler">
-				<resource name="RAM" quantum="1M"/>
-				<config ld_verbose="yes"/>
-			</start>
-		</config>
+	<start name="test-cpu_sampler">
+		<resource name="RAM" quantum="1M"/>
+		<config ld_verbose="yes"/>
 		<route>
 			<service name="CPU"> <child name="cpu_sampler"/> </service>
 			<any-service> <parent/> </any-service>