From b618c9343e09b09ec2ed03192110b4fe0ad37abd Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Wed, 20 Feb 2013 14:49:16 +0100
Subject: [PATCH] Remove os/config

This patch moves the os/config examples to their respective run scripts,
removes some of them, and moves the priority example to the src/init
directory (where other examples are located).

Additionally, this patch adapts the OKL4-specific priority.run test to
the recent changes of the timer interface.
---
 base-okl4/run/priority.run                    | 12 +--
 os/config/bomb                                | 27 ------
 os/config/nested_config                       | 84 -------------------
 os/run/bomb.run                               | 27 +++++-
 .../priority => src/init/config.priority}     | 12 +++
 5 files changed, 44 insertions(+), 118 deletions(-)
 delete mode 100644 os/config/bomb
 delete mode 100644 os/config/nested_config
 rename os/{config/priority => src/init/config.priority} (87%)

diff --git a/base-okl4/run/priority.run b/base-okl4/run/priority.run
index f544ce9f7..7a57f5ec8 100644
--- a/base-okl4/run/priority.run
+++ b/base-okl4/run/priority.run
@@ -4,14 +4,14 @@ build "core init"
 
 create_boot_directory
 
-install_config "[exec cat [genode_dir]/os/config/priority]"
+install_config "[exec cat [genode_dir]/os/src/init/config.priority]"
 
 build_boot_image "core init"
 
 append qemu_args "-nographic -m 256"
 
 # run genode until the init->init.2 process gives us a life sign
-run_genode_until "init.2.*abort called.*\n" 100
+run_genode_until "init.2.*No children to start.*\n" 100
 
 puts "dumping priorities using the kernel debugger..."
 
