mirror of
https://github.com/mmueller41/genode.git
synced 2026-01-21 12:32:56 +01:00
Added TOPO as provided service and increase RAM quota.
This commit is contained in:
Michael Mueller
@@ -37,29 +37,6 @@ set config {
|
||||
<any-service><parent/><any-child/></any-service>
|
||||
</route>
|
||||
</start>
|
||||
<start name="hoitaja" caps="62000">
|
||||
<resource name="RAM" quantum="250G"/>
|
||||
<affinity xpos="0" ypos="0" width="64" height="1"/>
|
||||
<config>
|
||||
<affinity-space width="64" height="1"/>
|
||||
<parent-provides>
|
||||
<service name="LOG"/>
|
||||
<service name="PD"/>
|
||||
<service name="CPU"/>
|
||||
<service name="ROM"/>
|
||||
<service name="RAM"/>
|
||||
<service name="IRQ"/>
|
||||
<service name="IO_MEM"/>
|
||||
<service name="IO_PORT"/>
|
||||
<service name="CAP"/>
|
||||
<service name="RM"/>
|
||||
<service name="SIGNAL"/>
|
||||
<service name="TOPO"/>
|
||||
<service name="Timer"/>
|
||||
</parent-provides>
|
||||
<default-route>
|
||||
<any-service><parent/><any-child/></any-service>
|
||||
</default-route>
|
||||
<default caps="200"/>
|
||||
<start name="parent">
|
||||
<affinity xpos="1" ypos="0" width="1" height="1"/>
|
||||
@@ -71,12 +48,6 @@ set config {
|
||||
<any-service><parent/><any-child/></any-service>
|
||||
</route>
|
||||
</start>
|
||||
</config>
|
||||
<route>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<any-service><parent/><any-child/></any-service>
|
||||
</route>
|
||||
</start>
|
||||
</config>
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
set build_components {
|
||||
core init timer app/blinktree app/top
|
||||
core init timer app/blinktree hoitaja
|
||||
}
|
||||
|
||||
source ${genode_dir}/repos/base/run/platform_drv.inc
|
||||
@@ -24,15 +24,13 @@ set config {
|
||||
<service name="TOPO"/>
|
||||
<service name="TRACE"/>
|
||||
</parent-provides>
|
||||
<affinity-space width="32" height="1"/>
|
||||
<default-route>
|
||||
<any-service><parent/><any-child/></any-service>
|
||||
</default-route>
|
||||
<default caps="200"/>
|
||||
<start name="timer">
|
||||
<resource name="RAM" quantum="8M"/>
|
||||
<resource name="RAM" quantum="16M"/>
|
||||
<!--<resource name="CPU" quantum="10"/>-->
|
||||
<affinity xpos="0" ypos="0" width="1" height="1"/>
|
||||
<provides><service name="Timer"/></provides>
|
||||
<route>
|
||||
<any-service><parent/><any-child/></any-service>
|
||||
@@ -41,185 +39,209 @@ set config {
|
||||
}
|
||||
|
||||
append config {
|
||||
<start name="blinktree1" caps="1000">
|
||||
<binary name="blinktree"/>
|
||||
<affinity xpos="1" ypos="0" width="16" height="1"/>
|
||||
<resource name="RAM" quantum="75G"/>
|
||||
<!--<resource name="CPU" quantum="90"/>-->
|
||||
<route>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<any-service> <parent/> <any-child/> </any-service>
|
||||
</route>
|
||||
<config>
|
||||
<vfs>
|
||||
<dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
</dir>
|
||||
<dir name="workloads">
|
||||
<rom name="fill_randint_workloada"/>
|
||||
<rom name="mixed_randint_workloada"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>
|
||||
<!--
|
||||
<start name="top">
|
||||
<resource name="RAM" quantum="2M"/>
|
||||
<affinity xpos="0" ypos="0" width="1" height="1"/>
|
||||
<route>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<any-service> <parent/> </any-service>
|
||||
</route>
|
||||
<config period_ms="1000" sort_time="ec"/>
|
||||
</start>-->
|
||||
<!--
|
||||
<start name="blinktree2" caps="1000">
|
||||
<binary name="blinktree"/>
|
||||
<affinity xpos="1" ypos="0" width="1" height="1"/>
|
||||
<resource name="RAM" quantum="60G"/>
|
||||
<route>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<any-service> <parent/> <any-child/> </any-service>
|
||||
</route>
|
||||
<config>
|
||||
<vfs>
|
||||
<dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
</dir>
|
||||
<dir name="workloads">
|
||||
<rom name="fill_randint_workloada"/>
|
||||
<rom name="mixed_randint_workloada"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>
|
||||
|
||||
<start name="blinktree3" caps="1000">
|
||||
<binary name="blinktree"/>
|
||||
<affinity xpos="1" ypos="0" width="1" height="1"/>
|
||||
<resource name="RAM" quantum="60G"/>
|
||||
<route>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<any-service> <parent/> <any-child/> </any-service>
|
||||
</route>
|
||||
<config>
|
||||
<vfs>
|
||||
<dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
</dir>
|
||||
<dir name="workloads">
|
||||
<rom name="fill_randint_workloada"/>
|
||||
<rom name="mixed_randint_workloada"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>
|
||||
|
||||
<start name="blinktree4" caps="1000">
|
||||
<binary name="blinktree"/>
|
||||
<affinity xpos="32" ypos="0" width="1" height="1"/>
|
||||
<resource name="RAM" quantum="60G"/>
|
||||
<route>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<any-service> <parent/> <any-child/> </any-service>
|
||||
</route>
|
||||
<config>
|
||||
<vfs>
|
||||
<dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
</dir>
|
||||
<dir name="workloads">
|
||||
<rom name="fill_randint_workloada"/>
|
||||
<rom name="mixed_randint_workloada"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>
|
||||
<start name="blinktree5" caps="1000">
|
||||
<binary name="blinktree"/>
|
||||
<affinity xpos="1" ypos="0" width="63" height="1"/>
|
||||
<resource name="RAM" quantum="60G"/>
|
||||
<route>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<any-service> <parent/> <any-child/> </any-service>
|
||||
</route>
|
||||
<config>
|
||||
<vfs>
|
||||
<dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
</dir>
|
||||
<dir name="workloads">
|
||||
<rom name="fill_randint_workloada"/>
|
||||
<rom name="mixed_randint_workloada"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>
|
||||
<start name="blinktree6" caps="1000">
|
||||
<binary name="blinktree"/>
|
||||
<affinity xpos="1" ypos="0" width="63" height="1"/>
|
||||
<resource name="RAM" quantum="60G"/>
|
||||
<route>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<any-service> <parent/> <any-child/> </any-service>
|
||||
</route>
|
||||
<config>
|
||||
<vfs>
|
||||
<dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
</dir>
|
||||
<dir name="workloads">
|
||||
<rom name="fill_randint_workloada"/>
|
||||
<rom name="mixed_randint_workloada"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>
|
||||
<start name="blinktree7" caps="1000">
|
||||
<binary name="blinktree"/>
|
||||
<affinity xpos="1" ypos="0" width="63" height="1"/>
|
||||
<resource name="RAM" quantum="30G"/>
|
||||
<route>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<any-service> <parent/> <any-child/> </any-service>
|
||||
</route>
|
||||
<config>
|
||||
<vfs>
|
||||
<dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
</dir>
|
||||
<dir name="workloads">
|
||||
<rom name="fill_randint_workloada"/>
|
||||
<rom name="mixed_randint_workloada"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>-->
|
||||
</config>
|
||||
<start name="hoitaja" caps="62000">
|
||||
<resource name="RAM" quantum="250G"/>
|
||||
<provides><service name="TASKING"/></provides>
|
||||
<config prio_levels="32">
|
||||
<parent-provides>
|
||||
<service name="LOG"/>
|
||||
<service name="PD"/>
|
||||
<service name="CPU"/>
|
||||
<service name="ROM"/>
|
||||
<service name="RAM"/>
|
||||
<service name="IRQ"/>
|
||||
<service name="IO_MEM"/>
|
||||
<service name="IO_PORT"/>
|
||||
<service name="CAP"/>
|
||||
<service name="RM"/>
|
||||
<service name="SIGNAL"/>
|
||||
<service name="TOPO"/>
|
||||
<service name="Timer"/>
|
||||
<service name="TASKING"/>
|
||||
<service name="TRACE"/>
|
||||
</parent-provides>
|
||||
<default-route>
|
||||
<any-service><parent/><any-child/></any-service>
|
||||
</default-route>
|
||||
<default caps="600"/>
|
||||
<affinity-space width="64" height="1"/>
|
||||
<start name="blinktree1" caps="1000">
|
||||
<binary name="blinktree"/>
|
||||
<affinity xpos="1" ypos="0" width="16" height="1"/>
|
||||
<resource name="RAM" quantum="75G"/>
|
||||
<!--<resource name="CPU" quantum="90"/>-->
|
||||
<config>
|
||||
<vfs>
|
||||
<dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
</dir>
|
||||
<dir name="workloads">
|
||||
<rom name="fill_randint_workloada"/>
|
||||
<rom name="mixed_randint_workloada"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>
|
||||
|
||||
|
||||
<start name="blinktree2" caps="1000">
|
||||
<binary name="blinktree"/>
|
||||
<affinity xpos="1" ypos="0" width="1" height="1"/>
|
||||
<resource name="RAM" quantum="60G"/>
|
||||
<config>
|
||||
<vfs>
|
||||
<dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
</dir>
|
||||
<dir name="workloads">
|
||||
<rom name="fill_randint_workloada"/>
|
||||
<rom name="mixed_randint_workloada"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>
|
||||
<start name="blinktree3" caps="1000">
|
||||
<binary name="blinktree"/>
|
||||
<affinity xpos="1" ypos="0" width="1" height="1"/>
|
||||
<resource name="RAM" quantum="60G"/>
|
||||
<config>
|
||||
<vfs>
|
||||
<dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
</dir>
|
||||
<dir name="workloads">
|
||||
<rom name="fill_randint_workloada"/>
|
||||
<rom name="mixed_randint_workloada"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>
|
||||
<!--
|
||||
|
||||
<start name="blinktree4" caps="1000">
|
||||
<binary name="blinktree"/>
|
||||
<affinity xpos="32" ypos="0" width="1" height="1"/>
|
||||
<resource name="RAM" quantum="60G"/>
|
||||
<route>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<any-service> <parent/> <any-child/> </any-service>
|
||||
</route>
|
||||
<config>
|
||||
<vfs>
|
||||
<dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
</dir>
|
||||
<dir name="workloads">
|
||||
<rom name="fill_randint_workloada"/>
|
||||
<rom name="mixed_randint_workloada"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>
|
||||
<start name="blinktree5" caps="1000">
|
||||
<binary name="blinktree"/>
|
||||
<affinity xpos="1" ypos="0" width="63" height="1"/>
|
||||
<resource name="RAM" quantum="60G"/>
|
||||
<route>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<any-service> <parent/> <any-child/> </any-service>
|
||||
</route>
|
||||
<config>
|
||||
<vfs>
|
||||
<dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
</dir>
|
||||
<dir name="workloads">
|
||||
<rom name="fill_randint_workloada"/>
|
||||
<rom name="mixed_randint_workloada"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>
|
||||
<start name="blinktree6" caps="1000">
|
||||
<binary name="blinktree"/>
|
||||
<affinity xpos="1" ypos="0" width="63" height="1"/>
|
||||
<resource name="RAM" quantum="60G"/>
|
||||
<route>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<any-service> <parent/> <any-child/> </any-service>
|
||||
</route>
|
||||
<config>
|
||||
<vfs>
|
||||
<dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
</dir>
|
||||
<dir name="workloads">
|
||||
<rom name="fill_randint_workloada"/>
|
||||
<rom name="mixed_randint_workloada"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>
|
||||
<start name="blinktree7" caps="1000">
|
||||
<binary name="blinktree"/>
|
||||
<affinity xpos="1" ypos="0" width="63" height="1"/>
|
||||
<resource name="RAM" quantum="30G"/>
|
||||
<route>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<any-service> <parent/> <any-child/> </any-service>
|
||||
</route>
|
||||
<config>
|
||||
<vfs>
|
||||
<dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
</dir>
|
||||
<dir name="workloads">
|
||||
<rom name="fill_randint_workloada"/>
|
||||
<rom name="mixed_randint_workloada"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>-->
|
||||
</config>
|
||||
<route>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<any-service><parent/><any-child/></any-service>
|
||||
</route>
|
||||
</start>
|
||||
</config>
|
||||
}
|
||||
|
||||
install_config $config
|
||||
|
||||
set boot_modules {
|
||||
core init timer vfs.lib.so ld.lib.so libm.lib.so libc.lib.so stdcxx.lib.so posix.lib.so blinktree top fill_randint_workloada mixed_randint_workloada
|
||||
core init timer vfs.lib.so ld.lib.so libm.lib.so libc.lib.so stdcxx.lib.so hoitaja blinktree fill_randint_workloada mixed_randint_workloada
|
||||
}
|
||||
|
||||
append_platform_drv_boot_modules
|
||||
|
||||
build_boot_image $boot_modules
|
||||
append qemu_args "-nographic"
|
||||
|
||||
run_genode_until forever
|
||||
|
||||
set rounds 100
|
||||
set succeeded 0
|
||||
|
||||
for {set r 0} {$r < $rounds} {incr r} {
|
||||
run_genode_until {\[init -> hoitaja -> blinktree1\] Finished\.} 300
|
||||
kill_spawned [output_spawn_id]
|
||||
incr succeeded
|
||||
}
|
||||
|
||||
puts "$succeeded of $rounds rounds succeeded."
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
set build_components {
|
||||
core init timer app/hello_mxtask
|
||||
core init timer hoitaja app/hello_mxtask
|
||||
}
|
||||
|
||||
source ${genode_dir}/repos/base/run/platform_drv.inc
|
||||
@@ -19,16 +19,18 @@ set config {
|
||||
<service name="IRQ"/>
|
||||
<service name="IO_MEM"/>
|
||||
<service name="IO_PORT"/>
|
||||
<service name="CAP"/>
|
||||
<service name="RM"/>
|
||||
<service name="SIGNAL"/>
|
||||
<service name="TOPO"/>
|
||||
<service name="TRACE"/>
|
||||
</parent-provides>
|
||||
<affinity-space width="32" height="1"/>
|
||||
<default-route>
|
||||
<any-service><parent/><any-child/></any-service>
|
||||
</default-route>
|
||||
<default caps="200"/>
|
||||
<start name="timer">
|
||||
<resource name="RAM" quantum="1M"/>
|
||||
<resource name="RAM" quantum="16M"/>
|
||||
<provides><service name="Timer"/></provides>
|
||||
<route>
|
||||
<any-service><parent/><any-child/></any-service>
|
||||
@@ -36,21 +38,50 @@ set config {
|
||||
</start>
|
||||
}
|
||||
|
||||
append_platform_drv_config
|
||||
|
||||
append config {
|
||||
<start name="hello_mxtask">
|
||||
<resource name="RAM" quantum="16G"/>
|
||||
<affinity xpos="0" ypos="0" width="16" height="1"/>
|
||||
<config>
|
||||
<vfs> <dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
<terminal raw="yes"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
<start name="hoitaja" caps="62000">
|
||||
<resource name="RAM" quantum="250G"/>
|
||||
<provides><service name="TASKING"/></provides>
|
||||
<config prio_levels="32">
|
||||
<parent-provides>
|
||||
<service name="LOG"/>
|
||||
<service name="PD"/>
|
||||
<service name="CPU"/>
|
||||
<service name="ROM"/>
|
||||
<service name="RAM"/>
|
||||
<service name="IRQ"/>
|
||||
<service name="IO_MEM"/>
|
||||
<service name="IO_PORT"/>
|
||||
<service name="CAP"/>
|
||||
<service name="RM"/>
|
||||
<service name="SIGNAL"/>
|
||||
<service name="TOPO"/>
|
||||
<service name="Timer"/>
|
||||
<service name="TASKING"/>
|
||||
<service name="TRACE"/>
|
||||
</parent-provides>
|
||||
<default-route>
|
||||
<any-service><parent/><any-child/></any-service>
|
||||
</default-route>
|
||||
<default caps="600"/>
|
||||
<affinity-space width="32" height="1"/>
|
||||
<start name="hello_mxtask">
|
||||
<resource name="RAM" quantum="16G"/>
|
||||
<affinity xpos="0" ypos="0" width="16" height="1"/>
|
||||
<config>
|
||||
<vfs> <dir name="dev">
|
||||
<log/>
|
||||
<inline name="rtc">2022-07-20 14:30</inline>
|
||||
</dir>
|
||||
</vfs>
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>
|
||||
</config>
|
||||
<route>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<any-service><parent/><any-child/></any-service>
|
||||
</route>
|
||||
</start>
|
||||
</config>
|
||||
}
|
||||
@@ -58,7 +89,7 @@ append config {
|
||||
install_config $config
|
||||
|
||||
set boot_modules {
|
||||
core init timer vfs.lib.so libm.lib.so libc.lib.so stdcxx.lib.so ld.lib.so hello_mxtask
|
||||
core init timer vfs.lib.so libm.lib.so libc.lib.so stdcxx.lib.so ld.lib.so hello_mxtask hoitaja
|
||||
}
|
||||
|
||||
append_platform_drv_boot_modules
|
||||
|
||||
@@ -30,7 +30,7 @@ install_config {
|
||||
<!--<affinity-space width="32" height="1"/>-->
|
||||
<default caps="2000"/>
|
||||
<start name="timer">
|
||||
<resource name="RAM" quantum="1M"/>
|
||||
<resource name="RAM" quantum="16M"/>
|
||||
<provides><service name="Timer"/></provides>
|
||||
<route>
|
||||
<any-service><parent/><any-child/></any-service>
|
||||
@@ -100,7 +100,6 @@ install_config {
|
||||
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
||||
</config>
|
||||
</start>
|
||||
-->
|
||||
<start name="sleepy_cell2" priority="-1">
|
||||
<binary name="volatile_cell"/>
|
||||
<resource name="RAM" quantum="128M"/>
|
||||
@@ -108,6 +107,7 @@ install_config {
|
||||
<any-service><parent/><any-child/></any-service>
|
||||
</route>
|
||||
</start>
|
||||
-->
|
||||
<!--
|
||||
<start name="rpc_bench4" priority="-1">
|
||||
<binary name="portal_experiment"/>
|
||||
|
||||
Reference in New Issue
Block a user