9d67f9fc8e
This patch removes old 'Allocator_guard' utility and replaces its use with the modern 'Constrained_ram_allocator'. The adjustment of core in this respect has the side effect of a more accurate capability accounting in core's CPU, TRACE, and RM services. In particular, the dataspace capabilities needed for core-internal allocations via the 'Sliced_heap' are accounted to the client now. The same goes for nitpicker and nic_dump as other former users of the allocator guard. Hence, the patch also touches code at the client and server sides related to these services. The only remaining user of the 'Allocator_guard' is the Intel GPU driver. As the adaptation of this component would be too invasive without testing, this patch leaves this component unchanged by keeping a copy of the 'allocator_guard.h' locally at the component. Fixes #3750
207 lines
5.6 KiB
Plaintext
207 lines
5.6 KiB
Plaintext
create_boot_directory
|
|
|
|
import_from_depot \
|
|
[depot_user]/src/[base_src] \
|
|
[depot_user]/src/coreutils \
|
|
[depot_user]/src/bash \
|
|
[depot_user]/src/init \
|
|
[depot_user]/src/libc \
|
|
[depot_user]/src/fs_rom \
|
|
[depot_user]/src/posix \
|
|
[depot_user]/src/report_rom \
|
|
[depot_user]/src/vfs \
|
|
[depot_user]/src/vfs_import
|
|
|
|
install_config {
|
|
<config>
|
|
<parent-provides>
|
|
<service name="ROM"/>
|
|
<service name="LOG"/>
|
|
<service name="RM"/>
|
|
<service name="CPU"/>
|
|
<service name="PD"/>
|
|
<service name="IRQ"/>
|
|
<service name="IO_MEM"/>
|
|
<service name="IO_PORT"/>
|
|
</parent-provides>
|
|
<default-route>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</default-route>
|
|
<default caps="100"/>
|
|
|
|
<start name="timer">
|
|
<resource name="RAM" quantum="1M"/>
|
|
<provides> <service name="Timer"/> </provides>
|
|
</start>
|
|
|
|
<start name="report_rom">
|
|
<resource name="RAM" quantum="1M"/>
|
|
<provides> <service name="Report"/> <service name="ROM"/> </provides>
|
|
<config verbose="yes"/>
|
|
</start>
|
|
|
|
<start name="vfs">
|
|
<resource name="RAM" quantum="10M"/>
|
|
<provides><service name="File_system"/></provides>
|
|
<config>
|
|
<vfs>
|
|
<tar name="bash.tar"/>
|
|
<tar name="coreutils.tar"/>
|
|
<ram/>
|
|
<import>
|
|
<dir name="items">
|
|
<inline name="1">first</inline>
|
|
<inline name="2">second</inline>
|
|
<inline name="3"><third/></inline>
|
|
</dir>
|
|
<inline name="4">fourth</inline>
|
|
</import>
|
|
</vfs>
|
|
<default-policy root="/" writeable="yes"/>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="vfs_rom">
|
|
<resource name="RAM" quantum="10M"/>
|
|
<binary name="fs_rom"/>
|
|
<provides> <service name="ROM"/> </provides>
|
|
<config/>
|
|
<route>
|
|
<service name="File_system"> <child name="vfs"/> </service>
|
|
<any-service> <parent/> </any-service>
|
|
</route>
|
|
</start>
|
|
|
|
<start name="fs_query" caps="120">
|
|
<resource name="RAM" quantum="1M"/>
|
|
<config>
|
|
<vfs> <dir name="fs"> <fs writeable="yes"/> </dir> </vfs>
|
|
<query path="/fs/items" content="yes"/>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="test" caps="700">
|
|
<binary name="sequence"/>
|
|
<resource name="RAM" quantum="20M"/>
|
|
<config>
|
|
<start name="/bin/sleep" caps="500">
|
|
<config>
|
|
<libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log"/>
|
|
<vfs> <dir name="dev"> <log/> <null/> </dir> </vfs>
|
|
<arg value="/bin/sleep"/>
|
|
<arg value="0.5"/>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="/bin/rm" caps="500">
|
|
<config>
|
|
<libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log"/>
|
|
<vfs>
|
|
<dir name="fs"> <fs writeable="yes"/> </dir>
|
|
<dir name="dev"> <log/> <null/> </dir>
|
|
</vfs>
|
|
<arg value="/bin/rm"/>
|
|
<arg value="/fs/items/2"/>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="/bin/sleep" caps="500">
|
|
<config>
|
|
<libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log"/>
|
|
<vfs> <dir name="dev"> <log/> <null/> </dir> </vfs>
|
|
<arg value="/bin/sleep"/>
|
|
<arg value="0.5"/>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="/bin/cp" caps="500">
|
|
<config>
|
|
<libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log" rtc="/dev/null"/>
|
|
<vfs>
|
|
<dir name="fs"> <fs writeable="yes"/> </dir>
|
|
<dir name="dev"> <log/> <null/> </dir>
|
|
</vfs>
|
|
<arg value="/bin/cp"/>
|
|
<arg value="/fs/4"/>
|
|
<arg value="/fs/items/"/>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="/bin/sleep" caps="500">
|
|
<config>
|
|
<libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log"/>
|
|
<vfs> <dir name="dev"> <log/> <null/> </dir> </vfs>
|
|
<arg value="/bin/sleep"/>
|
|
<arg value="0.5"/>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="/bin/bash" caps="500">
|
|
<config>
|
|
<libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log" rtc="/dev/null"/>
|
|
<vfs>
|
|
<dir name="fs"> <fs writeable="yes"/> </dir>
|
|
<dir name="dev"> <log/> <null/> </dir>
|
|
</vfs>
|
|
<arg value="/bin/bash"/>
|
|
<arg value="-c"/>
|
|
<arg value="echo updated > /fs/items/3"/>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="/bin/sleep" caps="500">
|
|
<config>
|
|
<libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log"/>
|
|
<vfs> <dir name="dev"> <log/> <null/> </dir> </vfs>
|
|
<arg value="/bin/sleep"/>
|
|
<arg value="0.5"/>
|
|
</config>
|
|
</start>
|
|
|
|
</config>
|
|
<route>
|
|
<service name="File_system"> <child name="vfs"/> </service>
|
|
<service name="ROM" label_suffix=".lib.so"> <parent/> </service>
|
|
<service name="ROM" label_prefix="/bin"> <child name="vfs_rom"/> </service>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</route>
|
|
</start>
|
|
</config>
|
|
}
|
|
|
|
build { app/sequence app/fs_query }
|
|
|
|
build_boot_image { sequence fs_query }
|
|
|
|
append qemu_args " -nographic "
|
|
|
|
run_genode_until {.*child "test" exited with exit value 0.*\n} 50
|
|
|
|
grep_output {\[init -> report_rom\].*}
|
|
|
|
set num_listings [regexp -all {report 'fs_query -> listing'} $output dummy]
|
|
|
|
# we expect at least four intermediate reports
|
|
if {$num_listings < 4} {
|
|
puts "Error: Test failed with too few reports generated"
|
|
exit 1
|
|
}
|
|
|
|
#
|
|
# We cannot reliably compare the full output because some file operations
|
|
# may trigger one or two reports depending on the timing of signal delivery.
|
|
# However, we can at least check the last report for validity.
|
|
#
|
|
regsub {.*report 'fs_query -> listing'} $output {} output
|
|
|
|
compare_output_to {
|
|
[init -> report_rom] <listing>
|
|
[init -> report_rom] <dir path="/fs/items">
|
|
[init -> report_rom] <file name="4" writeable="yes">fourth</file>
|
|
[init -> report_rom] <file name="1" writeable="yes">first</file>
|
|
[init -> report_rom] <file name="3" writeable="yes">updated
|
|
[init -> report_rom] </file>
|
|
[init -> report_rom] </dir>
|
|
[init -> report_rom] </listing>
|
|
}
|