@@ -34,9 +34,9 @@ set output $expect_out(buffer)
 grep_output {^\[}
 
 compare_output_to {
-	[128]: (roottask) (activati) (pager) (ioport) (init) (init) (init.1) (init.1) (init.2) (init.11) (init.12)
-	[112]: (init.11)
-	[ 96]: (init.12) (init.121) {init.121}
-	[ 64]: (init.2)
+	[128]: (roottask) (entrypoi) (pager) (signal) (ioport) (init) {init} (signal h) (init.1) {init.1} (init.2) (signal h) (init.11) (init.12)
+	[112]: {init.11} (signal h)
+	[ 96]: {init.12} (signal h) (init.121) {init.121} (signal h)
+	[ 64]: {init.2} (signal h)
 }
 
diff --git a/os/config/bomb b/os/config/bomb
deleted file mode 100644
index 5e43ff143..000000000
--- a/os/config/bomb
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- Init configuration for "fork bomb" -->
-
-<config prio_levels="2">
-	<parent-provides>
-		<service name="ROM"/>
-		<service name="RAM"/>
-		<service name="IRQ"/>
-		<service name="IO_MEM"/>
-		<service name="IO_PORT"/>
-		<service name="CAP"/>
-		<service name="PD"/>
-		<service name="RM"/>
-		<service name="CPU"/>
-		<service name="LOG"/>
-		<service name="SIGNAL"/>
-	</parent-provides>
-	<default-route>
-		<any-service> <parent/> <any-child/> </any-service>
-	</default-route>
-	<start name="timer">
-		<resource name="RAM" quantum="512K"/>
-		<provides><service name="Timer"/></provides>
-	</start>
-	<start name="bomb" priority="-1">
-		<resource name="RAM" quantum="2G"/>
-	</start>
-</config>
diff --git a/os/config/nested_config b/os/config/nested_config
deleted file mode 100644
index bbb531421..000000000
--- a/os/config/nested_config
+++ /dev/null
@@ -1,84 +0,0 @@
-<!--
-
-Test configuration for nested Init processes
-============================================
-
-The config node of each start entry shadows the
-'config' ROM file for the corresponding process.
-This way, an arbitrarily complex process tree
-can be described by only one central configuration
-file:
-
-  <config>
-    <start...>
-      ...
-      <config>
-        ...
-        ...
-      </config>
-    </start>
-  <config>
-
-Alternatively, a separate file can be specified
-as configuration for a start entry by using
-the 'configfile' tag:
-
-  <config>
-    <start...>
-      ...
-      <configfile>another_config</configfile>
-    </start>
-  <config>
-
--->
-
-<config>
-	<parent-provides>
-		<service name="CAP"/>
-		<service name="LOG"/>
-		<service name="ROM"/>
-		<service name="RAM"/>
-		<service name="CPU"/>
-		<service name="RM"/>
-		<service name="PD"/>
-		<service name="SIGNAL"/>
-	</parent-provides>
-	<start name="timer">
-		<resource name="RAM" quantum="1M"/>
-		<provides><service name="Timer"/></provides>
-		<route>
-			<service name="CAP">    <parent/> </service>
-			<service name="SIGNAL"> <parent/> </service>
-		</route>
-	</start>
-	<start name="init">
-		<resource name="RAM" quantum="1M"/>
-		<config>
-			<parent-provides>
-				<service name="Timer"/>
-				<service name="SIGNAL"/>
-				<service name="LOG"/>
-			</parent-provides>
-			<start name="test-timer">
-				<resource name="RAM" quantum="1M"/>
-				<route>
-					<service name="Timer">  <parent/> </service>
-					<service name="LOG">    <parent/> </service>
-					<service name="SIGNAL"> <parent/> </service>
-				</route>
-			</start>
-		</config>
-		<route>
-			<service name="Timer">   <child name="timer"/> </service>
-			<service name="LOG">     <parent/>             </service>
-			<service name="ROM">     <parent/>             </service>
-			<service name="RAM">     <parent/>             </service>
-			<service name="CAP">     <parent/>             </service>
-			<service name="CPU">     <parent/>             </service>
-			<service name="RM">      <parent/>             </service>
-			<service name="PD">      <parent/>             </service>
-			<service name="SIGNAL"/> <parent/>             </service>
-		</route>
-	</start>
-</config>
-
diff --git a/os/run/bomb.run b/os/run/bomb.run
index 687d9525a..eeef0f6f5 100644
--- a/os/run/bomb.run
+++ b/os/run/bomb.run
@@ -2,7 +2,32 @@ build "core init test/bomb drivers/timer"
 
 create_boot_directory
 
-install_config [exec cat "[genode_dir]/os/config/bomb"]
+install_config {
+<config prio_levels="2">
+	<parent-provides>
+		<service name="ROM"/>
+		<service name="RAM"/>
+		<service name="IRQ"/>
+		<service name="IO_MEM"/>
+		<service name="IO_PORT"/>
+		<service name="CAP"/>
+		<service name="PD"/>
+		<service name="RM"/>
+		<service name="CPU"/>
+		<service name="LOG"/>
+		<service name="SIGNAL"/>
+	</parent-provides>
+	<default-route>
+		<any-service> <parent/> <any-child/> </any-service>
+	</default-route>
+	<start name="timer">
+		<resource name="RAM" quantum="512K"/>
+		<provides><service name="Timer"/></provides>
+	</start>
+	<start name="bomb" priority="-1">
+		<resource name="RAM" quantum="2G"/>
+	</start>
+</config>}
 
 build_boot_image "core init bomb timer"
 
diff --git a/os/config/priority b/os/src/init/config.priority
similarity index 87%
rename from os/config/priority
rename to os/src/init/config.priority
index 878b758da..e4f4d3667 100644
--- a/os/config/priority
+++ b/os/src/init/config.priority
@@ -32,6 +32,7 @@ nodes:
 		<service name="RM"/>
 		<service name="CPU"/>
 		<service name="LOG"/>
+		<service name="SIGNAL"/>
 	</parent-provides>
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
@@ -55,6 +56,7 @@ nodes:
 				<service name="RM"/>
 				<service name="CPU"/>
 				<service name="LOG"/>
+				<service name="SIGNAL"/>
 			</parent-provides>
 			<default-route>
 				<any-service> <parent/> <any-child/> </any-service>
@@ -70,6 +72,16 @@ nodes:
 				<binary name="init"/>
 				<resource name="RAM" quantum="2M"/>
 				<config>
+					<parent-provides>
+						<service name="ROM"/>
+						<service name="CAP"/>
+						<service name="RM"/>
+						<service name="LOG"/>
+						<service name="SIGNAL"/>
+					</parent-provides>
+					<default-route>
+						<any-service> <parent/> </any-service>
+					</default-route>
 					<start name="init.121">
 						<binary name="init"/>
 						<resource name="RAM" quantum="768K"/>