ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-08 11:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cpu_sampler: drop sub-init from run scripts

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

Fixes #2294
This commit is contained in:
Christian Prochaska 2017-02-26 02:35:07 +01:00 committed by Christian Helmuth
parent a77e509283
commit 4498137bd2
2 changed files with 10 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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]

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

@ -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>