Added TOPO as provided service and increase RAM quota.

This commit is contained in:
Michael Mueller
2024-09-15 19:44:18 +02:00
parent 00c9932d5c
commit 6e6c4411ce
11 changed files with 275 additions and 245 deletions

View File

@@ -162,7 +162,8 @@ proc platform_drv_config {} {
<service name="PD"> <parent/> </service> <service name="PD"> <parent/> </service>
<service name="RM"> <parent/> </service> <service name="RM"> <parent/> </service>
<service name="CPU"> <parent/> </service> <service name="CPU"> <parent/> </service>
<service name="ROM"> <parent/> </service>} <service name="ROM"> <parent/> </service>
<service name="TOPO"> <parent/> </service>}
append_if [expr {[acpi_drv_name] eq "acpica"}] drv_config { append_if [expr {[acpi_drv_name] eq "acpica"}] drv_config {
<service name="IO_PORT"> <parent/> </service> <service name="IO_PORT"> <parent/> </service>

View File

@@ -39,13 +39,14 @@ set config {
<service name="CPU"/> <service name="CPU"/>
<service name="IO_MEM" /> <service name="IO_MEM" />
<service name="IO_PORT" /> <service name="IO_PORT" />
<service name="TOPO"/>
</parent-provides> </parent-provides>
<default-route> <default-route>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</default-route> </default-route>
<start name="timer" caps="100"> <start name="timer" caps="100">
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="16M"/>
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>

View File

@@ -1,4 +1,4 @@
proc use_dynamic_rom { } { return true } proc use_dynamic_rom { } { return false }
create_boot_directory create_boot_directory
import_from_depot [depot_user]/src/[base_src] \ import_from_depot [depot_user]/src/[base_src] \
@@ -22,18 +22,19 @@ append config {
<service name="RM"/> <service name="RM"/>
<service name="CPU"/> <service name="CPU"/>
<service name="LOG"/> <service name="LOG"/>
<service name="TOPO"/>
</parent-provides> </parent-provides>
<default-route> <default-route>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</default-route> </default-route>
<default caps="100"/> <default caps="100"/>
<start name="timer"> <start name="timer">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="16M"/>
<provides> <service name="Timer"/> </provides> <provides> <service name="Timer"/> </provides>
</start> </start>
<start name="drivers" caps="1000" managing_system="yes"> <start name="drivers" caps="1000" managing_system="yes">
<resource name="RAM" quantum="32M"/> <resource name="RAM" quantum="512M"/>
<binary name="init"/> <binary name="init"/>
<route> <route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service> <service name="ROM" label="config"> <parent label="drivers.config"/> </service>
@@ -44,7 +45,7 @@ append config {
</start> </start>
<start name="nic_router" caps="200"> <start name="nic_router" caps="200">
<resource name="RAM" quantum="10M"/> <resource name="RAM" quantum="20M"/>
<provides> <provides>
<service name="Nic"/> <service name="Nic"/>
<service name="Uplink"/> <service name="Uplink"/>
@@ -54,7 +55,7 @@ append config {
<policy label_prefix="socket_fs" domain="downlink"/> <policy label_prefix="socket_fs" domain="downlink"/>
<policy label_prefix="drivers" domain="uplink"/> <policy label_prefix="drivers" domain="uplink"/>
<domain name="uplink" interface="10.0.2.55/24" gateway="10.0.2.1"> <domain name="uplink" interface="10.0.2.55/24" gateway="10.0.2.1" verbose_packets="true">
<nat domain="downlink" <nat domain="downlink"
tcp-ports="16384" tcp-ports="16384"
@@ -69,7 +70,7 @@ append config {
</domain> </domain>
<domain name="downlink" interface="10.0.3.1/24"> <domain name="downlink" interface="10.0.3.1/24" verbose_packets="true">
<dhcp-server ip_first="10.0.3.55" ip_last="10.0.3.55"> <dhcp-server ip_first="10.0.3.55" ip_last="10.0.3.55">
<dns-server ip="8.8.8.8"/> <dns-server ip="8.8.8.8"/>
@@ -88,7 +89,7 @@ append config {
append_if [use_dynamic_rom] config { append_if [use_dynamic_rom] config {
<start name="dynamic_rom"> <start name="dynamic_rom">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="16M"/>
<provides><service name="ROM"/> </provides> <provides><service name="ROM"/> </provides>
<config verbose="yes"> <config verbose="yes">
<rom name="socket_fs.config"> <inline description="MTU default"> <rom name="socket_fs.config"> <inline description="MTU default">
@@ -139,7 +140,7 @@ if {[use_dynamic_rom]} { append config {
<config ld_verbose="yes"> <config ld_verbose="yes">
<vfs> <vfs>
<dir name="socket"> <dir name="socket">
<lxip ip_addr="10.0.2.55" netmask="255.255.255.0" gateway="10.0.2.1" nameserver="8.8.8.8"/> <lxip ip_addr="10.0.3.55" netmask="255.255.255.0" gateway="10.0.3.1" nameserver="8.8.8.8"/>
<!-- <lxip dhcp="yes"/> --> <!-- <lxip dhcp="yes"/> -->
</dir> </dir>
</vfs> </vfs>
@@ -152,6 +153,7 @@ append config {
</start> } </start> }
append qemu_args " -nographic " append qemu_args " -nographic "
append_qemu_nic_args append_qemu_nic_args "host=10.0.2.1,dhcpstart=10.0.2.55,hostfwd=tcp::10080-:80,hostfwd=tcp::18080-:8080,hostfwd=udp::10007-:7,hostfwd=udp::17070-:7070"
# vi: set ft=tcl : # vi: set ft=tcl :

View File

@@ -20,6 +20,7 @@ append config {
<service name="RM"/> <service name="RM"/>
<service name="CPU"/> <service name="CPU"/>
<service name="LOG"/> <service name="LOG"/>
<service name="TOPO"/>
</parent-provides> </parent-provides>
<default-route> <default-route>
@@ -34,7 +35,7 @@ append config {
</start> </start>
<start name="drivers" caps="1000" managing_system="yes"> <start name="drivers" caps="1000" managing_system="yes">
<resource name="RAM" quantum="32M"/> <resource name="RAM" quantum="512M"/>
<binary name="init"/> <binary name="init"/>
<route> <route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service> <service name="ROM" label="config"> <parent label="drivers.config"/> </service>
@@ -45,7 +46,7 @@ append config {
</start> </start>
<start name="nic_router" caps="200"> <start name="nic_router" caps="200">
<resource name="RAM" quantum="10M"/> <resource name="RAM" quantum="20M"/>
<provides> <provides>
<service name="Nic"/> <service name="Nic"/>
<service name="Uplink"/> <service name="Uplink"/>

View File

@@ -5,7 +5,7 @@ build { test/netty/tcp }
append config { append config {
<start name="netty-server-80"> <start name="netty-server-80">
<binary name="test-netty_tcp"/> <binary name="test-netty_tcp"/>
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="16M"/>
<config ld_verbose="yes" port="80" read_write="no" nonblock="true"> <config ld_verbose="yes" port="80" read_write="no" nonblock="true">
<vfs> <vfs>
<dir name="dev"> <log/> </dir> <dir name="dev"> <log/> </dir>
@@ -17,7 +17,7 @@ append config {
</start> </start>
<start name="netty-server-8080"> <start name="netty-server-8080">
<binary name="test-netty_tcp"/> <binary name="test-netty_tcp"/>
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="16M"/>
<config ld_verbose="yes" mode="server" port="8080" nonblock="false"> <config ld_verbose="yes" mode="server" port="8080" nonblock="false">
<vfs> <vfs>
<dir name="dev"> <log/> </dir> <dir name="dev"> <log/> </dir>

View File

@@ -5,7 +5,7 @@ build { test/netty/tcp }
append config { append config {
<start name="netty-server-80"> <start name="netty-server-80">
<binary name="test-netty_tcp"/> <binary name="test-netty_tcp"/>
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="8M"/>
<config ld_verbose="yes" port="80" read_write="no" nonblock="true"> <config ld_verbose="yes" port="80" read_write="no" nonblock="true">
<vfs> <vfs>
<dir name="dev"> <log/> </dir> <dir name="dev"> <log/> </dir>
@@ -17,7 +17,7 @@ append config {
</start> </start>
<start name="netty-server-8080"> <start name="netty-server-8080">
<binary name="test-netty_tcp"/> <binary name="test-netty_tcp"/>
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="8M"/>
<config ld_verbose="yes" mode="server" port="8080" nonblock="false"> <config ld_verbose="yes" mode="server" port="8080" nonblock="false">
<vfs> <vfs>
<dir name="dev"> <log/> </dir> <dir name="dev"> <log/> </dir>
@@ -27,11 +27,11 @@ append config {
<libc stdout="/dev/log" stderr="/dev/log" socket="/socket"/> <libc stdout="/dev/log" stderr="/dev/log" socket="/socket"/>
</config> </config>
</start> </start>
<!-- <!--
<start name="netty-client-A"> <start name="netty-client-A">
<binary name="test-netty_tcp"/> <binary name="test-netty_tcp"/>
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="8M"/>
<config ld_verbose="yes" mode="client" ip="10.0.3.1" port="8080"> <config ld_verbose="yes" mode="client" ip="10.0.3.1" port="8080">
<vfs> <vfs>
<dir name="dev"> <log/> </dir> <dir name="dev"> <log/> </dir>

View File

@@ -37,29 +37,6 @@ set config {
<any-service><parent/><any-child/></any-service> <any-service><parent/><any-child/></any-service>
</route> </route>
</start> </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"/> <default caps="200"/>
<start name="parent"> <start name="parent">
<affinity xpos="1" ypos="0" width="1" height="1"/> <affinity xpos="1" ypos="0" width="1" height="1"/>
@@ -71,12 +48,6 @@ set config {
<any-service><parent/><any-child/></any-service> <any-service><parent/><any-child/></any-service>
</route> </route>
</start> </start>
</config>
<route>
<service name="Timer"> <child name="timer"/> </service>
<any-service><parent/><any-child/></any-service>
</route>
</start>
</config> </config>
} }

View File

@@ -1,5 +1,5 @@
set build_components { 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 source ${genode_dir}/repos/base/run/platform_drv.inc
@@ -24,15 +24,13 @@ set config {
<service name="TOPO"/> <service name="TOPO"/>
<service name="TRACE"/> <service name="TRACE"/>
</parent-provides> </parent-provides>
<affinity-space width="32" height="1"/>
<default-route> <default-route>
<any-service><parent/><any-child/></any-service> <any-service><parent/><any-child/></any-service>
</default-route> </default-route>
<default caps="200"/> <default caps="200"/>
<start name="timer"> <start name="timer">
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="16M"/>
<!--<resource name="CPU" quantum="10"/>--> <!--<resource name="CPU" quantum="10"/>-->
<affinity xpos="0" ypos="0" width="1" height="1"/>
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
<route> <route>
<any-service><parent/><any-child/></any-service> <any-service><parent/><any-child/></any-service>
@@ -41,185 +39,209 @@ set config {
} }
append config { append config {
<start name="blinktree1" caps="1000"> <start name="hoitaja" caps="62000">
<binary name="blinktree"/> <resource name="RAM" quantum="250G"/>
<affinity xpos="1" ypos="0" width="16" height="1"/> <provides><service name="TASKING"/></provides>
<resource name="RAM" quantum="75G"/> <config prio_levels="32">
<!--<resource name="CPU" quantum="90"/>--> <parent-provides>
<route> <service name="LOG"/>
<service name="Timer"> <child name="timer"/> </service> <service name="PD"/>
<any-service> <parent/> <any-child/> </any-service> <service name="CPU"/>
</route> <service name="ROM"/>
<config> <service name="RAM"/>
<vfs> <service name="IRQ"/>
<dir name="dev"> <service name="IO_MEM"/>
<log/> <service name="IO_PORT"/>
<inline name="rtc">2022-07-20 14:30</inline> <service name="CAP"/>
</dir> <service name="RM"/>
<dir name="workloads"> <service name="SIGNAL"/>
<rom name="fill_randint_workloada"/> <service name="TOPO"/>
<rom name="mixed_randint_workloada"/> <service name="Timer"/>
</dir> <service name="TASKING"/>
</vfs> <service name="TRACE"/>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/> </parent-provides>
</config> <default-route>
</start> <any-service><parent/><any-child/></any-service>
<!-- </default-route>
<start name="top"> <default caps="600"/>
<resource name="RAM" quantum="2M"/> <affinity-space width="64" height="1"/>
<affinity xpos="0" ypos="0" width="1" height="1"/> <start name="blinktree1" caps="1000">
<route> <binary name="blinktree"/>
<service name="Timer"> <child name="timer"/> </service> <affinity xpos="1" ypos="0" width="16" height="1"/>
<any-service> <parent/> </any-service> <resource name="RAM" quantum="75G"/>
</route> <!--<resource name="CPU" quantum="90"/>-->
<config period_ms="1000" sort_time="ec"/> <config>
</start>--> <vfs>
<!-- <dir name="dev">
<start name="blinktree2" caps="1000"> <log/>
<binary name="blinktree"/> <inline name="rtc">2022-07-20 14:30</inline>
<affinity xpos="1" ypos="0" width="1" height="1"/> </dir>
<resource name="RAM" quantum="60G"/> <dir name="workloads">
<route> <rom name="fill_randint_workloada"/>
<service name="Timer"> <child name="timer"/> </service> <rom name="mixed_randint_workloada"/>
<any-service> <parent/> <any-child/> </any-service> </dir>
</route> </vfs>
<config> <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<vfs> </config>
<dir name="dev"> </start>
<log/>
<inline name="rtc">2022-07-20 14:30</inline>
</dir> <start name="blinktree2" caps="1000">
<dir name="workloads"> <binary name="blinktree"/>
<rom name="fill_randint_workloada"/> <affinity xpos="1" ypos="0" width="1" height="1"/>
<rom name="mixed_randint_workloada"/> <resource name="RAM" quantum="60G"/>
</dir> <config>
</vfs> <vfs>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/> <dir name="dev">
</config> <log/>
</start> <inline name="rtc">2022-07-20 14:30</inline>
</dir>
<start name="blinktree3" caps="1000"> <dir name="workloads">
<binary name="blinktree"/> <rom name="fill_randint_workloada"/>
<affinity xpos="1" ypos="0" width="1" height="1"/> <rom name="mixed_randint_workloada"/>
<resource name="RAM" quantum="60G"/> </dir>
<route> </vfs>
<service name="Timer"> <child name="timer"/> </service> <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<any-service> <parent/> <any-child/> </any-service> </config>
</route> </start>
<config> <start name="blinktree3" caps="1000">
<vfs> <binary name="blinktree"/>
<dir name="dev"> <affinity xpos="1" ypos="0" width="1" height="1"/>
<log/> <resource name="RAM" quantum="60G"/>
<inline name="rtc">2022-07-20 14:30</inline> <config>
</dir> <vfs>
<dir name="workloads"> <dir name="dev">
<rom name="fill_randint_workloada"/> <log/>
<rom name="mixed_randint_workloada"/> <inline name="rtc">2022-07-20 14:30</inline>
</dir> </dir>
</vfs> <dir name="workloads">
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/> <rom name="fill_randint_workloada"/>
</config> <rom name="mixed_randint_workloada"/>
</start> </dir>
</vfs>
<start name="blinktree4" caps="1000"> <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<binary name="blinktree"/> </config>
<affinity xpos="32" ypos="0" width="1" height="1"/> </start>
<resource name="RAM" quantum="60G"/> <!--
<route>
<service name="Timer"> <child name="timer"/> </service> <start name="blinktree4" caps="1000">
<any-service> <parent/> <any-child/> </any-service> <binary name="blinktree"/>
</route> <affinity xpos="32" ypos="0" width="1" height="1"/>
<config> <resource name="RAM" quantum="60G"/>
<vfs> <route>
<dir name="dev"> <service name="Timer"> <child name="timer"/> </service>
<log/> <any-service> <parent/> <any-child/> </any-service>
<inline name="rtc">2022-07-20 14:30</inline> </route>
</dir> <config>
<dir name="workloads"> <vfs>
<rom name="fill_randint_workloada"/> <dir name="dev">
<rom name="mixed_randint_workloada"/> <log/>
</dir> <inline name="rtc">2022-07-20 14:30</inline>
</vfs> </dir>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/> <dir name="workloads">
</config> <rom name="fill_randint_workloada"/>
</start> <rom name="mixed_randint_workloada"/>
<start name="blinktree5" caps="1000"> </dir>
<binary name="blinktree"/> </vfs>
<affinity xpos="1" ypos="0" width="63" height="1"/> <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<resource name="RAM" quantum="60G"/> </config>
<route> </start>
<service name="Timer"> <child name="timer"/> </service> <start name="blinktree5" caps="1000">
<any-service> <parent/> <any-child/> </any-service> <binary name="blinktree"/>
</route> <affinity xpos="1" ypos="0" width="63" height="1"/>
<config> <resource name="RAM" quantum="60G"/>
<vfs> <route>
<dir name="dev"> <service name="Timer"> <child name="timer"/> </service>
<log/> <any-service> <parent/> <any-child/> </any-service>
<inline name="rtc">2022-07-20 14:30</inline> </route>
</dir> <config>
<dir name="workloads"> <vfs>
<rom name="fill_randint_workloada"/> <dir name="dev">
<rom name="mixed_randint_workloada"/> <log/>
</dir> <inline name="rtc">2022-07-20 14:30</inline>
</vfs> </dir>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/> <dir name="workloads">
</config> <rom name="fill_randint_workloada"/>
</start> <rom name="mixed_randint_workloada"/>
<start name="blinktree6" caps="1000"> </dir>
<binary name="blinktree"/> </vfs>
<affinity xpos="1" ypos="0" width="63" height="1"/> <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<resource name="RAM" quantum="60G"/> </config>
<route> </start>
<service name="Timer"> <child name="timer"/> </service> <start name="blinktree6" caps="1000">
<any-service> <parent/> <any-child/> </any-service> <binary name="blinktree"/>
</route> <affinity xpos="1" ypos="0" width="63" height="1"/>
<config> <resource name="RAM" quantum="60G"/>
<vfs> <route>
<dir name="dev"> <service name="Timer"> <child name="timer"/> </service>
<log/> <any-service> <parent/> <any-child/> </any-service>
<inline name="rtc">2022-07-20 14:30</inline> </route>
</dir> <config>
<dir name="workloads"> <vfs>
<rom name="fill_randint_workloada"/> <dir name="dev">
<rom name="mixed_randint_workloada"/> <log/>
</dir> <inline name="rtc">2022-07-20 14:30</inline>
</vfs> </dir>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/> <dir name="workloads">
</config> <rom name="fill_randint_workloada"/>
</start> <rom name="mixed_randint_workloada"/>
<start name="blinktree7" caps="1000"> </dir>
<binary name="blinktree"/> </vfs>
<affinity xpos="1" ypos="0" width="63" height="1"/> <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<resource name="RAM" quantum="30G"/> </config>
<route> </start>
<service name="Timer"> <child name="timer"/> </service> <start name="blinktree7" caps="1000">
<any-service> <parent/> <any-child/> </any-service> <binary name="blinktree"/>
</route> <affinity xpos="1" ypos="0" width="63" height="1"/>
<config> <resource name="RAM" quantum="30G"/>
<vfs> <route>
<dir name="dev"> <service name="Timer"> <child name="timer"/> </service>
<log/> <any-service> <parent/> <any-child/> </any-service>
<inline name="rtc">2022-07-20 14:30</inline> </route>
</dir> <config>
<dir name="workloads"> <vfs>
<rom name="fill_randint_workloada"/> <dir name="dev">
<rom name="mixed_randint_workloada"/> <log/>
</dir> <inline name="rtc">2022-07-20 14:30</inline>
</vfs> </dir>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/> <dir name="workloads">
</config> <rom name="fill_randint_workloada"/>
</start>--> <rom name="mixed_randint_workloada"/>
</config> </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 install_config $config
set boot_modules { 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 append_platform_drv_boot_modules
build_boot_image $boot_modules build_boot_image $boot_modules
append qemu_args "-nographic" append qemu_args "-nographic"
run_genode_until forever 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."

View File

@@ -1,5 +1,5 @@
set build_components { 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 source ${genode_dir}/repos/base/run/platform_drv.inc
@@ -19,16 +19,18 @@ set config {
<service name="IRQ"/> <service name="IRQ"/>
<service name="IO_MEM"/> <service name="IO_MEM"/>
<service name="IO_PORT"/> <service name="IO_PORT"/>
<service name="CAP"/>
<service name="RM"/> <service name="RM"/>
<service name="SIGNAL"/>
<service name="TOPO"/> <service name="TOPO"/>
<service name="TRACE"/>
</parent-provides> </parent-provides>
<affinity-space width="32" height="1"/>
<default-route> <default-route>
<any-service><parent/><any-child/></any-service> <any-service><parent/><any-child/></any-service>
</default-route> </default-route>
<default caps="200"/> <default caps="200"/>
<start name="timer"> <start name="timer">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="16M"/>
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
<route> <route>
<any-service><parent/><any-child/></any-service> <any-service><parent/><any-child/></any-service>
@@ -36,21 +38,50 @@ set config {
</start> </start>
} }
append_platform_drv_config
append config { append config {
<start name="hello_mxtask"> <start name="hoitaja" caps="62000">
<resource name="RAM" quantum="16G"/> <resource name="RAM" quantum="250G"/>
<affinity xpos="0" ypos="0" width="16" height="1"/> <provides><service name="TASKING"/></provides>
<config> <config prio_levels="32">
<vfs> <dir name="dev"> <parent-provides>
<log/> <service name="LOG"/>
<inline name="rtc">2022-07-20 14:30</inline> <service name="PD"/>
<terminal raw="yes"/> <service name="CPU"/>
</dir> <service name="ROM"/>
</vfs> <service name="RAM"/>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/> <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> </config>
<route>
<service name="Timer"> <child name="timer"/> </service>
<any-service><parent/><any-child/></any-service>
</route>
</start> </start>
</config> </config>
} }
@@ -58,7 +89,7 @@ append config {
install_config $config install_config $config
set boot_modules { 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 append_platform_drv_boot_modules

View File

@@ -30,7 +30,7 @@ install_config {
<!--<affinity-space width="32" height="1"/>--> <!--<affinity-space width="32" height="1"/>-->
<default caps="2000"/> <default caps="2000"/>
<start name="timer"> <start name="timer">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="16M"/>
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
<route> <route>
<any-service><parent/><any-child/></any-service> <any-service><parent/><any-child/></any-service>
@@ -100,7 +100,6 @@ install_config {
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/> <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
</config> </config>
</start> </start>
-->
<start name="sleepy_cell2" priority="-1"> <start name="sleepy_cell2" priority="-1">
<binary name="volatile_cell"/> <binary name="volatile_cell"/>
<resource name="RAM" quantum="128M"/> <resource name="RAM" quantum="128M"/>
@@ -108,6 +107,7 @@ install_config {
<any-service><parent/><any-child/></any-service> <any-service><parent/><any-child/></any-service>
</route> </route>
</start> </start>
-->
<!-- <!--
<start name="rpc_bench4" priority="-1"> <start name="rpc_bench4" priority="-1">
<binary name="portal_experiment"/> <binary name="portal_experiment"/>

View File

@@ -42,6 +42,7 @@ append config {
<service name="RM"/> <service name="RM"/>
<service name="CPU"/> <service name="CPU"/>
<service name="LOG"/> <service name="LOG"/>
<service name="TOPO"/>
</parent-provides> </parent-provides>
<default-route> <default-route>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
@@ -53,8 +54,8 @@ append config {
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="drivers" caps="1000" managing_system="yes"> <start name="drivers" caps="2000" managing_system="yes">
<resource name="RAM" quantum="32M"/> <resource name="RAM" quantum="512M"/>
<binary name="init"/> <binary name="init"/>
<route> <route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service> <service name="ROM" label="config"> <parent label="drivers.config"/> </service>
@@ -65,7 +66,7 @@ append config {
</start> </start>
<start name="nic_router" caps="200"> <start name="nic_router" caps="200">
<resource name="RAM" quantum="10M"/> <resource name="RAM" quantum="20M"/>
<provides> <provides>
<service name="Nic"/> <service name="Nic"/>
<service name="Uplink"/> <service name="Uplink"/>
@@ -103,7 +104,7 @@ append config {
<start name="ping_2_nic_router" caps="200"> <start name="ping_2_nic_router" caps="200">
<binary name="nic_router"/> <binary name="nic_router"/>
<resource name="RAM" quantum="10M"/> <resource name="RAM" quantum="20M"/>
<provides> <provides>
<service name="Nic"/> <service name="Nic"/>
<service name="Uplink"/> <service name="Uplink"/>