ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-03 12:34:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

log_core.run: use terminal_log instead of fs_log

Browse Source 
Issue #4400
This commit is contained in:
Norman Feske 2022-02-04 17:03:08 +01:00
parent 51134a6897
commit d93d3fbfca
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
repos/os/run/log_core.run
View File

@ -16,7 +16,7 @@ if {[have_spec nova]} {
proc kernel_output { } { return "novga logmem" } proc kernel_output { } { return "novga logmem" }
} }
build "core init timer server/vfs server/fs_log app/log_core" build { core init timer server/file_terminal server/terminal_log app/log_core }
create_boot_directory create_boot_directory
@ -43,26 +43,24 @@ append config {
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="vfs"> <start name="file_terminal">
<resource name="RAM" quantum="2M"/> <binary name="file_terminal"/>
<provides><service name="File_system"/></provides> <resource name="RAM" quantum="2096K"/>
<provides> <service name="Terminal"/> </provides>
<config> <config>
<vfs> <default-policy filename="log" />
<!-- be careful to avoid endless output loop for core.log --> <vfs> <dir name="dev"> <log/> </dir> <log label="log_core"/> </vfs>
<dir name="log_core"> <} [log_service] { name="log.log"/> </dir> <libc stdout="/dev/log"/>
</vfs>
<policy label_prefix="fs_log" writeable="yes" root="/"/>
</config> </config>
<route> <any-service> <parent/> </any-service> </route>
</start> </start>
<start name="fs_log"> <start name="terminal_log">
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="1M"/>
<provides><service name="LOG"/></provides> <provides> <service name="LOG"/> </provides>
<config> <config/>
<policy label="log_core -> log"/>
</config>
<route> <route>
<service name="File_system"> <child name="vfs"/> </service> <service name="Terminal"> <child name="file_terminal"/> </service>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</route> </route>
</start> </start>
@ -75,7 +73,7 @@ append config {
<service name="ROM" unscoped_label="ld.lib.so"> <parent/> </service> <service name="ROM" unscoped_label="ld.lib.so"> <parent/> </service>
<service name="ROM" label="log"> <parent label="core_log"/> </service> <service name="ROM" label="log"> <parent label="core_log"/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="Timer"> <child name="timer"/> </service>
<service name="LOG" label="log"> <child name="fs_log"/> </service> <service name="LOG" label="log"> <child name="terminal_log"/> </service>
<service name="PD"> <parent/> </service> <service name="PD"> <parent/> </service>
<service name="CPU"> <parent/> </service> <service name="CPU"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
@ -103,12 +101,15 @@ append config {
install_config $config install_config $config
build_boot_image "core init timer ld.lib.so vfs fs_log log_core vfs.lib.so" build_boot_image {
core init timer ld.lib.so vfs.lib.so libc.lib.so
file_terminal terminal_log log_core
}
append qemu_args " -nographic " append qemu_args " -nographic "
if { [get_cmd_switch --autopilot] } { if { [get_cmd_switch --autopilot] } {
run_genode_until {.*\[init -> vfs] \[.*\n} 20 run_genode_until {.*\[log_core -> log] \[.*\n} 20
} else { } else {
run_genode_until forever run_genode_until forever
} }