ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-23 10:44:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

init: apply routing to environment sessions

Browse Source 
The init component used to create the CPU/RAM/PD/ROM sessions (the child
environment) for its children by issuing session requests to its parent,
which is typically core. This policy was hard-wired. This patch enables
the routing of the environment sessions of the children of init
according to the configured routing policy.

Because there is no hard-wired policy regarding the environment sessions
anymore, routes to respective services must be explicitly declared in
the init configuration. For this reason, the patch adjusts several run
scripts in this respect.

This patch removes the outdated '<if-args>' special handling of session
labels. The '<if-args>' feature will eventually be removed completely
(ref #2250)

Issue #2197
Issue #2215
Issue #2233
Issue #2250
This commit is contained in:
Norman Feske 2017-01-18 17:10:07 +01:00
parent c1e399025e
commit 02d5efcf3f
45 changed files with 300 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
repos/base-linux/run/lx_hybrid_ctors.run
View File

@ -24,6 +24,9 @@ install_config {
<config> <config>
<parent-provides> <parent-provides>
<service name="ROM"/> <service name="ROM"/>
<service name="RAM"/>
<service name="CPU"/>
<service name="PD"/>
<service name="LOG"/> <service name="LOG"/>
</parent-provides> </parent-provides>
<default-route> <default-route>

3
repos/base-linux/run/lx_hybrid_exception.run
View File

@ -23,6 +23,9 @@ install_config {
<config> <config>
<parent-provides> <parent-provides>
<service name="ROM"/> <service name="ROM"/>
<service name="RAM"/>
<service name="CPU"/>
<service name="PD"/>
<service name="LOG"/> <service name="LOG"/>
</parent-provides> </parent-provides>
<default-route> <default-route>

3
repos/base-linux/run/lx_hybrid_pthread_ipc.run
View File

@ -20,6 +20,9 @@ install_config {
<config> <config>
<parent-provides> <parent-provides>
<service name="ROM"/> <service name="ROM"/>
<service name="RAM"/>
<service name="CPU"/>
<service name="PD"/>
<service name="LOG"/> <service name="LOG"/>
</parent-provides> </parent-provides>
<default-route> <default-route>

2
repos/base/run/affinity.run
View File

@ -31,7 +31,7 @@ set config {
<parent-provides> <parent-provides>
<service name="LOG"/> <service name="LOG"/>
<service name="CPU"/> <service name="CPU"/>
<service name="RM"/> <service name="PD"/>
<service name="RAM"/> <service name="RAM"/>
<service name="ROM"/> <service name="ROM"/>
<service name="IO_MEM"/> <service name="IO_MEM"/>

5
repos/base/run/log.run
View File

@ -6,7 +6,10 @@ install_config {
<config> <config>
<parent-provides> <parent-provides>
<service name="LOG"/> <service name="LOG"/>
<service name="RM"/> <service name="PD"/>
<service name="CPU"/>
<service name="ROM"/>
<service name="RAM"/>
</parent-provides> </parent-provides>
<default-route> <default-route>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>

5
repos/base/run/mp_server.run
View File

@ -14,8 +14,9 @@ install_config {
<parent-provides> <parent-provides>
<service name="LOG"/> <service name="LOG"/>
<service name="CPU"/> <service name="CPU"/>
<service name="RM"/> <service name="RAM"/>
<service name="CAP"/> <service name="ROM"/>
<service name="PD"/>
</parent-provides> </parent-provides>
<default-route> <default-route>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>

5
repos/base/run/new_delete.run
View File

@ -6,7 +6,10 @@ install_config {
<config> <config>
<parent-provides> <parent-provides>
<service name="LOG"/> <service name="LOG"/>
<service name="RM"/> <service name="RAM"/>
<service name="ROM"/>
<service name="CPU"/>
<service name="PD"/>
</parent-provides> </parent-provides>
<default-route> <default-route>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>

13
repos/base/run/platform_drv.inc
View File

@ -81,9 +81,13 @@ proc append_platform_drv_config {} {
append config { append config {
<resource name="RAM" quantum="3M"/> <resource name="RAM" quantum="3M"/>
<route> <route>
<service name="LOG"> <parent/> </service>
<service name="IO_MEM"> <parent/> </service> <service name="IO_MEM"> <parent/> </service>
<service name="RM"> <parent/> </service> <service name="LOG"> <parent/> </service>
<service name="PD"> <parent/> </service>
<service name="RM"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="RAM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="Report"> <child name="acpi_report_rom"/> </service> <service name="Report"> <child name="acpi_report_rom"/> </service>
</route> </route>
</start>} </start>}
@ -103,7 +107,10 @@ proc append_platform_drv_config {} {
</config> </config>
<route> <route>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
<service name="RM"> <parent/> </service> <service name="PD"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="RAM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
</route> </route>
</start>} </start>}

3
repos/base/run/thread.run
View File

@ -18,6 +18,9 @@ set config {
<parent-provides> <parent-provides>
<service name="LOG"/> <service name="LOG"/>
<service name="CPU"/> <service name="CPU"/>
<service name="RAM"/>
<service name="ROM"/>
<service name="PD"/>
</parent-provides> </parent-provides>
<default-route> <default-route>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>

12
repos/gems/run/cpu_load_display.run
View File

@ -139,14 +139,16 @@ append config {
<report activity="yes" affinity="yes"/> <report activity="yes" affinity="yes"/>
</config> </config>
<route> <route>
<any-service> <child name="report_rom"/> <any-child/> <parent/> </any-service> <service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>
<start name="cpu_load_display"> <start name="cpu_load_display">
<resource name="RAM" quantum="6M"/> <resource name="RAM" quantum="6M"/>
<route> <route>
<any-service> <child name="report_rom"/> <any-child/> <parent/> </any-service> <service name="ROM" label="trace_subjects"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>
@ -182,7 +184,8 @@ append config {
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<configfile name="cpu_burner1.config"/> <configfile name="cpu_burner1.config"/>
<route> <route>
<any-service> <child name="dynamic_rom"/> <any-child/> <parent/> </any-service> <service name="ROM" label="cpu_burner1.config"> <child name="dynamic_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>
@ -191,7 +194,8 @@ append config {
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<configfile name="cpu_burner2.config"/> <configfile name="cpu_burner2.config"/>
<route> <route>
<any-service> <child name="dynamic_rom"/> <any-child/> <parent/> </any-service> <service name="ROM" label="cpu_burner2.config"> <child name="dynamic_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>
</config>} </config>}

10
repos/gems/run/cpu_sampler.run
View File

@ -17,7 +17,6 @@ create_boot_directory
install_config { install_config {
<config> <config>
<parent-provides> <parent-provides>
<service name="CAP"/>
<service name="CPU"/> <service name="CPU"/>
<service name="IO_PORT"/> <service name="IO_PORT"/>
<service name="IRQ"/> <service name="IRQ"/>
@ -25,8 +24,6 @@ install_config {
<service name="PD"/> <service name="PD"/>
<service name="RAM"/> <service name="RAM"/>
<service name="ROM"/> <service name="ROM"/>
<service name="RM"/>
<service name="SIGNAL"/>
</parent-provides> </parent-provides>
<default-route> <default-route>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
@ -50,10 +47,11 @@ install_config {
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<config> <config>
<parent-provides> <parent-provides>
<service name="CAP"/>
<service name="LOG"/> <service name="LOG"/>
<service name="RM"/> <service name="CPU"/>
<service name="SIGNAL"/> <service name="RAM"/>
<service name="ROM"/>
<service name="PD"/>
</parent-provides> </parent-provides>
<default-route> <default-route>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>

15
repos/gems/run/cpu_sampler_noux.run
View File

@ -157,7 +157,7 @@ append config {
</start> </start>
<start name="cpu_sampler"> <start name="cpu_sampler">
<resource name="RAM" quantum="32M"/> <resource name="RAM" quantum="4M"/>
<provides> <provides>
<service name="CPU"/> <service name="CPU"/>
</provides> </provides>
@ -171,19 +171,20 @@ append config {
</start> </start>
<start name="init"> <start name="init">
<resource name="RAM" quantum="16M"/> <resource name="RAM" quantum="2M"/>
<config> <config>
<parent-provides> <parent-provides>
<service name="CAP"/> <service name="CPU"/>
<service name="LOG"/> <service name="LOG"/>
<service name="RM"/> <service name="RAM"/>
<service name="SIGNAL"/> <service name="ROM"/>
<service name="PD"/>
</parent-provides> </parent-provides>
<default-route> <default-route>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</default-route> </default-route>
<start name="test-cpu_sampler"> <start name="test-cpu_sampler">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="1M"/>
<config ld_verbose="yes"/> <config ld_verbose="yes"/>
</start> </start>
</config> </config>
@ -194,7 +195,7 @@ append config {
</start> </start>
<start name="noux"> <start name="noux">
<resource name="RAM" quantum="1G" /> <resource name="RAM" quantum="16M" />
<config> <config>
<fstab> <fstab>
<tar name="coreutils.tar" /> <tar name="coreutils.tar" />

9
repos/gems/run/decorator.run
View File

@ -24,7 +24,8 @@ append config {
<parent-provides> <parent-provides>
<service name="ROM"/> <service name="ROM"/>
<service name="RAM"/> <service name="RAM"/>
<service name="RM"/> <service name="CPU"/>
<service name="PD"/>
<service name="LOG"/> <service name="LOG"/>
<service name="IRQ"/> <service name="IRQ"/>
<service name="IO_MEM"/> <service name="IO_MEM"/>
@ -154,12 +155,10 @@ append config {
<start name="decorator"> <start name="decorator">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<route> <route>
<service name="ROM"> <service name="ROM" label="pointer">
<if-arg key="label" value="pointer" />
<child name="report_rom" /> <child name="report_rom" />
</service> </service>
<service name="ROM"> <service name="ROM" label="window_layout">
<if-arg key="label" value="window_layout" />
<child name="dynamic_rom" /> <child name="dynamic_rom" />
</service> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>

12
repos/gems/run/decorator_stress.run
View File

@ -130,14 +130,10 @@ append config {
<start name="decorator"> <start name="decorator">
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="8M"/>
<route> <route>
<service name="ROM"> <service name="ROM" label="pointer">
<if-arg key="label" value="pointer" /> <child name="report_rom" /> </service>
<child name="report_rom" /> <service name="ROM" label="window_layout">
</service> <child name="report_rom" /> </service>
<service name="ROM">
<if-arg key="label" value="window_layout" />
<child name="report_rom" />
</service>
<service name="Report"> <child name="report_rom"/> </service> <service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>

26
repos/gems/run/launcher.run
View File

@ -115,7 +115,7 @@ append config {
<hover domain="decorator"/> <hover domain="decorator"/>
</config> </config>
<route> <route>
<service name="ROM"> <child name="report_rom"/> </service> <service name="ROM" label="hover"> <child name="report_rom"/> </service>
<service name="Nitpicker"> <child name="nitpicker"/> </service> <service name="Nitpicker"> <child name="nitpicker"/> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
@ -124,7 +124,7 @@ append config {
<start name="status_bar"> <start name="status_bar">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<route> <route>
<service name="ROM"> <child name="report_rom"/> </service> <service name="ROM" label="focus"> <child name="report_rom"/> </service>
<service name="Nitpicker"> <child name="nitpicker"/> </service> <service name="Nitpicker"> <child name="nitpicker"/> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
@ -163,8 +163,10 @@ append config {
<policy label_prefix="launcher -> testnit" role="direct"/> <policy label_prefix="launcher -> testnit" role="direct"/>
</config> </config>
<route> <route>
<service name="ROM" label="focus"> <child name="report_rom"/> </service>
<service name="ROM" label="resize_request"> <child name="report_rom"/> </service>
<any-service> <any-service>
<child name="nitpicker"/> <child name="report_rom"/> <parent/> <any-child/> <child name="nitpicker"/> <parent/> <any-child/>
</any-service> </any-service>
</route> </route>
</start> </start>
@ -173,8 +175,12 @@ append config {
<binary name="floating_window_layouter"/> <binary name="floating_window_layouter"/>
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<route> <route>
<service name="ROM" label="window_list"> <child name="report_rom"/> </service>
<service name="ROM" label="focus_request"> <child name="report_rom"/> </service>
<service name="ROM" label="hover"> <child name="report_rom"/> </service>
<service name="ROM" label="decorator_margins"> <child name="report_rom"/> </service>
<any-service> <any-service>
<child name="wm"/> <child name="report_rom"/> <parent/> <any-child/> <child name="wm"/> <parent/> <any-child/>
</any-service> </any-service>
</route> </route>
</start> </start>
@ -186,8 +192,12 @@ append config {
<route> <route>
<service name="ROM" label="decorator.config"> <service name="ROM" label="decorator.config">
<child name="decorator_config"/> </service> <child name="decorator_config"/> </service>
<service name="ROM" label="window_layout">
<child name="report_rom"/> </service>
<service name="ROM" label="pointer">
<child name="report_rom"/> </service>
<any-service> <any-service>
<child name="wm"/> <child name="report_rom"/> <parent/> <any-child/> <child name="wm"/> <parent/> <any-child/>
</any-service> </any-service>
</route> </route>
</start> </start>
@ -220,7 +230,7 @@ append config {
</config> </config>
<route> <route>
<service name="ROM"> <child name="report_rom"/> </service> <service name="ROM" label="xray"> <child name="report_rom"/> </service>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</route> </route>
</start> </start>
@ -270,9 +280,7 @@ append config {
</config> </config>
<route> <route>
<service name="ROM"> <if-arg key="label" value="focus"/> <service name="ROM" label="focus"> <child name="report_rom" /> </service>
<child name="report_rom" />
</service>
<any-service> <child name="wm"/> <parent/> <any-child/> </any-service> <any-service> <child name="wm"/> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>

16
repos/gems/run/menu_view.run
View File

@ -24,6 +24,8 @@ create_boot_directory
append config { append config {
<config> <config>
<parent-provides> <parent-provides>
<service name="PD"/>
<service name="CPU"/>
<service name="ROM"/> <service name="ROM"/>
<service name="RAM"/> <service name="RAM"/>
<service name="RM"/> <service name="RM"/>
@ -117,16 +119,14 @@ append config {
<start name="menu_view"> <start name="menu_view">
<resource name="RAM" quantum="5M"/> <resource name="RAM" quantum="5M"/>
<config xpos="200" ypos="100"> <config xpos="200" ypos="100">
<libc> <libc stderr="/dev/log"/>
<vfs> <vfs>
<tar name="menu_view_styles.tar" /> <tar name="menu_view_styles.tar" />
</vfs> <dir name="dev"> <log/> </dir>
</libc> </vfs>
</config> </config>
<route> <route>
<service name="ROM"> <if-arg key="label" value="dialog"/> <service name="ROM" label="dialog"> <child name="dynamic_rom" /> </service>
<child name="dynamic_rom" />
</service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>

2
repos/gems/run/mixer_gui_qt_test.run
View File

@ -192,7 +192,7 @@ append config {
</config> </config>
<route> <route>
<service name="Nitpicker"> <child name="wm"/> </service> <service name="Nitpicker"> <child name="wm"/> </service>
<service name="ROM"> <if-arg key="label" value="channel_list" /> <child name="dynamic_rom" /> </service> <service name="ROM" label="channel_list"> <child name="dynamic_rom" /> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start>} </start>}

8
repos/gems/run/nano3d.run
View File

@ -14,8 +14,6 @@ set build_components {
app/backdrop app/backdrop
} }
lappend_if [have_spec usb] build_components drivers/usb
build $build_components build $build_components
create_boot_directory create_boot_directory
@ -110,10 +108,8 @@ append config {
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="8M"/>
<configfile name="nano3d.config"/> <configfile name="nano3d.config"/>
<route> <route>
<service name="ROM"> <service name="ROM" label="nano3d.config">
<if-arg key="label" value="nano3d.config" /> <child name="dynamic_rom" /> </service>
<child name="dynamic_rom" />
</service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>

5
repos/gems/run/nit_fader.run
View File

@ -25,7 +25,8 @@ append config {
<parent-provides> <parent-provides>
<service name="ROM"/> <service name="ROM"/>
<service name="RAM"/> <service name="RAM"/>
<service name="RM"/> <service name="CPU"/>
<service name="PD"/>
<service name="LOG"/> <service name="LOG"/>
<service name="IRQ"/> <service name="IRQ"/>
<service name="IO_MEM"/> <service name="IO_MEM"/>
@ -93,7 +94,7 @@ append config {
<provides><service name="Nitpicker"/></provides> <provides><service name="Nitpicker"/></provides>
<configfile name="nit_fader.config" /> <configfile name="nit_fader.config" />
<route> <route>
<service name="ROM"> <if-arg key="label" value="nit_fader.config"/> <service name="ROM" label="nit_fader.config">
<child name="dynamic_rom" /> <child name="dynamic_rom" />
</service> </service>
<service name="Nitpicker"> <child name="nitpicker" /> </service> <service name="Nitpicker"> <child name="nitpicker" /> </service>

16
repos/gems/run/wm.run
View File

@ -142,8 +142,10 @@ append config {
<policy label_prefix="layouter" role="layouter"/> <policy label_prefix="layouter" role="layouter"/>
</config> </config>
<route> <route>
<service name="ROM" label="resize_request"> <child name="report_rom"/> </service>
<service name="ROM" label="focus"> <child name="report_rom"/> </service>
<any-service> <any-service>
<child name="nitpicker"/> <child name="report_rom"/> <parent/> <any-child/> <child name="nitpicker"/> <parent/> <any-child/>
</any-service> </any-service>
</route> </route>
</start> </start>
@ -151,8 +153,12 @@ append config {
<binary name="floating_window_layouter"/> <binary name="floating_window_layouter"/>
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<route> <route>
<service name="ROM" label="window_list"> <child name="report_rom"/> </service>
<service name="ROM" label="focus_request"> <child name="report_rom"/> </service>
<service name="ROM" label="hover"> <child name="report_rom"/> </service>
<service name="ROM" label="decorator_margins"> <child name="report_rom"/> </service>
<any-service> <any-service>
<child name="wm"/> <child name="report_rom"/> <parent/> <any-child/> <child name="wm"/> <parent/> <any-child/>
</any-service> </any-service>
</route> </route>
</start> </start>
@ -163,8 +169,12 @@ append config {
<controls> <maximizer/> <title/> </controls> <controls> <maximizer/> <title/> </controls>
</config> </config>
<route> <route>
<service name="ROM" label="window_layout">
<child name="report_rom"/> </service>
<service name="ROM" label="pointer">
<child name="report_rom"/> </service>
<any-service> <any-service>
<child name="wm"/> <child name="report_rom"/> <parent/> <any-child/> <child name="wm"/> <parent/> <any-child/>
</any-service> </any-service>
</route> </route>
</start> </start>

4
repos/libports/run/ldso.run
View File

@ -6,8 +6,10 @@ set config {
<config> <config>
<parent-provides> <parent-provides>
<service name="ROM"/> <service name="ROM"/>
<service name="RAM"/>
<service name="CPU"/>
<service name="LOG"/> <service name="LOG"/>
<service name="RM" /> <service name="PD"/>
</parent-provides> </parent-provides>
<default-route> <default-route>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>

3
repos/libports/run/moon.run
View File

@ -9,8 +9,9 @@ create_boot_directory
install_config { install_config {
<config> <config>
<parent-provides> <parent-provides>
<service name="PD"/>
<service name="ROM"/> <service name="ROM"/>
<service name="RM"/> <service name="RAM"/>
<service name="LOG"/> <service name="LOG"/>
<service name="IO_PORT"/> <service name="IO_PORT"/>
<service name="IO_MEM"/> <service name="IO_MEM"/>

6
repos/libports/run/rust.run
View File

@ -6,8 +6,10 @@ install_config {
<config> <config>
<parent-provides> <parent-provides>
<service name="LOG"/> <service name="LOG"/>
<service name="RM"/> <service name="PD"/>
<service name="ROM"/> <service name="ROM"/>
<service name="RAM"/>
<service name="CPU"/>
</parent-provides> </parent-provides>
<default-route> <default-route>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>

4
repos/libports/run/stdcxx.run
View File

@ -8,8 +8,10 @@ install_config {
<config> <config>
<parent-provides> <parent-provides>
<service name="LOG"/> <service name="LOG"/>
<service name="RM"/> <service name="PD"/>
<service name="ROM"/> <service name="ROM"/>
<service name="RAM"/>
<service name="CPU"/>
</parent-provides> </parent-provides>
<default-route> <default-route>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>

108
repos/os/include/init/child.h
View File

@ -125,35 +125,27 @@ namespace Init {
/** /**
* Return sub string of label with the leading child name stripped out * Return sub string of label with the leading child name stripped out
*
* \return character pointer to the scoped part of the label,
* or nullptr if the label is not correctly prefixed with the child's
* name
*/ */
inline char const *skip_label_prefix(char const *child_name, char const *label) inline char const *skip_label_prefix(char const *child_name, char const *label)
{ {
size_t const child_name_len = strlen(child_name); size_t const child_name_len = strlen(child_name);
/* if (strcmp(child_name, label, child_name_len) != 0)
* If the method was called with a valid "label" string, the return nullptr;
* following condition should be always satisfied. See the
* comment in 'service_node_args_condition_satisfied'.
*/
if (strcmp(child_name, label, child_name_len) == 0)
label += child_name_len;
/* label += child_name_len;
* If the original label was empty, the 'Child_policy_enforce_labeling'
* does not append a label separator after the child-name prefix. In
* this case, we resulting label is empty.
*/
if (*label == 0)
return label;
/* /*
* Skip label separator. This condition should be always satisfied. * Skip label separator. This condition should be always satisfied.
*/ */
if (strcmp(" -> ", label, 4) == 0) if (strcmp(" -> ", label, 4) != 0)
return label + 4; return nullptr;
warning("cannot skip label prefix while processing <if-arg>"); return label + 4;
return label;
} }
@ -176,53 +168,26 @@ namespace Init {
if (!service_matches) if (!service_matches)
return false; return false;
Session_label const session_label(skip_label_prefix( bool const route_depends_on_child_provided_label =
child_name.string(), label_from_args(args).string())); service_node.has_attribute("label") ||
service_node.has_attribute("label_prefix") ||
service_node.has_attribute("label_suffix");
if (!route_depends_on_child_provided_label)
return true;
char const * const scoped_label = skip_label_prefix(
child_name.string(), label_from_args(args).string());
if (!scoped_label)
return false;
Session_label const session_label(scoped_label);
return !Xml_node_label_score(service_node, session_label).conflict(); return !Xml_node_label_score(service_node, session_label).conflict();
} }
/**
* Check if arguments satisfy the condition specified for the route
*/
inline bool service_node_args_condition_satisfied(Xml_node service_node,
Session_state::Args const &args,
Child_policy::Name const &child_name)
{
try {
Xml_node if_arg = service_node.sub_node("if-arg");
enum { KEY_MAX_LEN = 64, VALUE_MAX_LEN = 64 };
char key[KEY_MAX_LEN];
char value[VALUE_MAX_LEN];
if_arg.attribute("key").value(key, sizeof(key));
if_arg.attribute("value").value(value, sizeof(value));
char arg_value[VALUE_MAX_LEN];
Arg_string::find_arg(args.string(), key).string(arg_value, sizeof(arg_value), "");
/*
* Skip child-name prefix if the key is the process "label".
*
* Because 'filter_session_args' is called prior the call of
* 'resolve_session_request' from the 'Child::session' method,
* 'args' contains the filtered arguments, in particular the label
* prefixed with the child's name. For the 'if-args' declaration,
* however, we want to omit specifying this prefix because the
* session route is specific to the named start node anyway. So
* the prefix information is redundant.
*/
if (strcmp("label", key) == 0)
return strcmp(value, skip_label_prefix(child_name.string(), arg_value)) == 0;
return strcmp(value, arg_value) == 0;
} catch (...) { }
/* if no if-arg node exists, the condition is met */
return true;
}
/** /**
* Check if service name is ambiguous * Check if service name is ambiguous
* *
@ -566,7 +531,10 @@ class Init::Child : Child_policy, Child_service::Wakeup
name, _child.ram_session_cap(), *this); name, _child.ram_session_cap(), *this);
} }
} catch (Xml_node::Nonexistent_sub_node) { } }
catch (Xml_node::Nonexistent_sub_node) { }
catch (Genode::Child::Inactive) {
error(this->name(), ": incomplete environment at construction time"); }
} }
virtual ~Child() virtual ~Child()
@ -622,20 +590,7 @@ class Init::Child : Child_policy, Child_service::Wakeup
Service &resolve_session_request(Service::Name const &service_name, Service &resolve_session_request(Service::Name const &service_name,
Session_state::Args const &args) override Session_state::Args const &args) override
{ {
/* route environment session requests to the parent */
Session_label const label(label_from_args(args.string())); Session_label const label(label_from_args(args.string()));
if (label == name()) {
if (service_name == Ram_session::service_name()) return _env_ram_service;
if (service_name == Cpu_session::service_name()) return _env_cpu_service;
if (service_name == Pd_session::service_name()) return _env_pd_service;
if (service_name == Log_session::service_name()) return _env_log_service;
}
/* route initial ROM requests (binary and linker) to the parent */
if (service_name == Rom_session::service_name()) {
if (label.last_element() == binary_name()) return _env_rom_service;
if (label.last_element() == linker_name()) return _env_rom_service;
}
Service *service = nullptr; Service *service = nullptr;
@ -646,7 +601,7 @@ class Init::Child : Child_policy, Child_service::Wakeup
/* check for "session_requests" ROM request */ /* check for "session_requests" ROM request */
if (service_name == Rom_session::service_name() if (service_name == Rom_session::service_name()
&& label.last_element() == Session_requester::rom_name()) && label.last_element() == Session_requester::rom_name())
return _session_requester.service(); return _session_requester.service();
try { try {
Xml_node route_node = _default_route_node; Xml_node route_node = _default_route_node;
@ -662,9 +617,6 @@ class Init::Child : Child_policy, Child_service::Wakeup
if (!service_node_matches(service_node, args.string(), name(), service_name)) if (!service_node_matches(service_node, args.string(), name(), service_name))
continue; continue;
if (!service_node_args_condition_satisfied(service_node, args, name()))
continue;
Xml_node target = service_node.sub_node(); Xml_node target = service_node.sub_node();
for (; ; target = target.next()) { for (; ; target = target.next()) {

20
repos/os/run/clipboard.run
View File

@ -20,7 +20,8 @@ append config {
<parent-provides> <parent-provides>
<service name="ROM"/> <service name="ROM"/>
<service name="RAM"/> <service name="RAM"/>
<service name="RM"/> <service name="CPU"/>
<service name="PD"/>
<service name="LOG"/> <service name="LOG"/>
<service name="IRQ"/> <service name="IRQ"/>
<service name="IO_MEM"/> <service name="IO_MEM"/>
@ -62,7 +63,8 @@ append config {
</config> </config>
<route> <route>
<any-service> <child name="report_rom"/> <parent/> </any-service> <service name="ROM" label="focus"> <child name="report_rom"/> </service>
<any-service> <parent/> </any-service>
</route> </route>
</start> </start>
@ -70,15 +72,15 @@ append config {
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<route> <route>
<!-- for the simulation of nitpicker's focus reports --> <!-- for the simulation of nitpicker's focus reports -->
<service name="Report"> <service name="Report" label="focus"> <child name="report_rom"/> </service>
<if-arg key="label" value="focus"/>
<child name="report_rom" />
</service>
<!-- for the simulation of clipboard clients --> <!-- for the simulation of clipboard clients -->
<any-service> <service name="ROM" label="linux -> clipboard"> <child name="clipboard"/> </service>
<child name="clipboard"/> <any-child/> <parent/> <service name="ROM" label="win7 -> clipboard"> <child name="clipboard"/> </service>
</any-service> <service name="ROM" label="noux -> clipboard"> <child name="clipboard"/> </service>
<service name="Report"> <child name="clipboard"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<any-service> <parent/> </any-service>
</route> </route>
</start> </start>

6
repos/os/run/demo.run
View File

@ -160,7 +160,7 @@ append config {
</output> </output>
</config> </config>
<route> <route>
<service name="ROM"> <child name="report_rom"/> </service> <service name="ROM" label="xray"> <child name="report_rom"/> </service>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</route> </route>
</start> </start>
@ -175,7 +175,7 @@ append config {
</config> </config>
<route> <route>
<service name="Report"> <child name="report_rom"/> </service> <service name="Report"> <child name="report_rom"/> </service>
<service name="ROM"> <child name="report_rom"/> </service> <service name="ROM" label="hover"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>
@ -200,7 +200,7 @@ append config {
<start name="status_bar"> <start name="status_bar">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<route> <route>
<service name="ROM"> <child name="report_rom"/> </service> <service name="ROM" label="focus"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>

5
repos/os/run/ram_fs_chunk.run
View File

@ -11,7 +11,10 @@ create_boot_directory
install_config { install_config {
<config> <config>
<parent-provides> <parent-provides>
<service name="RM"/> <service name="PD"/>
<service name="ROM"/>
<service name="RAM"/>
<service name="CPU"/>
<service name="LOG"/> <service name="LOG"/>
</parent-provides> </parent-provides>
<default-route> <default-route>

7
repos/os/run/rom_filter.run
View File

@ -20,8 +20,9 @@ append config {
<parent-provides> <parent-provides>
<service name="ROM"/> <service name="ROM"/>
<service name="RAM"/> <service name="RAM"/>
<service name="RM"/> <service name="PD"/>
<service name="LOG"/> <service name="LOG"/>
<service name="CPU"/>
<service name="IRQ"/> <service name="IRQ"/>
<service name="IO_MEM"/> <service name="IO_MEM"/>
<service name="IO_PORT"/> <service name="IO_PORT"/>
@ -90,7 +91,7 @@ append config {
</config> </config>
<route> <route>
<service name="ROM"> <child name="dynamic_rom"/> </service> <service name="ROM" label="xray"> <child name="dynamic_rom"/> </service>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</route> </route>
</start> </start>
@ -99,7 +100,7 @@ append config {
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<config rom="generated" /> <config rom="generated" />
<route> <route>
<service name="ROM"> <child name="rom_filter"/> </service> <service name="ROM" label="generated"> <child name="rom_filter"/> </service>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</route> </route>
</start> </start>

6
repos/os/run/tar_rom.run
View File

@ -54,7 +54,8 @@ install_config {
<config verbose="yes"> <config verbose="yes">
<parent-provides> <parent-provides>
<service name="ROM"/> <service name="ROM"/>
<service name="RM"/> <service name="CPU"/>
<service name="PD"/>
<service name="RAM"/> <service name="RAM"/>
<service name="LOG"/> <service name="LOG"/>
<service name="Timer"/> <service name="Timer"/>
@ -65,7 +66,8 @@ install_config {
</start> </start>
</config> </config>
<route> <route>
<any-service> <child name="tar_rom"/> <parent/> <any-child/> </any-service> <service name="ROM" label="test-timer"> <child name="tar_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>
</config> </config>

5
repos/os/run/xml_node.run
View File

@ -6,7 +6,10 @@ install_config {
<config> <config>
<parent-provides> <parent-provides>
<service name="LOG"/> <service name="LOG"/>
<service name="RM"/> <service name="CPU"/>
<service name="RAM"/>
<service name="ROM"/>
<service name="PD"/>
</parent-provides> </parent-provides>
<default-route> <default-route>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>

9
repos/os/src/app/cli_monitor/gdb_command_config
View File

@ -25,12 +25,9 @@
<start name="noux"> <start name="noux">
<resource name="RAM" quantum="24M"/> <resource name="RAM" quantum="24M"/>
<route> <route>
<service name="Terminal"> <service name="Terminal" label=""> <parent/> </service>
<if-arg key="label" value=""/><parent/> <service name="Terminal" label="noux(terminal_fs)">
</service> <child name="terminal_gdb"/> </service>
<service name="Terminal">
<if-arg key="label" value="noux(terminal_fs)"/><child name="terminal_gdb"/>
</service>
<any-service> <any-child/> <parent/> </any-service> <any-service> <any-child/> <parent/> </any-service>
</route> </route>
<config> <config>

10
repos/os/src/server/input_merger/README
View File

@ -12,12 +12,10 @@ Example configuration:
<input label="usb_hid" /> <input label="usb_hid" />
</config> </config>
<route> <route>
<service name="Input"> <service name="Input" label="ps2">
<if-arg key="label" value="ps2" /> <child name="ps2_drv" /> <child name="ps2_drv"/> </service>
</service> <service name="Input" label="usb_hid">
<service name="Input"> <child name="usb_drv" /> </service>
<if-arg key="label" value="usb_hid" /> <child name="usb_drv" />
</service>
<any-service> <parent /> <any-child /> </any-service> <any-service> <parent /> <any-child /> </any-service>
</route> </route>
</start> </start>

4
repos/os/src/test/fault_detection/main.cc
View File

@ -187,7 +187,9 @@ struct Faulting_loader_grand_child_test
"<config>\n" "<config>\n"
" <parent-provides>\n" " <parent-provides>\n"
" <service name=\"ROM\"/>\n" " <service name=\"ROM\"/>\n"
" <service name=\"RM\"/>\n" " <service name=\"RAM\"/>\n"
" <service name=\"CPU\"/>\n"
" <service name=\"PD\"/>\n"
" <service name=\"LOG\"/>\n" " <service name=\"LOG\"/>\n"
" </parent-provides>\n" " </parent-provides>\n"
" <default-route>\n" " <default-route>\n"

4
repos/ports/run/arora.run
View File

@ -95,9 +95,7 @@ append config {
<route> <route>
<service name="Nitpicker"> <child name="wm"/> </service> <service name="Nitpicker"> <child name="wm"/> </service>
<service name="Report"> <child name="clipboard"/> </service> <service name="Report"> <child name="clipboard"/> </service>
<service name="ROM"> <service name="ROM" label="clipboard"> <child name="clipboard"/> </service>
<if-arg key="label" value="clipboard"/> <child name="clipboard"/>
</service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>

2
repos/ports/run/netperf.inc
View File

@ -216,7 +216,7 @@ append_if $use_wifi_driver config {
<route> <route>
<service name="Rtc"> <any-child/> </service> <service name="Rtc"> <any-child/> </service>
<service name="File_system"> <child name="config_fs"/> </service> <service name="File_system"> <child name="config_fs"/> </service>
<service name="ROM"> <if-arg key="label" value="wlan_configuration" /> <child name="config_rom" /> </service> <service name="ROM" label="wlan_configuration"> <child name="config_rom" /> </service>
<service name="Report"> <child name="report_rom"/> </service> <service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child /> </any-service> <any-service> <parent/> <any-child /> </any-service>
</route> </route>

8
repos/ports/run/noux_gdb.run
View File

@ -162,11 +162,11 @@ append config {
<start name="noux"> <start name="noux">
<resource name="RAM" quantum="1G"/> <resource name="RAM" quantum="1G"/>
<route> <route>
<service name="Terminal"> <service name="Terminal" label="">
<if-arg key="label" value=""/><child name="terminal_noux"/> <child name="terminal_noux"/>
</service> </service>
<service name="Terminal"> <service name="Terminal" label="/dev/gdb">
<if-arg key="label" value="/dev/gdb"/><child name="terminal_gdb"/> <child name="terminal_gdb"/>
</service> </service>
<any-service><parent/><any-child/></any-service> <any-service><parent/><any-child/></any-service>
</route> </route>

10
repos/ports/run/noux_terminal_fs.run
View File

@ -159,12 +159,10 @@ append config {
<start name="noux"> <start name="noux">
<resource name="RAM" quantum="1G" /> <resource name="RAM" quantum="1G" />
<route> <route>
<service name="Terminal"> <service name="Terminal" label="">
<if-arg key="label" value=""/><child name="terminal_noux"/> <child name="terminal_noux"/> </service>
</service> <service name="Terminal" label="terminal_fs">
<service name="Terminal"> <child name="terminal_test"/> </service>
<if-arg key="label" value="terminal_fs"/><child name="terminal_test"/>
</service>
<any-service><parent/><any-child/></any-service> <any-service><parent/><any-child/></any-service>
</route> </route>
<config> <config>

19
repos/ports/run/noux_trace_fs.run
View File

@ -180,17 +180,14 @@ append config {
</start> </start>
</config> </config>
<route> <route>
<service name="File_system"> <service name="File_system" label="home">
<if-arg key="label" value="home"/> <child name="ram_fs" /> </service> <child name="ram_fs" /> </service>
<service name="File_system"> <service name="File_system" label="root">
<if-arg key="label" value="root"/> <child name="ram_fs" /> <child name="ram_fs" /> </service>
</service> <service name="File_system" label="tmp">
<service name="File_system"> <child name="ram_fs" /> </service>
<if-arg key="label" value="tmp"/> <child name="ram_fs" /> <service name="File_system" label="trace">
</service> <child name="trace_fs"/> </service>
<service name="File_system">
<if-arg key="label" value="trace"/> <child name="trace_fs"/>
</service>
<any-service> <parent /> <any-child /> </any-service> <any-service> <parent /> <any-child /> </any-service>
</route> </route>
</start> </start>

1
repos/ports/run/seoul.inc
View File

@ -214,7 +214,6 @@ append_if $use_nic_session config {
<start name="nic_drv" priority="-2"> <start name="nic_drv" priority="-2">
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="8M"/>
<provides><service name="Nic"/></provides> <provides><service name="Nic"/></provides>
<route> <any-service><any-child/><parent/></any-service> </route>
</start> </start>
} }

4
repos/ports/run/vbox_auto_genode_usb_hid.run
View File

@ -176,9 +176,7 @@ append config {
</config> </config>
<route> <route>
<service name="Report"><child name="report_rom" /></service> <service name="Report"><child name="report_rom" /></service>
<service name="ROM"> <service name="ROM" label="usb_devices"> <child name="report_rom"/> </service>
<if-arg key="label" value="usb_devices"/> <child name="report_rom"/>
</service>
<any-service> <parent/> <any-child /> </any-service> <any-service> <parent/> <any-child /> </any-service>
</route> </route>
</start> </start>

15
repos/ports/run/vbox_auto_win7_share.run
View File

@ -171,12 +171,10 @@ set config_of_app {
</start> </start>
</config> </config>
<route> <route>
<service name="File_system"> <service name="File_system" label="share_from">
<if-arg key="label" value="share_from"/>
<child name="ram_fs_from"/> <child name="ram_fs_from"/>
</service> </service>
<service name="File_system"> <service name="File_system" label="share_to">
<if-arg key="label" value="share_to"/>
<child name="ram_fs_to"/> <child name="ram_fs_to"/>
</service> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
@ -235,18 +233,15 @@ append config_of_app {
<service name="Report"> <child name="report_rom"/> </service>} <service name="Report"> <child name="report_rom"/> </service>}
append_if [expr $use_ram_fs] config_of_app { append_if [expr $use_ram_fs] config_of_app {
<service name="File_system"> <service name="File_system" label="from_ram_fs">
<if-arg key="label" value="from_ram_fs"/>
<child name="ram_fs"/> <child name="ram_fs"/>
</service>} </service>}
append config_of_app { append config_of_app {
<service name="File_system"> <service name="File_system" label="share_ram_fs_from">
<if-arg key="label" value="share_ram_fs_from"/>
<child name="ram_fs_from"/> <child name="ram_fs_from"/>
</service> </service>
<service name="File_system"> <service name="File_system" label="share_ram_fs_to">
<if-arg key="label" value="share_ram_fs_to"/>
<child name="ram_fs_to"/> <child name="ram_fs_to"/>
</service> </service>
<service name="File_system"> <child name="rump_fs"/> </service> <service name="File_system"> <child name="rump_fs"/> </service>

102
repos/ports/run/vbox_pointer.run
View File

@ -35,7 +35,6 @@ set config {
<service name="IO_MEM"/> <service name="IO_MEM"/>
<service name="IO_PORT"/> <service name="IO_PORT"/>
<service name="PD"/> <service name="PD"/>
<service name="RM"/>
<service name="CPU"/> <service name="CPU"/>
<service name="LOG"/> <service name="LOG"/>
</parent-provides> </parent-provides>
@ -44,9 +43,11 @@ set config {
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides> <service name="Timer"/> </provides> <provides> <service name="Timer"/> </provides>
<route> <route>
<service name="RM"> <parent/> </service> <service name="RAM"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="ROM"> <parent/> </service>
<service name="ROM"> <parent/> </service> <service name="CPU"> <parent/> </service>
<service name="PD"> <parent/> </service>
<service name="LOG"> <parent/> </service>
</route> </route>
</start> </start>
<start name="fb_sdl"> <start name="fb_sdl">
@ -58,9 +59,12 @@ set config {
<config buffered="yes" width="1280" height="720" depth="16"/> <config buffered="yes" width="1280" height="720" depth="16"/>
<!--<config buffered="yes" width="1440" height="900" depth="16"/>--> <!--<config buffered="yes" width="1440" height="900" depth="16"/>-->
<route> <route>
<service name="RM"> <parent/> </service> <service name="RAM"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="ROM"> <parent/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="CPU"> <parent/> </service>
<service name="PD"> <parent/> </service>
<service name="LOG"> <parent/> </service>
<service name="Timer"> <child name="timer"/> </service>
</route> </route>
</start> </start>
<alias name="input_drv" child="fb_sdl"/> <alias name="input_drv" child="fb_sdl"/>
@ -76,8 +80,12 @@ set config {
<policy label="pointer -> focus" report="nitpicker -> focus"/> <policy label="pointer -> focus" report="nitpicker -> focus"/>
</config> </config>
<route> <route>
<service name="RM"> <parent/> </service> <service name="RAM"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="ROM"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="PD"> <parent/> </service>
<service name="PD"> <parent/> </service>
<service name="LOG"> <parent/> </service>
</route> </route>
</start> </start>
<start name="nitpicker"> <start name="nitpicker">
@ -96,7 +104,10 @@ set config {
<background color="#00426f"/> <!-- indigo --> <background color="#00426f"/> <!-- indigo -->
</config> </config>
<route> <route>
<service name="RM"> <parent/> </service> <service name="RAM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="PD"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="Timer"> <child name="timer"/> </service>
<service name="Framebuffer"> <child name="fb_drv"/> </service> <service name="Framebuffer"> <child name="fb_drv"/> </service>
@ -116,8 +127,11 @@ set config {
<policy label="pointer -> smiley" report="shape-smiley -> shape"/> <policy label="pointer -> smiley" report="shape-smiley -> shape"/>
</config> </config>
<route> <route>
<service name="RM"> <parent/> </service> <service name="PD"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="RAM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="LOG"> <parent/> </service>
</route> </route>
</start> </start>
<start name="shape-arrow"> <start name="shape-arrow">
@ -125,6 +139,10 @@ set config {
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<config shape="arrow"/> <config shape="arrow"/>
<route> <route>
<service name="PD"> <parent/> </service>
<service name="RAM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
<service name="Report"> <child name="report_rom_shapes"/> </service> <service name="Report"> <child name="report_rom_shapes"/> </service>
</route> </route>
@ -134,6 +152,10 @@ set config {
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<config shape="blade"/> <config shape="blade"/>
<route> <route>
<service name="PD"> <parent/> </service>
<service name="RAM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
<service name="Report"> <child name="report_rom_shapes"/> </service> <service name="Report"> <child name="report_rom_shapes"/> </service>
</route> </route>
@ -143,6 +165,10 @@ set config {
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<config shape="bladex"/> <config shape="bladex"/>
<route> <route>
<service name="PD"> <parent/> </service>
<service name="RAM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
<service name="Report"> <child name="report_rom_shapes"/> </service> <service name="Report"> <child name="report_rom_shapes"/> </service>
</route> </route>
@ -164,9 +190,12 @@ set config {
</rom> </rom>
</config> </config>
<route> <route>
<service name="RM"> <parent/> </service> <service name="RAM"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="ROM"> <parent/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="CPU"> <parent/> </service>
<service name="PD"> <parent/> </service>
<service name="LOG"> <parent/> </service>
<service name="Timer"> <child name="timer"/> </service>
</route> </route>
</start> </start>
<start name="shape-smiley"> <start name="shape-smiley">
@ -174,10 +203,14 @@ set config {
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<configfile name="smiley.config"/> <configfile name="smiley.config"/>
<route> <route>
<service name="LOG"> <parent/> </service> <service name="ROM" label="smiley.config">
<service name="ROM"> <if-args key="label" value="smiley.config"/> <child name="shape-smiley-config"/> </service>
<child name="shape-smiley-config"/> </service>
<service name="Report"> <child name="report_rom_shapes"/> </service> <service name="Report"> <child name="report_rom_shapes"/> </service>
<service name="RAM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="PD"> <parent/> </service>
<service name="LOG"> <parent/> </service>
</route> </route>
</start> </start>
@ -191,14 +224,18 @@ set config {
<policy label="test-label-bladex" rom="bladex"/> <policy label="test-label-bladex" rom="bladex"/>
</config> </config>
<route> <route>
<service name="RM"> <parent/> </service> <service name="PD"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
<service name="Nitpicker"> <child name="nitpicker"/> </service> <service name="Nitpicker"> <child name="nitpicker"/> </service>
<service name="ROM"> <if-arg key="label" value="xray"/> <service name="ROM" label="xray"> <child name="report_rom_nitpicker"/> </service>
<child name="report_rom_nitpicker"/> </service> <service name="ROM" label="hover"> <child name="report_rom_nitpicker"/> </service>
<service name="ROM"> <if-arg key="label" value="hover"/> <service name="ROM" label="arrow"> <child name="report_rom_shapes"/> </service>
<child name="report_rom_nitpicker"/> </service> <service name="ROM" label="blade"> <child name="report_rom_shapes"/> </service>
<service name="ROM"> <child name="report_rom_shapes"/> </service> <service name="ROM" label="bladex"> <child name="report_rom_shapes"/> </service>
<service name="ROM" label="smiley"> <child name="report_rom_shapes"/> </service>
<service name="RAM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="CPU"> <parent/> </service>
</route> </route>
</start> </start>
@ -206,11 +243,11 @@ set config {
<binary name="testnit"/> <binary name="testnit"/>
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<route> <route>
<service name="RM"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
<service name="PD"> <parent/> </service> <service name="PD"> <parent/> </service>
<service name="CPU"> <parent/> </service> <service name="CPU"> <parent/> </service>
<service name="RAM"> <parent/> </service> <service name="RAM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="Timer"> <child name="timer"/> </service>
<service name="Nitpicker"> <child name="nitpicker"/> </service> <service name="Nitpicker"> <child name="nitpicker"/> </service>
</route> </route>
@ -219,11 +256,11 @@ set config {
<binary name="testnit"/> <binary name="testnit"/>
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<route> <route>
<service name="RM"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
<service name="PD"> <parent/> </service> <service name="PD"> <parent/> </service>
<service name="CPU"> <parent/> </service> <service name="CPU"> <parent/> </service>
<service name="RAM"> <parent/> </service> <service name="RAM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="Timer"> <child name="timer"/> </service>
<service name="Nitpicker"> <child name="nitpicker"/> </service> <service name="Nitpicker"> <child name="nitpicker"/> </service>
</route> </route>
@ -232,11 +269,11 @@ set config {
<binary name="testnit"/> <binary name="testnit"/>
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<route> <route>
<service name="RM"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
<service name="PD"> <parent/> </service> <service name="PD"> <parent/> </service>
<service name="CPU"> <parent/> </service> <service name="CPU"> <parent/> </service>
<service name="RAM"> <parent/> </service> <service name="RAM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="Timer"> <child name="timer"/> </service>
<service name="Nitpicker"> <child name="nitpicker"/> </service> <service name="Nitpicker"> <child name="nitpicker"/> </service>
</route> </route>
@ -245,11 +282,11 @@ set config {
<binary name="testnit"/> <binary name="testnit"/>
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<route> <route>
<service name="RM"> <parent/> </service>
<service name="LOG"> <parent/> </service>
<service name="PD"> <parent/> </service> <service name="PD"> <parent/> </service>
<service name="LOG"> <parent/> </service>
<service name="CPU"> <parent/> </service> <service name="CPU"> <parent/> </service>
<service name="RAM"> <parent/> </service> <service name="RAM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="Timer"> <child name="timer"/> </service>
<service name="Nitpicker"> <child name="nitpicker"/> </service> <service name="Nitpicker"> <child name="nitpicker"/> </service>
</route> </route>
@ -258,10 +295,11 @@ set config {
<binary name="testnit"/> <binary name="testnit"/>
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<route> <route>
<service name="RM"> <parent/> </service> <service name="PD"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
<service name="CPU"> <parent/> </service> <service name="CPU"> <parent/> </service>
<service name="RAM"> <parent/> </service> <service name="RAM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="Timer"> <child name="timer"/> </service>
<service name="Nitpicker"> <child name="nitpicker"/> </service> <service name="Nitpicker"> <child name="nitpicker"/> </service>
</route> </route>
@ -270,11 +308,11 @@ set config {
<binary name="testnit"/> <binary name="testnit"/>
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<route> <route>
<service name="RM"> <parent/> </service>
<service name="LOG"> <parent/> </service>
<service name="PD"> <parent/> </service> <service name="PD"> <parent/> </service>
<service name="LOG"> <parent/> </service>
<service name="CPU"> <parent/> </service> <service name="CPU"> <parent/> </service>
<service name="RAM"> <parent/> </service> <service name="RAM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="Timer"> <child name="timer"/> </service>
<service name="Nitpicker"> <child name="nitpicker"/> </service> <service name="Nitpicker"> <child name="nitpicker"/> </service>
</route> </route>

31
repos/ports/run/vbox_win.inc
View File

@ -61,13 +61,9 @@ append config_of_app {
</config> </config>
<route> } <route> }
append_if [expr $use_ps2] config_of_app { append_if [expr $use_ps2] config_of_app {
<service name="Input"> <service name="Input" label="ps2"> <child name="ps2_drv" /> </service> }
<if-arg key="label" value="ps2" /> <child name="ps2_drv" />
</service> }
append_if [expr $use_usb] config_of_app { append_if [expr $use_usb] config_of_app {
<service name="Input"> <service name="Input" label="usb_hid"> <child name="usb_drv" /> </service> }
<if-arg key="label" value="usb_hid" /> <child name="usb_drv" />
</service> }
append config_of_app { append config_of_app {
<any-service> <parent /> <any-child /> </any-service> <any-service> <parent /> <any-child /> </any-service>
</route> </route>
@ -159,9 +155,17 @@ append config_of_app "
append config_of_app { append config_of_app {
</config> </config>
<route> <route>
<service name="Nitpicker"> <child name="nitpicker"/> </service> <service name="Nitpicker"> <child name="nitpicker"/> </service>}
<service name="ROM"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service> for { set i 1} { $i <= $use_vms } { incr i} {
append config_of_app "
<service name=\"ROM\" label=\"shape$i\"> <child name=\"report_rom\"/> </service>"
}
append config_of_app {
<service name="ROM" label="hover"> <child name="report_rom"/> </service>
<service name="ROM" label="xray"> <child name="report_rom"/> </service>
<any-service> <parent/> </any-service>
</route> </route>
</start>} </start>}
@ -186,8 +190,8 @@ for { set i 1} { $i <= $use_vms } { incr i} {
<service name=\"ROM\" label=\"nit_fb${i}.config\"> <child name=\"nit_fb-config\"/> </service>" <service name=\"ROM\" label=\"nit_fb${i}.config\"> <child name=\"nit_fb-config\"/> </service>"
append config_of_app { append config_of_app {
<service name="LOG"> <parent/> </service>
<service name="Nitpicker"> <child name="nitpicker"/> </service> <service name="Nitpicker"> <child name="nitpicker"/> </service>
<any-service> <parent /> </any-service>
</route> </route>
</start>} </start>}
} }
@ -231,9 +235,8 @@ for { set i 1} { $i <= $use_vms } { incr i} {
append config_of_app { append config_of_app {
</config> </config>
<route> <route>
<service name="RM"> <parent/> </service>
<service name="LOG"> <parent/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="Timer"> <child name="timer"/> </service>
<any-service> <parent /> </any-service>
</route> </route>
</start>} </start>}
@ -294,9 +297,7 @@ for { set i 1} { $i <= $use_vms } { incr i} {
<service name=\"Input\"> <child name=\"nit_fb${i}\" /> </service>" <service name=\"Input\"> <child name=\"nit_fb${i}\" /> </service>"
append config_of_app { append config_of_app {
<service name="Report"><child name="report_rom" /></service> <service name="Report"><child name="report_rom" /></service>
<service name="ROM"> <service name="ROM" label="usb_devices"> <child name="report_rom" /> </service>
<if-arg key="label" value="usb_devices"/> <child name="report_rom"/>
</service>
<any-service> <parent/> <any-child /> </any-service> <any-service> <parent/> <any-child /> </any-service>
</route> </route>
</start>} </start>}

2
repos/ports/run/virtualbox_auto.inc
View File

@ -176,6 +176,7 @@ append_if [expr $use_cpu_load] config {
<service name="LOG"><parent/></service> <service name="LOG"><parent/></service>
<service name="Timer"><child name="timer"/></service> <service name="Timer"><child name="timer"/></service>
<service name="Report"><child name="report_rom"/></service> <service name="Report"><child name="report_rom"/></service>
<any-service><parent/></any-service>
</route> </route>
</start> </start>
@ -187,6 +188,7 @@ append_if [expr $use_cpu_load] config {
<service name="Timer"><child name="timer"/></service> <service name="Timer"><child name="timer"/></service>
<service name="ROM" label="trace_subjects"><child name="report_rom"/></service> <service name="ROM" label="trace_subjects"><child name="report_rom"/></service>
<service name="Nitpicker"><child name="nitpicker"/></service> <service name="Nitpicker"><child name="nitpicker"/></service>
<any-service><parent/></any-service>
</route> </route>
</start>} </start>}