diff --git a/repos/base-linux/run/lx_hybrid_ctors.run b/repos/base-linux/run/lx_hybrid_ctors.run index 2cac8f478b..da52b4194d 100644 --- a/repos/base-linux/run/lx_hybrid_ctors.run +++ b/repos/base-linux/run/lx_hybrid_ctors.run @@ -32,6 +32,7 @@ install_config { + diff --git a/repos/base-linux/run/lx_hybrid_exception.run b/repos/base-linux/run/lx_hybrid_exception.run index b6fda192dd..5bd1b5cd57 100644 --- a/repos/base-linux/run/lx_hybrid_exception.run +++ b/repos/base-linux/run/lx_hybrid_exception.run @@ -31,6 +31,7 @@ install_config { + diff --git a/repos/base-linux/run/lx_hybrid_pthread_ipc.run b/repos/base-linux/run/lx_hybrid_pthread_ipc.run index ba3d9d82e3..8380ccade3 100644 --- a/repos/base-linux/run/lx_hybrid_pthread_ipc.run +++ b/repos/base-linux/run/lx_hybrid_pthread_ipc.run @@ -28,6 +28,7 @@ install_config { + diff --git a/repos/base-linux/run/lx_rmap.inc b/repos/base-linux/run/lx_rmap.inc index 1e32f14aaf..19525a0822 100644 --- a/repos/base-linux/run/lx_rmap.inc +++ b/repos/base-linux/run/lx_rmap.inc @@ -27,16 +27,14 @@ set config { - + - - - - } + + } append_if [expr {$test_type eq "static"}] config { } diff --git a/repos/base-linux/run/region_map_mmap.run b/repos/base-linux/run/region_map_mmap.run index 6ea2fee1f8..7965f8c634 100644 --- a/repos/base-linux/run/region_map_mmap.run +++ b/repos/base-linux/run/region_map_mmap.run @@ -18,6 +18,7 @@ install_config { + diff --git a/repos/base-nova/run/platform.run b/repos/base-nova/run/platform.run index 9991593a84..ae9869bde8 100644 --- a/repos/base-nova/run/platform.run +++ b/repos/base-nova/run/platform.run @@ -20,8 +20,8 @@ set config { - - } + + } append config " " @@ -35,7 +35,7 @@ install_config $config build_boot_image "core ld.lib.so init test-platform" -append qemu_args "-nographic -m 128 -smp 2" +append qemu_args "-nographic -m 192 -smp 2" run_genode_until {Test finished} 200 diff --git a/repos/base-nova/src/test/platform/main.cc b/repos/base-nova/src/test/platform/main.cc index fd908c851d..3458039375 100644 --- a/repos/base-nova/src/test/platform/main.cc +++ b/repos/base-nova/src/test/platform/main.cc @@ -24,7 +24,6 @@ #include #include -#include #include @@ -270,7 +269,7 @@ void test_revoke(Genode::Env &env) void test_pat(Genode::Env &env) { /* read out the tsc frequenzy once */ - Genode::Attached_rom_dataspace _ds("hypervisor_info_page"); + Genode::Attached_rom_dataspace _ds(env, "hypervisor_info_page"); Nova::Hip * const hip = _ds.local_addr(); enum { DS_ORDER = 12, PAGE_4K = 12 }; @@ -601,9 +600,6 @@ class Greedy : public Genode::Thread { /* print status information in interval of 32M */ if (i % 8192 == 0) { - /* transfer some quota to avoid tons of upgrade messages */ - char const * const buf = "ram_quota=1280K"; - _env.upgrade(Genode::Parent::Env::pd(), buf); log(Hex(i * 4096)); /* trigger some work to see quota in kernel decreasing */ // Nova::Rights rwx(true, true, true); @@ -647,8 +643,13 @@ Main::Main(Env &env) : env(env) log("testing base-nova platform"); try { - Genode::config()->xml_node().attribute("check_pat").value(&check_pat); - } catch (...) { } + Attached_rom_dataspace config(env, "config"); + config.xml().attribute("check_pat").value(&check_pat); + } catch (...) { + Genode::error("no check_pat attribute found"); + env.parent().exit(-__LINE__); + return; + } Thread * myself = Thread::myself(); if (!myself) { diff --git a/repos/base/run/ada.run b/repos/base/run/ada.run index 7181d7d6a1..9bc00dd693 100644 --- a/repos/base/run/ada.run +++ b/repos/base/run/ada.run @@ -14,6 +14,7 @@ install_config { + diff --git a/repos/base/run/affinity.run b/repos/base/run/affinity.run index 599329e880..306abac839 100644 --- a/repos/base/run/affinity.run +++ b/repos/base/run/affinity.run @@ -37,7 +37,8 @@ set config { - } + + } append_if [have_spec arndale] config { diff --git a/repos/base/run/ds_ownership.run b/repos/base/run/ds_ownership.run index 009a0e8f88..244ce77c7b 100644 --- a/repos/base/run/ds_ownership.run +++ b/repos/base/run/ds_ownership.run @@ -13,7 +13,7 @@ install_config { - + diff --git a/repos/base/run/fpu.run b/repos/base/run/fpu.run index 53c846a5f5..29433c9ebe 100644 --- a/repos/base/run/fpu.run +++ b/repos/base/run/fpu.run @@ -23,6 +23,7 @@ install_config { + diff --git a/repos/base/run/log.run b/repos/base/run/log.run index d70835805c..87acbe289c 100644 --- a/repos/base/run/log.run +++ b/repos/base/run/log.run @@ -14,6 +14,7 @@ install_config { + diff --git a/repos/base/run/mp_server.run b/repos/base/run/mp_server.run index 6c932bf502..0210ad8377 100644 --- a/repos/base/run/mp_server.run +++ b/repos/base/run/mp_server.run @@ -21,6 +21,7 @@ install_config { + diff --git a/repos/base/run/new_delete.run b/repos/base/run/new_delete.run index f82790c329..d582c854e3 100644 --- a/repos/base/run/new_delete.run +++ b/repos/base/run/new_delete.run @@ -14,6 +14,7 @@ install_config { + diff --git a/repos/base/run/platform_drv.inc b/repos/base/run/platform_drv.inc index 2f05d367af..3237a1b62f 100644 --- a/repos/base/run/platform_drv.inc +++ b/repos/base/run/platform_drv.inc @@ -129,10 +129,8 @@ proc platform_drv_config {} { if {[have_spec acpi]} { - append drv_config " - " - append drv_config { + @@ -172,10 +170,8 @@ proc platform_drv_config {} { if {[have_platform_drv]} { - append drv_config " - " - append drv_config { + } diff --git a/repos/base/run/reconstructible.run b/repos/base/run/reconstructible.run index 1abad5d697..765d3ac864 100644 --- a/repos/base/run/reconstructible.run +++ b/repos/base/run/reconstructible.run @@ -15,6 +15,7 @@ install_config { + diff --git a/repos/base/run/rm_fault.run b/repos/base/run/rm_fault.run index 2c483032b3..2f10801148 100644 --- a/repos/base/run/rm_fault.run +++ b/repos/base/run/rm_fault.run @@ -18,7 +18,7 @@ install_config { - + diff --git a/repos/base/run/rm_nested.run b/repos/base/run/rm_nested.run index 88482df463..a67da07db4 100644 --- a/repos/base/run/rm_nested.run +++ b/repos/base/run/rm_nested.run @@ -18,6 +18,7 @@ install_config { + diff --git a/repos/base/run/slab.run b/repos/base/run/slab.run index a435032270..4f7ae448f4 100644 --- a/repos/base/run/slab.run +++ b/repos/base/run/slab.run @@ -23,6 +23,7 @@ install_config { + diff --git a/repos/base/run/sub_rm.run b/repos/base/run/sub_rm.run index 237f924154..de84c3311d 100644 --- a/repos/base/run/sub_rm.run +++ b/repos/base/run/sub_rm.run @@ -15,6 +15,7 @@ install_config { + diff --git a/repos/base/run/synced_interface.run b/repos/base/run/synced_interface.run index f91b1e503f..6690e0dd79 100644 --- a/repos/base/run/synced_interface.run +++ b/repos/base/run/synced_interface.run @@ -15,6 +15,7 @@ install_config { + diff --git a/repos/base/run/thread.run b/repos/base/run/thread.run index 9d23b6d4cf..40625c8a06 100644 --- a/repos/base/run/thread.run +++ b/repos/base/run/thread.run @@ -25,7 +25,7 @@ set config { - + } diff --git a/repos/base/run/util_mmio.run b/repos/base/run/util_mmio.run index fe600f44a9..86f7e62d29 100644 --- a/repos/base/run/util_mmio.run +++ b/repos/base/run/util_mmio.run @@ -24,6 +24,7 @@ install_config { + diff --git a/repos/dde_bsd/run/audio_in.run b/repos/dde_bsd/run/audio_in.run index eb21616140..bae56d7a6b 100644 --- a/repos/dde_bsd/run/audio_in.run +++ b/repos/dde_bsd/run/audio_in.run @@ -49,6 +49,7 @@ append config { + diff --git a/repos/dde_bsd/run/audio_out.run b/repos/dde_bsd/run/audio_out.run index 853c02a426..9e9cda288f 100644 --- a/repos/dde_bsd/run/audio_out.run +++ b/repos/dde_bsd/run/audio_out.run @@ -52,6 +52,7 @@ append config { + diff --git a/repos/dde_linux/run/intel_fb.run b/repos/dde_linux/run/intel_fb.run index c2c1048347..5a723e2ca0 100644 --- a/repos/dde_linux/run/intel_fb.run +++ b/repos/dde_linux/run/intel_fb.run @@ -38,7 +38,8 @@ append config { - } + + } append_platform_drv_config @@ -83,7 +84,7 @@ append config { - + diff --git a/repos/dde_linux/run/lxip_http_srv.run b/repos/dde_linux/run/lxip_http_srv.run index 4dfd0b05d6..50995d0cb9 100644 --- a/repos/dde_linux/run/lxip_http_srv.run +++ b/repos/dde_linux/run/lxip_http_srv.run @@ -49,11 +49,12 @@ set config { + - + @@ -84,7 +85,7 @@ append_platform_drv_config append_if $use_nic_driver config { - + } diff --git a/repos/dde_linux/run/lxip_udp_echo.run b/repos/dde_linux/run/lxip_udp_echo.run index 93f54835a0..3b38c56653 100644 --- a/repos/dde_linux/run/lxip_udp_echo.run +++ b/repos/dde_linux/run/lxip_udp_echo.run @@ -47,11 +47,12 @@ append config { + - + @@ -83,7 +84,7 @@ append_platform_drv_config append_if $use_nic_driver config { - + } diff --git a/repos/dde_linux/run/usb_hid.run b/repos/dde_linux/run/usb_hid.run index 379a5bc619..4805e3ca8e 100644 --- a/repos/dde_linux/run/usb_hid.run +++ b/repos/dde_linux/run/usb_hid.run @@ -96,7 +96,8 @@ append config { - } + + } append_if [have_spec gpio] config " diff --git a/repos/dde_linux/run/usb_hid_panda.run b/repos/dde_linux/run/usb_hid_panda.run index 33a0a6b1d4..71c7444175 100644 --- a/repos/dde_linux/run/usb_hid_panda.run +++ b/repos/dde_linux/run/usb_hid_panda.run @@ -33,6 +33,7 @@ append config { + diff --git a/repos/dde_linux/run/usb_net.run b/repos/dde_linux/run/usb_net.run index 0e34ad86bf..98b0f008c0 100644 --- a/repos/dde_linux/run/usb_net.run +++ b/repos/dde_linux/run/usb_net.run @@ -50,12 +50,13 @@ set config { + - + @@ -64,11 +65,10 @@ set config { - + - - - + + } @@ -94,7 +94,7 @@ install_config $config # generic modules set boot_modules { core ld.lib.so init timer usb_drv - libc.lib.so lwip.lib.so posix.lib.so test-lwip_httpsrv + libc.lib.so libm.lib.so lwip.lib.so posix.lib.so test-lwip_httpsrv } append_platform_drv_boot_modules @@ -105,4 +105,5 @@ build_boot_image $boot_modules append qemu_args " -m 256 -nographic" run_genode_until forever + # vi: set ft=tcl : diff --git a/repos/dde_linux/run/usb_storage.run b/repos/dde_linux/run/usb_storage.run index 8eae6a82d5..90735032a3 100644 --- a/repos/dde_linux/run/usb_storage.run +++ b/repos/dde_linux/run/usb_storage.run @@ -47,7 +47,8 @@ set config { - } + + } append_platform_drv_config diff --git a/repos/dde_linux/run/usb_terminal.run b/repos/dde_linux/run/usb_terminal.run index fc214fc852..aa4c9686d8 100644 --- a/repos/dde_linux/run/usb_terminal.run +++ b/repos/dde_linux/run/usb_terminal.run @@ -54,7 +54,8 @@ append config { - } + + } append_if [have_spec gpio] config " diff --git a/repos/dde_linux/run/vfs_cfg.run b/repos/dde_linux/run/vfs_cfg.run index fd64132182..dae2ff2bfb 100644 --- a/repos/dde_linux/run/vfs_cfg.run +++ b/repos/dde_linux/run/vfs_cfg.run @@ -30,13 +30,14 @@ append config { + - + @@ -63,7 +64,7 @@ append config { - + diff --git a/repos/dde_linux/run/vfs_lxip.run b/repos/dde_linux/run/vfs_lxip.run index 461383cc54..62c8ea5fb8 100644 --- a/repos/dde_linux/run/vfs_lxip.run +++ b/repos/dde_linux/run/vfs_lxip.run @@ -34,13 +34,14 @@ append config { + - + - + diff --git a/repos/dde_linux/run/wifi.run b/repos/dde_linux/run/wifi.run index 74db066f6f..fb38c6d726 100644 --- a/repos/dde_linux/run/wifi.run +++ b/repos/dde_linux/run/wifi.run @@ -45,6 +45,7 @@ set config { + @@ -82,7 +83,7 @@ append config { - + diff --git a/repos/dde_rump/run/libc_vfs_ext2.run b/repos/dde_rump/run/libc_vfs_ext2.run index e931005c14..5305dbcf26 100644 --- a/repos/dde_rump/run/libc_vfs_ext2.run +++ b/repos/dde_rump/run/libc_vfs_ext2.run @@ -48,6 +48,7 @@ append config { + @@ -57,7 +58,7 @@ append config { - + diff --git a/repos/dde_rump/run/rump_ext2.run b/repos/dde_rump/run/rump_ext2.run index 82a2a776e2..2cff66fbee 100644 --- a/repos/dde_rump/run/rump_ext2.run +++ b/repos/dde_rump/run/rump_ext2.run @@ -48,6 +48,7 @@ append config { + @@ -57,7 +58,7 @@ append config { - + diff --git a/repos/dde_rump/run/vfs_stress_ext2.run b/repos/dde_rump/run/vfs_stress_ext2.run index c069127757..f27659606e 100644 --- a/repos/dde_rump/run/vfs_stress_ext2.run +++ b/repos/dde_rump/run/vfs_stress_ext2.run @@ -36,6 +36,7 @@ install_config { + @@ -45,7 +46,7 @@ install_config { - + diff --git a/repos/dde_rump/run/vfs_stress_rump_fs.run b/repos/dde_rump/run/vfs_stress_rump_fs.run index 8768d76d1c..2d7fd2d2a1 100644 --- a/repos/dde_rump/run/vfs_stress_rump_fs.run +++ b/repos/dde_rump/run/vfs_stress_rump_fs.run @@ -36,6 +36,7 @@ install_config { + @@ -51,11 +52,11 @@ install_config { - + - + diff --git a/repos/demo/src/app/launchpad/README b/repos/demo/src/app/launchpad/README index bba19e3501..cadc665c05 100644 --- a/repos/demo/src/app/launchpad/README +++ b/repos/demo/src/app/launchpad/README @@ -8,8 +8,8 @@ following example configuration tells launchpad to display a list of three launcher entries: ! -! -! -! +! +! +! ! diff --git a/repos/gems/recipes/raw/themed_wm/decorator_init.config b/repos/gems/recipes/raw/themed_wm/decorator_init.config index cb95492f2f..acb2a7dac0 100644 --- a/repos/gems/recipes/raw/themed_wm/decorator_init.config +++ b/repos/gems/recipes/raw/themed_wm/decorator_init.config @@ -9,7 +9,7 @@ - + diff --git a/repos/gems/recipes/raw/themed_wm/wm.config b/repos/gems/recipes/raw/themed_wm/wm.config deleted file mode 100644 index 82aecb7c6c..0000000000 --- a/repos/gems/recipes/raw/themed_wm/wm.config +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/repos/gems/recipes/raw/wm/decorator_init.config b/repos/gems/recipes/raw/wm/decorator_init.config index 52941f9648..c5e3e87ac0 100644 --- a/repos/gems/recipes/raw/wm/decorator_init.config +++ b/repos/gems/recipes/raw/wm/decorator_init.config @@ -9,7 +9,7 @@ - + </controls> diff --git a/repos/gems/recipes/raw/wm/wm.config b/repos/gems/recipes/raw/wm/wm.config index 82aecb7c6c..e638ec1765 100644 --- a/repos/gems/recipes/raw/wm/wm.config +++ b/repos/gems/recipes/raw/wm/wm.config @@ -13,6 +13,8 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> + <service name="Nitpicker"> <default-policy> <child name="wm"/> </default-policy> </service> @@ -35,7 +37,7 @@ </config> </start> - <start name="wm"> + <start name="wm" caps="150"> <resource name="RAM" quantum="6M"/> <provides> <service name="Nitpicker"/> @@ -69,7 +71,7 @@ </route> </start> - <start name="decorator"> + <start name="decorator" caps="250"> <binary name="init"/> <resource name="RAM" quantum="12M"/> <route> diff --git a/repos/gems/run/cpu_load_display.run b/repos/gems/run/cpu_load_display.run index bb1ef668bf..579d8bdd8a 100644 --- a/repos/gems/run/cpu_load_display.run +++ b/repos/gems/run/cpu_load_display.run @@ -53,7 +53,8 @@ append config { </parent-provides> <default-route> <any-service> <parent/> <any-child/> </any-service> - </default-route>} + </default-route> + <default caps="100"/>} append_if [have_spec sdl] config { <start name="fb_sdl"> @@ -67,7 +68,7 @@ append_if [have_spec sdl] config { append_platform_drv_config append_if [have_spec framebuffer] config { - <start name="fb_drv"> + <start name="fb_drv" caps="200"> <resource name="RAM" quantum="10M"/> <provides><service name="Framebuffer"/></provides> <config buffered="yes"/> diff --git a/repos/gems/run/cpu_sampler.run b/repos/gems/run/cpu_sampler.run index 52de9114f4..cd64025d9f 100644 --- a/repos/gems/run/cpu_sampler.run +++ b/repos/gems/run/cpu_sampler.run @@ -36,6 +36,7 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="1M"/> <provides> diff --git a/repos/gems/run/cpu_sampler_noux.run b/repos/gems/run/cpu_sampler_noux.run index 89af0e7658..50ca49d87b 100644 --- a/repos/gems/run/cpu_sampler_noux.run +++ b/repos/gems/run/cpu_sampler_noux.run @@ -77,6 +77,7 @@ append config { <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> @@ -185,7 +186,7 @@ append config { </route> </start> - <start name="noux"> + <start name="noux" caps="500"> <resource name="RAM" quantum="16M" /> <config> <fstab> diff --git a/repos/gems/run/launcher.run b/repos/gems/run/launcher.run index d9b3731407..b0f8384507 100644 --- a/repos/gems/run/launcher.run +++ b/repos/gems/run/launcher.run @@ -31,12 +31,14 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="50"/> + <start name="timer"> <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers"> + <start name="drivers" caps="300"> <resource name="RAM" quantum="32M"/> <binary name="init"/> <route> @@ -49,7 +51,7 @@ install_config { </provides> </start> - <start name="nitpicker"> + <start name="nitpicker" caps="100"> <resource name="RAM" quantum="1M"/> <provides><service name="Nitpicker"/></provides> <config> @@ -214,38 +216,38 @@ install_config { </route> </start> - <start name="launcher"> + <start name="launcher" caps="1000"> <resource name="RAM" quantum="60M" /> <config focus_prefix="wm -> launcher -> "> - <subsystem name="scout" title="Scout"> + <subsystem name="scout" title="Scout" caps="200"> <resource name="RAM" quantum="20M" /> <binary name="scout" /> </subsystem> - <subsystem name="testnit1" title="Nitpicker Test"> + <subsystem name="testnit1" title="Nitpicker Test" caps="25"> <resource name="RAM" quantum="2M" /> <binary name="testnit" /> </subsystem> - <subsystem name="testnit2" title="Nitpicker Test 2"> + <subsystem name="testnit2" title="Nitpicker Test 2" caps="25"> <resource name="RAM" quantum="2M" /> <binary name="testnit" /> </subsystem> - <subsystem name="testnit3" title="Nitpicker Test 3"> + <subsystem name="testnit3" title="Nitpicker Test 3" caps="25"> <resource name="RAM" quantum="2M" /> <binary name="testnit" /> </subsystem> - <subsystem name="scout2" title="Scoutx"> + <subsystem name="scout2" title="Scoutx" caps="25"> <resource name="RAM" quantum="20M" /> <binary name="scout" /> </subsystem> - <subsystem name="testnit4" title="Nitpicker Testx"> + <subsystem name="testnit4" title="Nitpicker Testx" caps="25"> <resource name="RAM" quantum="2M" /> <binary name="testnit" /> </subsystem> - <subsystem name="testnit5" title="Nitpicker Test5"> + <subsystem name="testnit5" title="Nitpicker Test5" caps="25"> <resource name="RAM" quantum="2M" /> <binary name="testnit" /> </subsystem> - <subsystem name="backdrop" title="Backdrop"> + <subsystem name="backdrop" title="Backdrop" caps="25"> <resource name="RAM" quantum="4M"/> <binary name="backdrop" /> <config> diff --git a/repos/gems/run/mixer_gui_qt_test.run b/repos/gems/run/mixer_gui_qt_test.run index 917397e4a1..d980673229 100644 --- a/repos/gems/run/mixer_gui_qt_test.run +++ b/repos/gems/run/mixer_gui_qt_test.run @@ -50,6 +50,7 @@ set config { <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> @@ -111,7 +112,7 @@ append config { <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="wm" > + <start name="wm" caps="150"> <resource name="RAM" quantum="16M"/> <provides><service name="Nitpicker"/></provides> <config> @@ -179,7 +180,7 @@ append config { </config> </start> - <start name="mixer_gui_qt"> + <start name="mixer_gui_qt" caps="200"> <resource name="RAM" quantum="32M"/> <config ld_verbose="yes"> <libc stdout="/dev/log" stderr="/dev/log"> diff --git a/repos/gems/run/tcp_terminal.run b/repos/gems/run/tcp_terminal.run index 0a61f9e14a..050d7738a9 100644 --- a/repos/gems/run/tcp_terminal.run +++ b/repos/gems/run/tcp_terminal.run @@ -49,6 +49,7 @@ set config { <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> @@ -57,7 +58,7 @@ set config { <resource name="RAM" quantum="4M"/> <provides> <service name="Nic"/> </provides> </start> - <start name="tcp_terminal"> + <start name="tcp_terminal" caps="200"> <resource name="RAM" quantum="2560K"/> <provides> <service name="Terminal"/> </provides> <config> diff --git a/repos/gems/run/terminal_echo.run b/repos/gems/run/terminal_echo.run index 81705aae22..b294c5f4e0 100644 --- a/repos/gems/run/terminal_echo.run +++ b/repos/gems/run/terminal_echo.run @@ -30,6 +30,7 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> } append_if [have_spec sdl] config { @@ -46,7 +47,7 @@ append_if [have_spec sdl] config { append_platform_drv_config append_if [have_spec framebuffer] config { - <start name="fb_drv"> + <start name="fb_drv" caps="200"> <resource name="RAM" quantum="4M"/> <provides><service name="Framebuffer"/></provides> <config width="640" height="480"/> diff --git a/repos/gems/run/terminal_log.run b/repos/gems/run/terminal_log.run index 11383e0f83..a1611c6b78 100644 --- a/repos/gems/run/terminal_log.run +++ b/repos/gems/run/terminal_log.run @@ -46,6 +46,7 @@ append config { <service name="Platform"> <child name="platform_drv"/> </service> <any-service><parent/></any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> @@ -66,7 +67,7 @@ append_if [have_spec sdl] config { append_platform_drv_config append_if [have_spec framebuffer] config { - <start name="fb_drv"> + <start name="fb_drv" caps="200"> <resource name="RAM" quantum="4M"/> <provides><service name="Framebuffer"/></provides> </start>} diff --git a/repos/gems/run/wm.run b/repos/gems/run/wm.run index bf5fc06739..815401a5d9 100644 --- a/repos/gems/run/wm.run +++ b/repos/gems/run/wm.run @@ -31,13 +31,14 @@ install_config { <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="drivers"> + <start name="drivers" caps="1000"> <resource name="RAM" quantum="32M"/> <binary name="init"/> <route> @@ -70,7 +71,7 @@ install_config { </route> </start> - <start name="wm"> + <start name="wm" caps="1000"> <resource name="RAM" quantum="24M"/> <binary name="init"/> <provides> <service name="Nitpicker"/> </provides> @@ -81,19 +82,19 @@ install_config { </route> </start> - <start name="launchpad" priority="-1"> + <start name="launchpad" priority="-1" caps="500"> <resource name="RAM" quantum="20M"/> <config> - <launcher name="nit_fb" ram_quota="7M"> + <launcher name="nit_fb" ram_quota="7M" caps="30"> <config width="500" height="400" /> </launcher> - <launcher name="nitpicker" ram_quota="1M" > + <launcher name="nitpicker" ram_quota="1M" caps="50"> <config> <domain name="default" layer="2" /> <default-policy domain="default"/> </config> </launcher> - <launcher name="testnit" ram_quota="768K" /> + <launcher name="testnit" ram_quota="768K" caps="30"/> </config> <route> <any-service> <child name="wm"/> <parent/> <any-child/> diff --git a/repos/hello_tutorial/run/hello.run b/repos/hello_tutorial/run/hello.run index e0f80e5755..744321e63c 100644 --- a/repos/hello_tutorial/run/hello.run +++ b/repos/hello_tutorial/run/hello.run @@ -22,6 +22,7 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="50"/> <start name="hello_server"> <resource name="RAM" quantum="1M"/> <provides> <service name="Hello"/> </provides> diff --git a/repos/libports/run/acpica.run b/repos/libports/run/acpica.run index cc69a92c92..7f6d00c0aa 100644 --- a/repos/libports/run/acpica.run +++ b/repos/libports/run/acpica.run @@ -64,6 +64,7 @@ set config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="2M"/> <provides><service name="Timer"/></provides> diff --git a/repos/libports/run/avplay.run b/repos/libports/run/avplay.run index bea07d4de2..95ea1a57d2 100644 --- a/repos/libports/run/avplay.run +++ b/repos/libports/run/avplay.run @@ -46,6 +46,7 @@ set config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> } append_if [have_spec sdl] config { @@ -87,7 +88,7 @@ append config { <service name="Audio_out"/> </provides> </start> - <start name="avplay"> + <start name="avplay" caps="200"> <resource name="RAM" quantum="64M"/> <config> <arg value="avplay"/> diff --git a/repos/libports/run/eglgears.run b/repos/libports/run/eglgears.run index 5e3e0a6647..9bffdee7b1 100644 --- a/repos/libports/run/eglgears.run +++ b/repos/libports/run/eglgears.run @@ -28,13 +28,15 @@ set config { <service name="CPU"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> } append_if [have_spec sdl] config { - <start name="fb_sdl"> + <start name="fb_sdl" caps="200"> <resource name="RAM" quantum="4M"/> <provides> <service name="Input"/> @@ -45,7 +47,7 @@ append_if [have_spec sdl] config { append_platform_drv_config append_if [have_spec framebuffer] config { - <start name="fb_drv"> + <start name="fb_drv" caps="200"> <resource name="RAM" quantum="4M"/> <provides><service name="Framebuffer"/></provides> </start>} @@ -75,10 +77,10 @@ append config { <start name="pointer"> <resource name="RAM" quantum="1M"/> </start> - <start name="launchpad"> + <start name="launchpad" caps="400"> <resource name="RAM" quantum="1G"/> <config> - <launcher name="init" ram_quota="100M"> + <launcher name="init" ram_quota="100M" caps="300"> <config> <parent-provides> <service name="ROM"/> @@ -94,6 +96,7 @@ append config { <service name="Nitpicker"/> <service name="Timer"/> </parent-provides> + <default caps="100"/> <start name="nit_fb"> <resource name="RAM" quantum="2M"/> <provides><service name="Input"/><service name="Framebuffer"/></provides> diff --git a/repos/libports/run/ldso.run b/repos/libports/run/ldso.run index b73c1a5e9f..84867bbac8 100644 --- a/repos/libports/run/ldso.run +++ b/repos/libports/run/ldso.run @@ -14,6 +14,7 @@ set config { <default-route> <any-service> <parent/> </any-service> </default-route> + <default caps="100"/> <start name="test-ldso"> <resource name="RAM" quantum="2M"/> <config ld_bind_now="no" ld_verbose="no"> diff --git a/repos/libports/run/libc.run b/repos/libports/run/libc.run index e4ecbe9f5b..4af7229bd2 100644 --- a/repos/libports/run/libc.run +++ b/repos/libports/run/libc.run @@ -19,6 +19,7 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="test-libc"> <resource name="RAM" quantum="4M"/> <config> diff --git a/repos/libports/run/libc_block.run b/repos/libports/run/libc_block.run index 9df8fd3e22..d8c9b6940c 100644 --- a/repos/libports/run/libc_block.run +++ b/repos/libports/run/libc_block.run @@ -52,6 +52,7 @@ set config { <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> diff --git a/repos/libports/run/libc_component.run b/repos/libports/run/libc_component.run index 36183e8e41..82ae1afffd 100644 --- a/repos/libports/run/libc_component.run +++ b/repos/libports/run/libc_component.run @@ -28,6 +28,7 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="1M"/> diff --git a/repos/libports/run/libc_counter.run b/repos/libports/run/libc_counter.run index c0ca9db11b..c8f4700208 100644 --- a/repos/libports/run/libc_counter.run +++ b/repos/libports/run/libc_counter.run @@ -27,6 +27,7 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="1M"/> diff --git a/repos/libports/run/libc_ffat_fs.run b/repos/libports/run/libc_ffat_fs.run index 5701c48032..fea38c4180 100644 --- a/repos/libports/run/libc_ffat_fs.run +++ b/repos/libports/run/libc_ffat_fs.run @@ -53,6 +53,7 @@ set config { <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> diff --git a/repos/libports/run/libc_filesystem_test.inc b/repos/libports/run/libc_filesystem_test.inc index 8268f506b0..f588ec9825 100644 --- a/repos/libports/run/libc_filesystem_test.inc +++ b/repos/libports/run/libc_filesystem_test.inc @@ -70,6 +70,7 @@ set config { <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> diff --git a/repos/libports/run/libc_getenv.run b/repos/libports/run/libc_getenv.run index 986c2d156c..6c60829e1c 100644 --- a/repos/libports/run/libc_getenv.run +++ b/repos/libports/run/libc_getenv.run @@ -15,6 +15,7 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="2M"/> <provides> <service name="Timer"/> </provides> diff --git a/repos/libports/run/libc_pipe.run b/repos/libports/run/libc_pipe.run index ac99831fd1..3113b39581 100644 --- a/repos/libports/run/libc_pipe.run +++ b/repos/libports/run/libc_pipe.run @@ -19,6 +19,7 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="test-libc_pipe"> <resource name="RAM" quantum="4M"/> <config> diff --git a/repos/libports/run/libc_select.run b/repos/libports/run/libc_select.run index c5e1dfba65..613c68066d 100644 --- a/repos/libports/run/libc_select.run +++ b/repos/libports/run/libc_select.run @@ -24,6 +24,7 @@ set config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="2M"/> diff --git a/repos/libports/run/libc_vfs.run b/repos/libports/run/libc_vfs.run index 45d0bf1b56..ad27c9e804 100644 --- a/repos/libports/run/libc_vfs.run +++ b/repos/libports/run/libc_vfs.run @@ -29,6 +29,7 @@ set config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="ram_fs"> <resource name="RAM" quantum="12M"/> <provides> <service name="File_system"/> </provides> diff --git a/repos/libports/run/libc_vfs_block.run b/repos/libports/run/libc_vfs_block.run index 8e51ead5d1..dd8ce110ac 100644 --- a/repos/libports/run/libc_vfs_block.run +++ b/repos/libports/run/libc_vfs_block.run @@ -29,6 +29,7 @@ set config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="ram_blk"> <resource name="RAM" quantum="2M"/> <provides> <service name="Block"/> </provides> diff --git a/repos/libports/run/libc_vfs_component.run b/repos/libports/run/libc_vfs_component.run index 45ef119ce3..0947909ad4 100644 --- a/repos/libports/run/libc_vfs_component.run +++ b/repos/libports/run/libc_vfs_component.run @@ -28,6 +28,7 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="1M"/> diff --git a/repos/libports/run/libc_vfs_counter.run b/repos/libports/run/libc_vfs_counter.run index 9efa39581b..4e9b0597bc 100644 --- a/repos/libports/run/libc_vfs_counter.run +++ b/repos/libports/run/libc_vfs_counter.run @@ -28,6 +28,7 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="1M"/> diff --git a/repos/libports/run/libc_vfs_fs.run b/repos/libports/run/libc_vfs_fs.run index 4fe0fc7576..83072e2a14 100644 --- a/repos/libports/run/libc_vfs_fs.run +++ b/repos/libports/run/libc_vfs_fs.run @@ -29,6 +29,7 @@ set config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="vfs"> <resource name="RAM" quantum="12M"/> <provides> <service name="File_system"/> </provides> diff --git a/repos/libports/run/libc_vfs_ram.run b/repos/libports/run/libc_vfs_ram.run index 486b82d328..67229ddd4d 100644 --- a/repos/libports/run/libc_vfs_ram.run +++ b/repos/libports/run/libc_vfs_ram.run @@ -29,7 +29,7 @@ set config { <service name="CPU"/> <service name="LOG"/> </parent-provides> - <start name="test-libc_vfs"> + <start name="test-libc_vfs" caps="100"> <resource name="RAM" quantum="12M"/> <route> <any-service> <parent/> </any-service> diff --git a/repos/libports/run/libc_vfs_select.run b/repos/libports/run/libc_vfs_select.run index 6886a3f35d..a19c434344 100644 --- a/repos/libports/run/libc_vfs_select.run +++ b/repos/libports/run/libc_vfs_select.run @@ -24,6 +24,7 @@ set config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="2M"/> diff --git a/repos/libports/run/libc_with_libc.run b/repos/libports/run/libc_with_libc.run index 60cf536213..79e9c78c35 100644 --- a/repos/libports/run/libc_with_libc.run +++ b/repos/libports/run/libc_with_libc.run @@ -26,6 +26,7 @@ set config { <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> diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index 6dd70dbf1c..1a7a4594b9 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -72,6 +72,7 @@ set config { <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> diff --git a/repos/libports/run/lwip_lx.run b/repos/libports/run/lwip_lx.run index 4d8dd07467..debb9450d3 100644 --- a/repos/libports/run/lwip_lx.run +++ b/repos/libports/run/lwip_lx.run @@ -32,6 +32,7 @@ set config { <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> diff --git a/repos/libports/run/moon.run b/repos/libports/run/moon.run index 57f153f333..bbd8f502bb 100644 --- a/repos/libports/run/moon.run +++ b/repos/libports/run/moon.run @@ -21,6 +21,7 @@ install_config { <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> @@ -42,4 +43,4 @@ build_boot_image { append qemu_args " -nographic -m 65 " -run_genode_until {.*test-moon.*Finished\..*} 30 +run_genode_until {.*test-moon.*Finished\..*} 40 diff --git a/repos/libports/run/mupdf.run b/repos/libports/run/mupdf.run index 074f144e61..ff5d4d81da 100644 --- a/repos/libports/run/mupdf.run +++ b/repos/libports/run/mupdf.run @@ -28,6 +28,7 @@ set config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> } append_if [have_spec sdl] config { @@ -42,7 +43,7 @@ append_if [have_spec sdl] config { append_platform_drv_config append_if [have_spec framebuffer] config { - <start name="fb_drv"> + <start name="fb_drv" caps="200"> <resource name="RAM" quantum="4M"/> <provides><service name="Framebuffer"/></provides> </start>} diff --git a/repos/libports/run/netty.inc b/repos/libports/run/netty.inc index a696d20c85..a4fcf62f84 100644 --- a/repos/libports/run/netty.inc +++ b/repos/libports/run/netty.inc @@ -27,6 +27,7 @@ append config { <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> @@ -42,7 +43,7 @@ append config { <provides> <service name="Nic"/> </provides> </start> - <start name="socket_fs"> + <start name="socket_fs" caps="200"> <binary name="vfs"/> <resource name="RAM" quantum="32M"/> <provides> <service name="File_system"/> </provides> diff --git a/repos/libports/run/nic_bridge.run b/repos/libports/run/nic_bridge.run index 5cb7720e09..5b2335ed8d 100644 --- a/repos/libports/run/nic_bridge.run +++ b/repos/libports/run/nic_bridge.run @@ -37,7 +37,8 @@ append config { </parent-provides> <default-route> <any-service> <parent/> <any-child/> </any-service> - </default-route>} + </default-route> + <default caps="100"/>} append_platform_drv_config @@ -51,7 +52,7 @@ append config { <resource name="RAM" quantum="4M"/> <provides><service name="Nic"/></provides> </start> - <start name="nic_bridge"> + <start name="nic_bridge" caps="200"> <resource name="RAM" quantum="24M"/> <provides><service name="Nic"/></provides> <config> diff --git a/repos/libports/run/nic_dump.run b/repos/libports/run/nic_dump.run index 8bde36d1b2..13c979d047 100644 --- a/repos/libports/run/nic_dump.run +++ b/repos/libports/run/nic_dump.run @@ -91,7 +91,7 @@ proc ram_quota { prot } { proc client_config { prot index ip_addr gateway netmask nic srv_port srv_ip } { append result { - <start name="} $prot {_client_} $index {"> + <start name="} $prot {_client_} $index {" caps="200"> <binary name="} [client_bin $prot] {" /> <resource name="RAM" quantum="} [ram_quota $prot] {"/> <route> @@ -109,7 +109,7 @@ proc client_config { prot index ip_addr gateway netmask nic srv_port srv_ip } { proc server_config { prot index ip_addr gateway netmask nic port } { append result { - <start name="} $prot {_server_} $index {"> + <start name="} $prot {_server_} $index {" caps="200"> <binary name="} [server_bin $prot] {" /> <resource name="RAM" quantum="} [ram_quota $prot] {"/> <route> @@ -155,6 +155,8 @@ append config { <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> + } [gpio_drv_config] { } [nic_drv_config] { } [platform_drv_config] { @@ -221,7 +223,7 @@ append config { </route> </start> - <start name="nic_bridge"> + <start name="nic_bridge" caps="200"> <resource name="RAM" quantum="10M"/> <provides><service name="Nic"/></provides> <config> diff --git a/repos/libports/run/nic_router.run b/repos/libports/run/nic_router.run index 9cc63611a0..b6b8f4f89c 100644 --- a/repos/libports/run/nic_router.run +++ b/repos/libports/run/nic_router.run @@ -95,7 +95,7 @@ proc ram_quota { prot } { proc client_config { prot index ip_addr gateway netmask nic srv_port srv_ip } { append result { - <start name="} $prot {_client_} $index {"> + <start name="} $prot {_client_} $index {" caps="200"> <binary name="} [client_bin $prot] {" /> <resource name="RAM" quantum="} [ram_quota $prot] {"/> <route> @@ -113,7 +113,7 @@ proc client_config { prot index ip_addr gateway netmask nic srv_port srv_ip } { proc server_config { prot index ip_addr gateway netmask nic port } { append result { - <start name="} $prot {_server_} $index {"> + <start name="} $prot {_server_} $index {" caps="200"> <binary name="} [server_bin $prot] {" /> <resource name="RAM" quantum="} [ram_quota $prot] {"/> <route> @@ -183,6 +183,8 @@ append config { <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> + } [gpio_drv_config] { } [nic_drv_config] { } [platform_drv_config] { @@ -192,7 +194,7 @@ append config { <provides><service name="Timer"/></provides> </start> - <start name="nic_router"> + <start name="nic_router" caps="200"> <resource name="RAM" quantum="10M"/> <provides><service name="Nic"/></provides> <config rtt_sec="3" verbose="no"> @@ -239,7 +241,7 @@ append config { </route> </start> - <start name="nic_bridge"> + <start name="nic_bridge" caps="200"> <resource name="RAM" quantum="10M"/> <provides><service name="Nic"/></provides> <config> diff --git a/repos/libports/run/pthread.run b/repos/libports/run/pthread.run index 6d8f770184..ee2fcceb27 100644 --- a/repos/libports/run/pthread.run +++ b/repos/libports/run/pthread.run @@ -19,6 +19,7 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="120"/> <start name="test-pthread"> <resource name="RAM" quantum="64M"/> <config> diff --git a/repos/libports/run/python.run b/repos/libports/run/python.run index 144c5a5857..52f9f4c22c 100644 --- a/repos/libports/run/python.run +++ b/repos/libports/run/python.run @@ -35,6 +35,7 @@ set config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="test-python"> <resource name="RAM" quantum="3M"/> <config> diff --git a/repos/libports/run/qt5.run b/repos/libports/run/qt5.run index a876f53ce8..2bd98b6677 100644 --- a/repos/libports/run/qt5.run +++ b/repos/libports/run/qt5.run @@ -34,6 +34,7 @@ append config { append config [qt5_parent_provides feature] append config { </parent-provides> + <default caps="100"/> <default-route> <any-service> <parent/> <child name="wm"/> <any-child/> </any-service> </default-route>} @@ -41,7 +42,7 @@ append config { append config [qt5_start_nodes feature] append config { - <start name="qt_launchpad"> + <start name="qt_launchpad" caps="500"> <resource name="RAM" quantum="80M"/> <config> <libc stdout="/dev/log" stderr="/dev/log"/> @@ -49,7 +50,7 @@ append config { <dir name="dev"> <log/> </dir> <tar name="qt5_fs_qt_launchpad.tar"/> </vfs> - <launcher name="calculatorform" ram_quota="30M"> + <launcher name="calculatorform" ram_quota="30M" caps="150"> <config> <libc stdout="/dev/log" stderr="/dev/log"/> <vfs> @@ -58,7 +59,7 @@ append config { </vfs> </config> </launcher> - <launcher name="tetrix" ram_quota="40M"> + <launcher name="tetrix" ram_quota="40M" caps="150"> <config> <libc stdout="/dev/log" stderr="/dev/log"/> <vfs> diff --git a/repos/libports/run/qt5_avplay.run b/repos/libports/run/qt5_avplay.run index c5541e62be..cd9d4ba9fa 100644 --- a/repos/libports/run/qt5_avplay.run +++ b/repos/libports/run/qt5_avplay.run @@ -43,6 +43,7 @@ append config { append config [qt5_parent_provides feature] append config { </parent-provides> + <default caps="100"/> <default-route> <any-service> <parent/> <child name="wm"/> <any-child/> </any-service> </default-route>} @@ -50,7 +51,7 @@ append config { append config [qt5_start_nodes feature] append config { - <start name="qt_avplay"> + <start name="qt_avplay" caps="400"> <resource name="RAM" quantum="2G"/> <config> <vfs> diff --git a/repos/libports/run/qt5_calculatorform.run b/repos/libports/run/qt5_calculatorform.run index 9ccfaabb2d..21ed876ef0 100644 --- a/repos/libports/run/qt5_calculatorform.run +++ b/repos/libports/run/qt5_calculatorform.run @@ -31,6 +31,7 @@ append config { append config [qt5_parent_provides feature] append config { </parent-provides> + <default caps="100"/> <default-route> <any-service> <parent/> <child name="wm"/> <any-child/> </any-service> </default-route>} @@ -38,7 +39,7 @@ append config { append config [qt5_start_nodes feature] append config { - <start name="calculatorform"> + <start name="calculatorform" caps="150"> <resource name="RAM" quantum="80M"/> <config> <vfs> diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc index 9c52113ec3..48ba69fa19 100644 --- a/repos/libports/run/qt5_common.inc +++ b/repos/libports/run/qt5_common.inc @@ -105,7 +105,7 @@ proc qt5_start_nodes { feature_arg } { </config> </start> - <start name="wm"> + <start name="wm" caps="150"> <resource name="RAM" quantum="12M"/> <provides> <service name="Nitpicker"/> diff --git a/repos/libports/run/qt5_openglwindow.run b/repos/libports/run/qt5_openglwindow.run index 68cd929176..aa1d87437a 100644 --- a/repos/libports/run/qt5_openglwindow.run +++ b/repos/libports/run/qt5_openglwindow.run @@ -30,6 +30,7 @@ append config { append config [qt5_parent_provides feature] append config { </parent-provides> + <default caps="100"/> <default-route> <any-service> <parent/> <child name="wm"/> <any-child/> </any-service> </default-route>} @@ -37,7 +38,7 @@ append config { append config [qt5_start_nodes feature] append config { - <start name="openglwindow"> + <start name="openglwindow" caps="200"> <resource name="RAM" quantum="80M"/> <config> <vfs> diff --git a/repos/libports/run/qt5_previewer.run b/repos/libports/run/qt5_previewer.run index 265eb4e68e..1cb53aee70 100644 --- a/repos/libports/run/qt5_previewer.run +++ b/repos/libports/run/qt5_previewer.run @@ -30,6 +30,7 @@ append config { append config [qt5_parent_provides feature] append config { </parent-provides> + <default caps="100"/> <default-route> <any-service> <parent/> <child name="wm"/> <any-child/> </any-service> </default-route>} @@ -37,7 +38,7 @@ append config { append config [qt5_start_nodes feature] append config { - <start name="previewer"> + <start name="previewer" caps="300"> <resource name="RAM" quantum="2G"/> <config> <vfs> diff --git a/repos/libports/run/qt5_qpluginwidget.run b/repos/libports/run/qt5_qpluginwidget.run index 61c6293e79..39998cc37b 100644 --- a/repos/libports/run/qt5_qpluginwidget.run +++ b/repos/libports/run/qt5_qpluginwidget.run @@ -33,6 +33,7 @@ append config { append config [qt5_parent_provides feature] append config { </parent-provides> + <default caps="100"/> <default-route> <any-service> <parent/> <child name="wm"/> <any-child/> </any-service> </default-route>} @@ -40,7 +41,7 @@ append config { append config [qt5_start_nodes feature] append config { - <start name="loader"> + <start name="loader" caps="100"> <resource name="RAM" quantum="8M"/> <provides><service name="Loader"/></provides> <config> @@ -52,7 +53,7 @@ append config { </policy> </config> </start> - <start name="test-qpluginwidget"> + <start name="test-qpluginwidget" caps="900"> <resource name="RAM" quantum="30M"/> <config> <vfs> diff --git a/repos/libports/run/qt5_quicktest.run b/repos/libports/run/qt5_quicktest.run index ac32974a4f..fb49d9656f 100644 --- a/repos/libports/run/qt5_quicktest.run +++ b/repos/libports/run/qt5_quicktest.run @@ -31,6 +31,7 @@ append config { append config [qt5_parent_provides feature] append config { </parent-provides> + <default caps="100"/> <default-route> <any-service> <parent/> <child name="wm"/> <any-child/> </any-service> </default-route>} @@ -38,7 +39,7 @@ append config { append config [qt5_start_nodes feature] append config { - <start name="qt_quicktest"> + <start name="qt_quicktest" caps="200"> <resource name="RAM" quantum="80M"/> <config> <vfs> diff --git a/repos/libports/run/qt5_samegame.run b/repos/libports/run/qt5_samegame.run index 9281c569a6..fa55948e41 100644 --- a/repos/libports/run/qt5_samegame.run +++ b/repos/libports/run/qt5_samegame.run @@ -31,6 +31,7 @@ append config { append config [qt5_parent_provides feature] append config { </parent-provides> + <default caps="100"/> <default-route> <any-service> <parent/> <child name="wm"/> <any-child/> </any-service> </default-route>} @@ -38,7 +39,7 @@ append config { append config [qt5_start_nodes feature] append config { - <start name="samegame"> + <start name="samegame" caps="200"> <resource name="RAM" quantum="128M"/> <config> <vfs> diff --git a/repos/libports/run/qt5_tetrix.run b/repos/libports/run/qt5_tetrix.run index eabbaaa024..6d0424d7cc 100644 --- a/repos/libports/run/qt5_tetrix.run +++ b/repos/libports/run/qt5_tetrix.run @@ -30,6 +30,7 @@ append config { append config [qt5_parent_provides feature] append config { </parent-provides> + <default caps="100"/> <default-route> <any-service> <parent/> <child name="wm"/> <any-child/> </any-service> </default-route>} @@ -37,7 +38,7 @@ append config { append config [qt5_start_nodes feature] append config { - <start name="tetrix"> + <start name="tetrix" caps="200"> <resource name="RAM" quantum="80M"/> <config> <vfs> diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run index fa15e67ed0..b2cb09d87a 100644 --- a/repos/libports/run/qt5_textedit.run +++ b/repos/libports/run/qt5_textedit.run @@ -43,6 +43,7 @@ append config { append config [qt5_parent_provides feature] append config { </parent-provides> + <default caps="100"/> <default-route> <any-service> <parent/> <child name="wm"/> <any-child/> </any-service> </default-route>} @@ -86,7 +87,7 @@ append_if [expr ![have_spec linux]] config { </start>} append config { - <start name="textedit"> + <start name="textedit" caps="150"> <resource name="RAM" quantum="70M"/> <config xpos="3" ypos="0" width="500" height="710"> <libc stdout="/dev/log" stderr="/dev/log"/> @@ -97,7 +98,7 @@ append config { </vfs> </config> </start> - <start name="textedit2"> + <start name="textedit2" caps="150"> <binary name="textedit" /> <resource name="RAM" quantum="70M"/> <config xpos="512" ypos="0" width="500" height="710"> diff --git a/repos/libports/run/rust.run b/repos/libports/run/rust.run index f8917a9b02..acd4fe1fcc 100644 --- a/repos/libports/run/rust.run +++ b/repos/libports/run/rust.run @@ -14,6 +14,7 @@ install_config { <default-route> <any-service> <parent/> </any-service> </default-route> + <default caps="100"/> <start name="test-rust"> <resource name="RAM" quantum="10M"/> </start> diff --git a/repos/libports/run/sdl.run b/repos/libports/run/sdl.run index 6f639308b5..0519a668e1 100644 --- a/repos/libports/run/sdl.run +++ b/repos/libports/run/sdl.run @@ -35,7 +35,8 @@ append config { </parent-provides> <default-route> <any-service> <parent/> <any-child/> </any-service> - </default-route>} + </default-route> + <default caps="100"/>} append_if [have_spec sdl] config { <start name="fb_sdl"> @@ -49,7 +50,7 @@ append_if [have_spec sdl] config { append_platform_drv_config append_if [have_spec framebuffer] config { - <start name="fb_drv"> + <start name="fb_drv" caps="200"> <resource name="RAM" quantum="4M"/> <provides><service name="Framebuffer"/></provides> </start>} @@ -85,7 +86,7 @@ set boot_modules { core init timer test-sdl - ld.lib.so libc.lib.so sdl.lib.so pthread.lib.so + ld.lib.so libc.lib.so libm.lib.so sdl.lib.so pthread.lib.so posix.lib.so } # platform-specific modules diff --git a/repos/libports/run/smartcard.run b/repos/libports/run/smartcard.run index 608174257e..1a382cafb4 100644 --- a/repos/libports/run/smartcard.run +++ b/repos/libports/run/smartcard.run @@ -58,7 +58,8 @@ append config { </parent-provides> <default-route> <any-service> <parent/> <any-child/> </any-service> - </default-route>} + </default-route> + <default caps="100"/>} append_if [have_spec gpio] config " <start name=\"[gpio_drv]\"> @@ -83,7 +84,7 @@ append config { </raw> </config> </start> - <start name="test-smartcard"> + <start name="test-smartcard" caps="120"> <resource name="RAM" quantum="4M"/> <config> <vfs> diff --git a/repos/libports/run/stdcxx.run b/repos/libports/run/stdcxx.run index 0b3cdd6b12..7d8c9efad4 100644 --- a/repos/libports/run/stdcxx.run +++ b/repos/libports/run/stdcxx.run @@ -16,6 +16,7 @@ install_config { <default-route> <any-service> <parent/> </any-service> </default-route> + <default caps="100"/> <start name="test-stdcxx"> <resource name="RAM" quantum="10M"/> <config> diff --git a/repos/libports/src/test/qt5/qpluginwidget/config.plugin b/repos/libports/src/test/qt5/qpluginwidget/config.plugin index 7ceb44ed21..7e7d25614c 100644 --- a/repos/libports/src/test/qt5/qpluginwidget/config.plugin +++ b/repos/libports/src/test/qt5/qpluginwidget/config.plugin @@ -12,7 +12,7 @@ <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <start name="testnit"> + <start name="testnit" caps="100"> <resource name="RAM" quantum="1M"/> </start> </config> diff --git a/repos/os/recipes/raw/drivers_interactive-linux/drivers.config b/repos/os/recipes/raw/drivers_interactive-linux/drivers.config index d18d7d42bc..1a454ad055 100644 --- a/repos/os/recipes/raw/drivers_interactive-linux/drivers.config +++ b/repos/os/recipes/raw/drivers_interactive-linux/drivers.config @@ -14,7 +14,7 @@ <service name="Input"> <default-policy> <child name="fb_sdl"/> </default-policy> </service> - <start name="fb_sdl"> + <start name="fb_sdl" caps="100"> <resource name="RAM" quantum="4M"/> <provides> <service name="Input"/> diff --git a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config index b21f574986..11f6d5b33d 100644 --- a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config +++ b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config @@ -13,6 +13,8 @@ <service name="Timer"/> </parent-provides> + <default caps="60"/> + <service name="Framebuffer"> <default-policy> <child name="fb_drv"/> </default-policy> </service> @@ -51,7 +53,7 @@ </route> </start> - <start name="platform_drv"> + <start name="platform_drv" caps="100"> <resource name="RAM" quantum="3M" constrain_phys="yes"/> <provides> <service name="Platform"/> diff --git a/repos/os/run/blk_cache.run b/repos/os/run/blk_cache.run index e18bdeb809..63b86e80c6 100644 --- a/repos/os/run/blk_cache.run +++ b/repos/os/run/blk_cache.run @@ -32,6 +32,7 @@ install_config { <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> diff --git a/repos/os/run/bomb.run b/repos/os/run/bomb.run index 3b6cb993be..f28574e51d 100644 --- a/repos/os/run/bomb.run +++ b/repos/os/run/bomb.run @@ -36,12 +36,12 @@ set config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <start name="timer"> + <start name="timer" caps="100"> <resource name="CPU" quantum="10"/> <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="bomb-master" priority="-1"> + <start name="bomb-master" priority="-1" caps="100000"> <binary name="bomb"/> <resource name="CPU" quantum="90"/> <resource name="RAM" quantum="2G"/>} diff --git a/repos/os/run/clipboard.run b/repos/os/run/clipboard.run index 20f3a32c4d..c97d4cedd9 100644 --- a/repos/os/run/clipboard.run +++ b/repos/os/run/clipboard.run @@ -32,6 +32,8 @@ append config { <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> diff --git a/repos/os/run/cpu_quota.run b/repos/os/run/cpu_quota.run index f8f5f0cd90..8bc30e55ba 100644 --- a/repos/os/run/cpu_quota.run +++ b/repos/os/run/cpu_quota.run @@ -34,12 +34,14 @@ install_config { <any-service><parent/><any-child/></any-service> </default-route> + <default caps="100"/> + <start name="test-sync"> <resource name="RAM" quantum="10M"/> <provides><service name="Sync"/></provides> </start> - <start name="init_1" priority="-1"> + <start name="init_1" priority="-1" caps="1000"> <binary name="init"/> <resource name="RAM" quantum="20M"/> <resource name="CPU" quantum="10"/> @@ -60,6 +62,7 @@ install_config { <default-route> <any-service><parent/><any-child/></any-service> </default-route> + <default caps="100"/> <start name="test_slow"> <binary name="test-cpu_quota"/> @@ -70,7 +73,7 @@ install_config { </config> </start> - <start name="init_2" priority="-2"> + <start name="init_2" priority="-2" caps="1000"> <binary name="init"/> <resource name="RAM" quantum="30M"/> <resource name="CPU" quantum="80"/> @@ -92,6 +95,8 @@ install_config { <any-service><parent/></any-service> </default-route> + <default caps="100"/> + <start name="test_midl" priority="0"> <binary name="test-cpu_quota"/> <resource name="RAM" quantum="10M"/> diff --git a/repos/os/run/demo.run b/repos/os/run/demo.run index d9d1131d6b..413ad05482 100644 --- a/repos/os/run/demo.run +++ b/repos/os/run/demo.run @@ -51,7 +51,8 @@ append config { </parent-provides> <default-route> <any-service> <parent/> <any-child/> </any-service> - </default-route>} + </default-route> + <default caps="100"/>} append_if [have_spec sdl] config { <start name="fb_sdl"> @@ -210,7 +211,7 @@ append config { </route> </start> - <start name="scout"> + <start name="scout" caps="10000"> <resource name="RAM" quantum="64M" /> </start> </config>} @@ -222,16 +223,16 @@ install_config $config # set launchpad_config_fd [open "bin/launchpad.config" w] puts $launchpad_config_fd {<config> - <launcher name="testnit" ram_quota="768K" /> - <launcher name="scout" ram_quota="41M" /> - <launcher name="launchpad" ram_quota="6M"> + <launcher name="testnit" ram_quota="768K" caps="50"/> + <launcher name="scout" ram_quota="41M" caps="200"/> + <launcher name="launchpad" ram_quota="6M" caps="1000"> <configfile name="launchpad.config" /> </launcher> - <launcher name="nitlog" ram_quota="1M" /> - <launcher name="liquid_fb" ram_quota="7M"> + <launcher name="nitlog" ram_quota="1M" caps="50"/> + <launcher name="liquid_fb" ram_quota="7M" caps="70"> <config resize_handle="on" /> </launcher> - <launcher name="nitpicker" ram_quota="1M"> + <launcher name="nitpicker" ram_quota="1M" caps="70"> <config> <domain name="" layer="3" conten="client" label="no" focus="click"/> <default-policy domain="" /> diff --git a/repos/os/run/dynamic_config.run b/repos/os/run/dynamic_config.run index 02f2afb6b0..d52489e61c 100644 --- a/repos/os/run/dynamic_config.run +++ b/repos/os/run/dynamic_config.run @@ -17,6 +17,7 @@ install_config { <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> @@ -25,7 +26,7 @@ install_config { <resource name="RAM" quantum="1M"/> <provides> <service name="ROM" /> </provides> </start> - <start name="test-dynamic_config"> + <start name="test-dynamic_config" cap="500"> <resource name="RAM" quantum="1M"/> <configfile name="config.dynamic" /> <route> diff --git a/repos/os/run/fault_detection.run b/repos/os/run/fault_detection.run index 44ba718700..4562c1de61 100644 --- a/repos/os/run/fault_detection.run +++ b/repos/os/run/fault_detection.run @@ -45,7 +45,7 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <start name="loader"> + <start name="loader" caps="100"> <resource name="RAM" quantum="10M"/> <provides> <service name="Loader"/> </provides> <config> @@ -56,7 +56,7 @@ install_config { </policy> </config> </start> - <start name="test-fault_detection"> + <start name="test-fault_detection" caps="500"> <resource name="RAM" quantum="10M"/> </start> </config> diff --git a/repos/os/run/fb_bench.run b/repos/os/run/fb_bench.run index e49826ba7e..226fdd5ab0 100644 --- a/repos/os/run/fb_bench.run +++ b/repos/os/run/fb_bench.run @@ -47,6 +47,7 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="1M"/> @@ -54,7 +55,7 @@ append config { </start>} append_if [have_spec gpio] config " - <start name=\"[gpio_drv]\"> + <start name=\"[gpio_drv]\" caps=\"140\"> <resource name=\"RAM\" quantum=\"4M\"/> <provides><service name=\"Gpio\"/></provides> <config/> diff --git a/repos/os/run/framebuffer.run b/repos/os/run/framebuffer.run index 0d92138541..18ea1f63eb 100644 --- a/repos/os/run/framebuffer.run +++ b/repos/os/run/framebuffer.run @@ -34,7 +34,7 @@ append config { <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> @@ -52,7 +52,7 @@ append_if [have_spec sdl] config { append_platform_drv_config append_if [have_spec framebuffer] config { - <start name="fb_drv"> + <start name="fb_drv" caps="200"> <resource name="RAM" quantum="4M"/> <provides><service name="Framebuffer"/></provides> </start>} diff --git a/repos/os/run/fs_log.run b/repos/os/run/fs_log.run index 76bcd055a9..61bf08ad43 100644 --- a/repos/os/run/fs_log.run +++ b/repos/os/run/fs_log.run @@ -26,6 +26,7 @@ set config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="CPU" quantum="10"/> <resource name="RAM" quantum="1M"/> @@ -50,7 +51,7 @@ set config { <policy label_prefix="bomb-master" merge="true"/> </config> </start> - <start name="bomb-master" priority="-1"> + <start name="bomb-master" priority="-1" caps="500"> <binary name="bomb"/> <resource name="CPU" quantum="90"/> <resource name="RAM" quantum="2G"/> diff --git a/repos/os/run/init.run b/repos/os/run/init.run index 57aaa063f1..1659b506c5 100644 --- a/repos/os/run/init.run +++ b/repos/os/run/init.run @@ -29,6 +29,8 @@ append config { <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> @@ -63,6 +65,7 @@ append config { <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="application"> <binary name="dummy"/> <resource name="RAM" quantum="1G"/> @@ -107,6 +110,7 @@ append config { <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="server"> <binary name="dummy"/> <resource name="RAM" quantum="1M"/> @@ -169,6 +173,7 @@ append config { <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="server"> <binary name="dummy"/> <resource name="RAM" quantum="1M"/> @@ -222,6 +227,7 @@ append config { <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="server"> <binary name="dummy"/> <resource name="RAM" quantum="1M"/> @@ -264,6 +270,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="log"> <binary name="dummy"/> <resource name="RAM" quantum="1M"/> @@ -299,6 +306,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="log"> <binary name="dummy"/> <resource name="RAM" quantum="1M"/> @@ -331,6 +339,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="log"> <binary name="dummy"/> <resource name="RAM" quantum="1M"/> @@ -363,6 +372,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="application"> <binary name="dummy"/> <resource name="RAM" quantum="1M"/> @@ -377,6 +387,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="application"> <binary name="dummy"/> <resource name="RAM" quantum="1M"/> @@ -398,6 +409,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="application" version="X"> <binary name="dummy"/> <resource name="RAM" quantum="1M"/> @@ -421,6 +433,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="test"> <binary name="dummy"/> <resource name="RAM" quantum="1M"/> @@ -445,6 +458,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="test"> <binary name="renamed_dummy"/> <resource name="RAM" quantum="1M"/> @@ -469,6 +483,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="test"> <binary name="another_dummy"/> <resource name="RAM" quantum="1M"/> @@ -493,6 +508,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="regular"> <binary name="dummy"/> <resource name="RAM" quantum="1M"/> @@ -527,6 +543,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="test"> <binary name="dummy"/> <resource name="RAM" quantum="1M"/> @@ -553,6 +570,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="test"> <binary name="dummy"/> <resource name="RAM" quantum="4M"/> @@ -579,6 +597,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="test"> <binary name="dummy"/> <resource name="RAM" quantum="4M"/> @@ -606,6 +625,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="test"> <binary name="dummy"/> <resource name="RAM" quantum="8M"/> @@ -637,6 +657,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="test"> <binary name="dummy"/> <resource name="RAM" quantum="8M"/> @@ -663,6 +684,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="test"> <binary name="dummy"/> <resource name="RAM" quantum="4M"/> @@ -689,6 +711,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="test"> <binary name="dummy"/> <resource name="RAM" quantum="4M"/> @@ -718,6 +741,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="test"> <binary name="dummy"/> <resource name="RAM" quantum="2M"/> @@ -745,6 +769,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="test"> <binary name="dummy"/> <resource name="RAM" quantum="2M"/> @@ -773,6 +798,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="100"/> <start name="test"> <binary name="dummy"/> <resource name="RAM" quantum="6M"/> @@ -802,7 +828,8 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> - <start name="service_init"> + <default caps="100"/> + <start name="service_init" caps="200"> <binary name="init"/> <resource name="RAM" quantum="10M"/> <provides> <service name="LOG"/> </provides> @@ -812,6 +839,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="60"/> <service name="LOG"> <default-policy> <child name="server"/> </default-policy> </service> @@ -868,7 +896,8 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> - <start name="service_init"> + <default caps="100"/> + <start name="service_init" caps="200"> <binary name="init"/> <resource name="RAM" quantum="10M"/> <provides> <service name="LOG"/> </provides> @@ -878,6 +907,7 @@ append config { <service name="CPU"/> <service name="PD"/> <service name="LOG"/> </parent-provides> + <default caps="60"/> <start name="server"> <binary name="dummy"/> <resource name="RAM" quantum="1M"/> @@ -916,7 +946,7 @@ append config { </route> </start> - <start name="init"> + <start name="init" caps="2000"> <binary name="init"/> <resource name="RAM" quantum="16M"/> <configfile name="init.config"/> diff --git a/repos/os/run/init_smp.run b/repos/os/run/init_smp.run index 1342ff057e..c18ba6cd42 100644 --- a/repos/os/run/init_smp.run +++ b/repos/os/run/init_smp.run @@ -42,6 +42,7 @@ append config { <service name="LOG"/> </parent-provides> <default-route><any-service><parent/><any-child/></any-service></default-route> + <default caps="100"/> <start name="timer"> <resource name="CPU" quantum="10"/> @@ -53,7 +54,7 @@ append config { for { set i 0} { $i < ${cpus} } { incr i} { append config " - <start name=\"init_$i\"> + <start name=\"init_$i\" caps=\"1100\"> <affinity xpos=\"$i\" width=\"1\"/> <resource name=\"RAM\" quantum=\"${init_ram}M\"/>" append config { @@ -71,6 +72,7 @@ for { set i 0} { $i < ${cpus} } { incr i} { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="1000"/> <start name="bomb-master"> <binary name="bomb"/> diff --git a/repos/os/run/input.run b/repos/os/run/input.run index d38e8a411e..604d5a8408 100644 --- a/repos/os/run/input.run +++ b/repos/os/run/input.run @@ -38,6 +38,7 @@ append config { <service name="LOG"/> </parent-provides> <default-route/> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="1M"/> diff --git a/repos/os/run/input_filter.run b/repos/os/run/input_filter.run index b96db195d6..2b0a1af921 100644 --- a/repos/os/run/input_filter.run +++ b/repos/os/run/input_filter.run @@ -41,6 +41,8 @@ append config { <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> diff --git a/repos/os/run/loader.run b/repos/os/run/loader.run index 30b10d18bc..70d075eac2 100644 --- a/repos/os/run/loader.run +++ b/repos/os/run/loader.run @@ -36,7 +36,8 @@ append config { </parent-provides> <default-route> <any-service> <parent/> <any-child/> </any-service> - </default-route>} + </default-route> + <default caps="100"/>} append_platform_drv_config @@ -83,7 +84,7 @@ append config { </policy> </config> </start> - <start name="test-loader"> + <start name="test-loader" caps="200"> <resource name="RAM" quantum="1G"/> </start> </config>} diff --git a/repos/os/run/nic_loopback.run b/repos/os/run/nic_loopback.run index f946d64310..2957f437da 100644 --- a/repos/os/run/nic_loopback.run +++ b/repos/os/run/nic_loopback.run @@ -32,6 +32,7 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="nic_loopback"> <resource name="RAM" quantum="1M"/> <provides><service name="Nic"/></provides> diff --git a/repos/os/run/part_blk.run b/repos/os/run/part_blk.run index bae6515a1b..db9756160e 100644 --- a/repos/os/run/part_blk.run +++ b/repos/os/run/part_blk.run @@ -52,6 +52,7 @@ install_config { <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> diff --git a/repos/os/run/pci.run b/repos/os/run/pci.run index 92a01a8b18..1bb25ba8e3 100644 --- a/repos/os/run/pci.run +++ b/repos/os/run/pci.run @@ -36,7 +36,8 @@ append config { </parent-provides> <default-route> <any-service> <parent/> <any-child/> </any-service> - </default-route>} + </default-route> + <default caps="100"/>} append_platform_drv_config diff --git a/repos/os/run/ram_fs_chunk.run b/repos/os/run/ram_fs_chunk.run index bc1ab73edb..699d6cd24a 100644 --- a/repos/os/run/ram_fs_chunk.run +++ b/repos/os/run/ram_fs_chunk.run @@ -20,6 +20,7 @@ install_config { <default-route> <any-service> <parent/> </any-service> </default-route> + <default caps="100"/> <start name="test-ram_fs_chunk"> <resource name="RAM" quantum="1M"/> </start> diff --git a/repos/os/run/report_rom.run b/repos/os/run/report_rom.run index 871d4cf30c..6e3b0e5f68 100644 --- a/repos/os/run/report_rom.run +++ b/repos/os/run/report_rom.run @@ -18,6 +18,7 @@ install_config { <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> diff --git a/repos/os/run/resource_request.run b/repos/os/run/resource_request.run index 342381130a..9f6e662e74 100644 --- a/repos/os/run/resource_request.run +++ b/repos/os/run/resource_request.run @@ -17,6 +17,7 @@ install_config { <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> @@ -29,7 +30,7 @@ install_config { <policy label="init_monitor -> state" report="init -> state"/> </config> </start> - <start name="init"> + <start name="init" caps="4000"> <resource name="RAM" quantum="10M"/> <route> <service name="ROM" label="config"> <child name="report_rom"/> </service> diff --git a/repos/os/run/resource_yield.run b/repos/os/run/resource_yield.run index 1c221751a6..1c28c2c09c 100644 --- a/repos/os/run/resource_yield.run +++ b/repos/os/run/resource_yield.run @@ -18,11 +18,12 @@ install_config { <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="test-resource_yield"> + <start name="test-resource_yield" caps="200"> <resource name="RAM" quantum="16M"/> <provides> <service name="ROM" /> </provides> <config/> diff --git a/repos/os/run/rom_blk.run b/repos/os/run/rom_blk.run index 3cbbebb78d..c6e06dbed8 100644 --- a/repos/os/run/rom_blk.run +++ b/repos/os/run/rom_blk.run @@ -15,6 +15,7 @@ install_config { <default-route> <any-service> <any-child/> <parent/></any-service> </default-route> + <default caps="100"/> <start name="rom_blk"> <resource name="RAM" quantum="3M"/> <provides><service name="Block"/></provides> diff --git a/repos/os/run/rom_filter.run b/repos/os/run/rom_filter.run index 4d3b16cc57..0cb241f44d 100644 --- a/repos/os/run/rom_filter.run +++ b/repos/os/run/rom_filter.run @@ -32,6 +32,8 @@ append config { <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> diff --git a/repos/os/run/sd_card_bench.run b/repos/os/run/sd_card_bench.run index 841135539c..bb15c74f3e 100644 --- a/repos/os/run/sd_card_bench.run +++ b/repos/os/run/sd_card_bench.run @@ -49,7 +49,8 @@ append config { </parent-provides> <default-route> <any-service> <parent/> <any-child/> </any-service> - </default-route>} + </default-route> + <default caps="100"/>} append_platform_drv_config diff --git a/repos/os/run/signal.run b/repos/os/run/signal.run index 51ee347239..f420ce9418 100644 --- a/repos/os/run/signal.run +++ b/repos/os/run/signal.run @@ -18,11 +18,12 @@ install_config { <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="test-signal"> + <start name="test-signal" caps="500"> <resource name="RAM" quantum="10M"/> </start> </config> diff --git a/repos/os/run/tar_rom.run b/repos/os/run/tar_rom.run index e0cb3962fe..0ea527797b 100644 --- a/repos/os/run/tar_rom.run +++ b/repos/os/run/tar_rom.run @@ -38,6 +38,7 @@ install_config { <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> @@ -49,7 +50,7 @@ install_config { <archive name="archive.tar"/> </config> </start> - <start name="init"> + <start name="init" caps="1000"> <resource name="RAM" quantum="2M"/> <config verbose="yes"> <parent-provides> @@ -60,6 +61,7 @@ install_config { <service name="LOG"/> <service name="Timer"/> </parent-provides> + <default caps="100"/> <start name="test-timer"> <resource name="RAM" quantum="1M"/> <route> <any-service> <parent/> </any-service> </route> diff --git a/repos/os/run/thread_join.run b/repos/os/run/thread_join.run index e5b9cdcdea..415641893e 100644 --- a/repos/os/run/thread_join.run +++ b/repos/os/run/thread_join.run @@ -18,6 +18,7 @@ install_config { <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> diff --git a/repos/os/run/timed_semaphore.run b/repos/os/run/timed_semaphore.run index 1035704ee9..c16cf60824 100644 --- a/repos/os/run/timed_semaphore.run +++ b/repos/os/run/timed_semaphore.run @@ -30,6 +30,7 @@ install_config { <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> diff --git a/repos/os/run/timeout.run b/repos/os/run/timeout.run index 68cadbea63..671bcec629 100644 --- a/repos/os/run/timeout.run +++ b/repos/os/run/timeout.run @@ -26,6 +26,7 @@ install_config { <default-route> <any-service><parent/><any-child/></any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="10M"/> <provides><service name="Timer"/></provides> diff --git a/repos/os/run/timer.run b/repos/os/run/timer.run index 218bdd317c..f4877c1203 100644 --- a/repos/os/run/timer.run +++ b/repos/os/run/timer.run @@ -27,6 +27,7 @@ install_config { <default-route> <any-service><parent/><any-child/></any-service> </default-route> + <default caps="1000"/> <start name="timer"> <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> diff --git a/repos/os/run/timer_accuracy.run b/repos/os/run/timer_accuracy.run index bec295d8ce..078e4b50b3 100644 --- a/repos/os/run/timer_accuracy.run +++ b/repos/os/run/timer_accuracy.run @@ -21,6 +21,7 @@ install_config { <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> diff --git a/repos/os/run/trace.run b/repos/os/run/trace.run index cda375f942..3658f0b138 100644 --- a/repos/os/run/trace.run +++ b/repos/os/run/trace.run @@ -35,6 +35,7 @@ append config { <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> diff --git a/repos/os/run/tz_vmm.run b/repos/os/run/tz_vmm.run index 1bfc676db2..f4ed9638be 100644 --- a/repos/os/run/tz_vmm.run +++ b/repos/os/run/tz_vmm.run @@ -134,7 +134,8 @@ set config { </parent-provides> <default-route> <any-service><any-child/><parent/></any-service> - </default-route> } + </default-route> + <default caps="100"/>} append_if $trusted_led config { <start name="gpio_drv"> diff --git a/repos/os/run/vfs_stress_fs.run b/repos/os/run/vfs_stress_fs.run index 78c8a7bdf2..723ecfa56d 100644 --- a/repos/os/run/vfs_stress_fs.run +++ b/repos/os/run/vfs_stress_fs.run @@ -24,6 +24,7 @@ install_config { <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> diff --git a/repos/os/run/vfs_stress_ram.run b/repos/os/run/vfs_stress_ram.run index 5527580f53..838fdf59fc 100644 --- a/repos/os/run/vfs_stress_ram.run +++ b/repos/os/run/vfs_stress_ram.run @@ -24,6 +24,7 @@ install_config { <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> diff --git a/repos/os/run/vmm.run b/repos/os/run/vmm.run index 4abed0a29a..3154f18499 100644 --- a/repos/os/run/vmm.run +++ b/repos/os/run/vmm.run @@ -33,6 +33,7 @@ install_config { <default-route> <any-service><parent/><any-child/></any-service> </default-route> + <default caps="100"/> <start name="platform_drv"> <resource name="RAM" quantum="1M"/> <provides><service name="Regulator"/></provides> diff --git a/repos/os/run/xml_generator.run b/repos/os/run/xml_generator.run index 5f3ccbe05e..443884efb0 100644 --- a/repos/os/run/xml_generator.run +++ b/repos/os/run/xml_generator.run @@ -15,6 +15,7 @@ install_config { <default-route> <any-service> <any-child/> <parent/> </any-service> </default-route> + <default caps="100"/> <start name="test-xml_generator"> <resource name="RAM" quantum="1M"/> </start> diff --git a/repos/os/run/xml_node.run b/repos/os/run/xml_node.run index d36e5ae133..11dd562b99 100644 --- a/repos/os/run/xml_node.run +++ b/repos/os/run/xml_node.run @@ -14,6 +14,7 @@ install_config { <default-route> <any-service> <parent/> </any-service> </default-route> + <default caps="100"/> <start name="test-xml_node"> <resource name="RAM" quantum="10M"/> </start> diff --git a/repos/ports/run/arora.run b/repos/ports/run/arora.run index 9ab309839e..5aee54d5ab 100644 --- a/repos/ports/run/arora.run +++ b/repos/ports/run/arora.run @@ -38,6 +38,7 @@ append config { append config [qt5_parent_provides feature] append config { </parent-provides> + <default caps="100"/> <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route>} @@ -82,7 +83,7 @@ append config { </route> </start> - <start name="arora"> + <start name="arora" caps="2000"> <resource name="RAM" quantum="2G"/> <config clipboard="yes"> <libc stdout="/dev/log" stderr="/dev/log"> diff --git a/repos/ports/run/dosbox.run b/repos/ports/run/dosbox.run index 8beb918015..be3949af17 100644 --- a/repos/ports/run/dosbox.run +++ b/repos/ports/run/dosbox.run @@ -45,7 +45,8 @@ append config { </parent-provides> <default-route> <any-service> <parent/> <any-child/> </any-service> - </default-route>} + </default-route> + <default caps="100"/>} append_if [have_spec sdl] config { <start name="fb_sdl"> @@ -60,7 +61,7 @@ append_if [have_spec sdl] config { append_platform_drv_config append_if [have_spec vesa] config { - <start name="fb_drv"> + <start name="fb_drv" caps="200"> <resource name="RAM" quantum="4M"/> <provides><service name="Framebuffer"/></provides> <config buffered="yes"> </config> diff --git a/repos/ports/run/gdb_monitor.run b/repos/ports/run/gdb_monitor.run index 076f8572f5..18b2524f43 100644 --- a/repos/ports/run/gdb_monitor.run +++ b/repos/ports/run/gdb_monitor.run @@ -52,6 +52,7 @@ set config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="2M"/> <provides> <service name="Timer"/> </provides> @@ -66,7 +67,7 @@ set config { <policy label_prefix="gdb_monitor" uart="1"/> </config> </start> - <start name="gdb_monitor"> + <start name="gdb_monitor" caps="1000"> <resource name="RAM" quantum="7M"/> <config> <target name="test-gdb_monitor"> diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index 520722e0fd..a33c7f3383 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -117,6 +117,7 @@ set config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="1M"/> @@ -124,7 +125,7 @@ set config { </start> } append_if [have_spec gpio] config " - <start name=\"[gpio_drv]\"> + <start name=\"[gpio_drv]\" caps=\"120\"> <resource name=\"RAM\" quantum=\"4M\"/> <provides><service name=\"Gpio\"/></provides> <config/> @@ -168,7 +169,7 @@ append_if $use_usb_driver config { </start>} append_if $use_nic_driver config { - <start name="nic_drv"> + <start name="nic_drv" caps="120"> <binary name="} [nic_drv_binary] {"/> <resource name="RAM" quantum="8M"/> <provides><service name="Nic"/></provides> @@ -206,7 +207,7 @@ append_if $use_wifi_driver config { <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="wifi_drv"> + <start name="wifi_drv" caps="200"> <resource name="RAM" quantum="32M"/> <provides> <service name="Nic"/> </provides> <config> @@ -232,7 +233,7 @@ append_if $use_wifi_driver config { append_platform_drv_config append config { - <start name="netserver_genode"> + <start name="netserver_genode" caps="200"> } append config "<binary name=\"$netperf_app\"/>" append config { diff --git a/repos/ports/run/noux.run b/repos/ports/run/noux.run index 3b05c96349..63eb4e0e97 100644 --- a/repos/ports/run/noux.run +++ b/repos/ports/run/noux.run @@ -23,6 +23,7 @@ install_config { <default-route> <any-service> <any-child/> <parent/> </any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> @@ -32,7 +33,7 @@ install_config { <resource name="RAM" quantum="1M"/> <provides><service name="Terminal"/></provides> </start> - <start name="noux"> + <start name="noux" caps="500"> <resource name="RAM" quantum="1G"/> <config verbose="yes"> <fstab> <tar name="coreutils.tar" /> </fstab> diff --git a/repos/ports/run/noux_bash.run b/repos/ports/run/noux_bash.run index f22eec7cb2..78a08e5ad9 100644 --- a/repos/ports/run/noux_bash.run +++ b/repos/ports/run/noux_bash.run @@ -69,6 +69,7 @@ append config { <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> @@ -154,7 +155,7 @@ Hello world !! <policy label="noux -> tmp" root="/tmp" writeable="yes" /> </config> </start> - <start name="noux"> + <start name="noux" caps="1000"> <resource name="RAM" quantum="1G" /> <config> <fstab> diff --git a/repos/ports/run/noux_gdb.run b/repos/ports/run/noux_gdb.run index 54d713940b..44d5bfdd20 100644 --- a/repos/ports/run/noux_gdb.run +++ b/repos/ports/run/noux_gdb.run @@ -87,6 +87,7 @@ append config { <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> @@ -104,7 +105,7 @@ append_if [have_spec sdl] config { append_platform_drv_config append_if [have_spec framebuffer] config { - <start name="fb_drv"> + <start name="fb_drv" caps="200"> <resource name="RAM" quantum="4M"/> <provides><service name="Framebuffer"/></provides> </start>} diff --git a/repos/ports/run/noux_net_netcat.run b/repos/ports/run/noux_net_netcat.run index 122a05e160..7900b951cb 100644 --- a/repos/ports/run/noux_net_netcat.run +++ b/repos/ports/run/noux_net_netcat.run @@ -61,6 +61,7 @@ append config { <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> @@ -80,7 +81,7 @@ append_if [have_include "power_on/qemu"] config { if {![have_include "power_on/qemu"]} { append config { - <start name="tcp_terminal"> + <start name="tcp_terminal" caps="200"> <resource name="RAM" quantum="5M"/> <provides> <service name="Terminal"/> </provides> <route> @@ -91,7 +92,7 @@ append config { <policy label_prefix="noux_net" port="8888"/> </config> </start> - <start name="nic_bridge"> + <start name="nic_bridge" caps="200"> <resource name="RAM" quantum="6M"/> <provides><service name="Nic"/></provides> <config/> @@ -134,7 +135,7 @@ append_if $use_usb_driver config { append_platform_drv_config append config { - <start name="noux_net"> + <start name="noux_net" caps="500"> <resource name="RAM" quantum="1G"/> <config> <fstab> <tar name="noux_netcat.tar" at="/"/> </fstab> diff --git a/repos/ports/run/noux_shell_script.run b/repos/ports/run/noux_shell_script.run index c465f0e897..cd28ee6dbd 100644 --- a/repos/ports/run/noux_shell_script.run +++ b/repos/ports/run/noux_shell_script.run @@ -50,6 +50,7 @@ append config { <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> @@ -74,7 +75,7 @@ append_if $use_usb_input config { append_platform_drv_config append_if [have_spec framebuffer] config { - <start name="fb_drv"> + <start name="fb_drv" caps="200"> <resource name="RAM" quantum="4M"/> <provides><service name="Framebuffer"/></provides> </start>} @@ -124,7 +125,7 @@ echo "$1" <policy label="noux -> home" root="/home/user" writeable="yes" /> </config> </start> - <start name="noux"> + <start name="noux" caps="500"> <resource name="RAM" quantum="1G" /> <config> <fstab> } diff --git a/repos/ports/run/noux_terminal_fs.run b/repos/ports/run/noux_terminal_fs.run index f1888b95c7..0e99e368d8 100644 --- a/repos/ports/run/noux_terminal_fs.run +++ b/repos/ports/run/noux_terminal_fs.run @@ -55,13 +55,15 @@ append config { <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> } append_if [have_spec sdl] config { - <start name="fb_sdl"> + <start name="fb_drv"> + <binary name="fb_sdl"/> <resource name="RAM" quantum="4M"/> <provides> <service name="Input"/> @@ -72,7 +74,7 @@ append_if [have_spec sdl] config { append_platform_drv_config append_if [have_spec framebuffer] config { - <start name="fb_drv"> + <start name="fb_drv" caps="200"> <resource name="RAM" quantum="4M"/> <provides><service name="Framebuffer"/></provides> </start> } @@ -96,6 +98,8 @@ append config { <route> } append_if [have_spec ps2] config { <service name="Input"><child name="ps2_drv"/></service> } +append_if [have_spec sdl] config { + <service name="Input"><child name="fb_drv"/> </service>} append config { <service name="Framebuffer"><child name="fb_drv"/> </service> <any-service><parent/><any-child/></any-service> @@ -156,7 +160,7 @@ append config { <policy label="noux -> root" root="/" /> </config> </start> - <start name="noux"> + <start name="noux" caps="300"> <resource name="RAM" quantum="1G" /> <route> <service name="Terminal" label=""> diff --git a/repos/ports/run/noux_tool_chain.inc b/repos/ports/run/noux_tool_chain.inc index 9b69199a36..fba81883de 100644 --- a/repos/ports/run/noux_tool_chain.inc +++ b/repos/ports/run/noux_tool_chain.inc @@ -107,6 +107,7 @@ append config { <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> @@ -124,7 +125,7 @@ append_if [have_spec sdl] config { append_platform_drv_config append_if [have_spec framebuffer] config { - <start name="fb_drv"> + <start name="fb_drv" caps="200"> <resource name="RAM" quantum="8M"/> <provides><service name="Framebuffer"/></provides> </start>} diff --git a/repos/ports/run/noux_trace_fs.run b/repos/ports/run/noux_trace_fs.run index f4b18a2a12..3d425ee8e0 100644 --- a/repos/ports/run/noux_trace_fs.run +++ b/repos/ports/run/noux_trace_fs.run @@ -81,6 +81,7 @@ append config { <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> @@ -98,7 +99,7 @@ append_if [have_spec sdl] config { append_platform_drv_config append_if [have_spec framebuffer] config { - <start name="fb_drv"> + <start name="fb_drv" caps="200"> <resource name="RAM" quantum="4M"/> <provides><service name="Framebuffer"/></provides> <config width="640" height="480" /> @@ -161,7 +162,7 @@ append config { <policy label="noux -> tmp" root="/tmp" writeable="yes" /> </config> </start> - <start name="noux"> + <start name="noux" caps="200"> <resource name="RAM" quantum="256M" /> <config> <fstab> } diff --git a/repos/ports/run/noux_two_terminal_fs.run b/repos/ports/run/noux_two_terminal_fs.run index fe2378bf7e..cab3ea5357 100644 --- a/repos/ports/run/noux_two_terminal_fs.run +++ b/repos/ports/run/noux_two_terminal_fs.run @@ -55,6 +55,7 @@ append config { <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> @@ -72,7 +73,7 @@ append_if [have_spec sdl] config { append_platform_drv_config append_if [have_spec framebuffer] config { - <start name="fb_drv"> + <start name="fb_drv" caps="300"> <resource name="RAM" quantum="4M"/> <provides><service name="Framebuffer"/></provides> </start> } @@ -172,7 +173,7 @@ append config { <policy label="noux2 -> root" root="/" writeable="yes" /> </config> </start> - <start name="noux"> + <start name="noux" caps="500"> <resource name="RAM" quantum="50M" /> <route> <service name="Terminal"> @@ -193,7 +194,7 @@ append config { </start> </config> </start> - <start name="noux2"> + <start name="noux2" caps="500"> <binary name="noux" /> <resource name="RAM" quantum="1G" /> <route> diff --git a/repos/ports/run/noux_vim.run b/repos/ports/run/noux_vim.run index ee7d49285c..c603780eed 100644 --- a/repos/ports/run/noux_vim.run +++ b/repos/ports/run/noux_vim.run @@ -37,6 +37,7 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="50"/> <start name="timer"> <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> diff --git a/repos/ports/run/seoul.inc b/repos/ports/run/seoul.inc index 856a00849a..533e28ec4c 100644 --- a/repos/ports/run/seoul.inc +++ b/repos/ports/run/seoul.inc @@ -158,6 +158,7 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> + <default caps="100"/> <start name="timer"> <resource name="RAM" quantum="1M"/> @@ -219,7 +220,7 @@ append_if $use_nic_session config { append_if [expr $use_nic_session && $use_nic_bridge] config { <start name="nic_bridge" priority="-3"> - <resource name="RAM" quantum="4M"/> + <resource name="RAM" quantum="6M"/> <provides><service name="Nic"/></provides> <config/> <route> @@ -243,7 +244,7 @@ append_if $use_framebuffer config { if {!$use_fancy_stuff} { append config { - <start name="seoul" priority="-3"> + <start name="seoul" priority="-3" caps="200"> <binary name="seoul"/>} append config " <resource name=\"RAM\" quantum=\"$memory_vmm_vm\"/>" @@ -306,7 +307,7 @@ append_if $use_fancy_stuff config { <start name="status_bar"> <resource name="RAM" quantum="1M"/> <route> - <service name="ROM"> <child name="report_rom"/> </service> + <service name="ROM" label="focus"> <child name="report_rom"/> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> @@ -317,7 +318,7 @@ append_if $use_fancy_stuff config { <policy label="status_bar -> focus" report="nitpicker -> focus"/> </config> </start> - <start name="launchpad" priority="-2"> + <start name="launchpad" priority="-2" caps="1500"> <resource name="RAM" quantum="64000M"/> <configfile name="launchpad-config"/> <route> @@ -336,7 +337,7 @@ if {$use_fancy_stuff} { set launchpad_cfg_fd [open "bin/launchpad-config" w] puts $launchpad_cfg_fd "<config> - <launcher ram_quota=\"$memory_init\" name=\"init\">" + <launcher ram_quota=\"$memory_init\" name=\"init\" caps=\"400\" >" puts $launchpad_cfg_fd { <config> @@ -357,7 +358,7 @@ if {$use_fancy_stuff} { <service name="Rtc"/> </parent-provides> - <start name="fb.seoul" priority="-1"> + <start name="fb.seoul" priority="-1" caps="100"> <binary name="liquid_fb"/> <resource name="RAM" quantum="16M"/> <provides> @@ -370,7 +371,7 @@ if {$use_fancy_stuff} { <config xpos="10" ypos="10" width="800" height="600" animate="off"/> </start> - <start name="seoul" priority="-1"> + <start name="seoul" priority="-1" caps="200"> <binary name="seoul"/> <resource name="RAM" quantum="256M"/> <route> diff --git a/repos/ports/run/vbox_share.inc b/repos/ports/run/vbox_share.inc index 78f93b4c84..6b47801511 100644 --- a/repos/ports/run/vbox_share.inc +++ b/repos/ports/run/vbox_share.inc @@ -117,7 +117,7 @@ foreach pkg {bash coreutils} { set boot_modules { ram_fs - noux libc_noux.lib.so bash.tar coreutils.tar + noux libc_noux.lib.so posix.lib.so bash.tar coreutils.tar tcp_terminal lwip.lib.so nic_drv report_rom input_merger test.bin template.bat @@ -129,22 +129,20 @@ set config_of_app { <start name="nic_drv" priority="-1"> <resource name="RAM" quantum="4M"/> <provides> <service name="Nic"/> </provides> - <route> - <service name="IRQ"><child name="acpi"/></service> - <any-service> <parent/> <any-child/></any-service> - </route> </start> - <start name="tcp_terminal" priority="-1"> + <start name="tcp_terminal" priority="-1" caps="200"> <resource name="RAM" quantum="5M"/> <provides> <service name="Terminal"/> </provides> <config> <policy label_prefix="noux" port="8888"/> + <vfs> <dir name="dev"> <log/> </dir> </vfs> + <libc stdout="/dev/log"/> </config> </start> - <start name="noux" priority="-1"> - <resource name="RAM" quantum="32M"/> + <start name="noux" priority="-1" caps="600"> + <resource name="RAM" quantum="32M" caps="200"/> <config> <fstab> <tar name="coreutils.tar"/> @@ -190,7 +188,7 @@ set config_of_app { </config> </start> - <start name="report_rom"> + <start name="report_rom" priority="-1"> <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config> @@ -200,7 +198,7 @@ set config_of_app { </config> </start> - <start name="input_merger"> + <start name="input_merger" priority="-1"> <resource name="RAM" quantum="1M" /> <provides> <service name="Input" /> @@ -222,7 +220,7 @@ append config_of_app { </route> </start> - <start name="vbox1" priority="-2">} + <start name="vbox1" priority="-2" caps="600">} append_if [expr $use_vbox4] config_of_app " <binary name=\"$virtualbox_binary\" />" append_if [expr $use_vbox5] config_of_app " diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc index 2063a59216..7ca5b0154e 100644 --- a/repos/ports/run/vbox_win.inc +++ b/repos/ports/run/vbox_win.inc @@ -247,7 +247,7 @@ append config_of_app { for { set i 1} { $i <= $use_vms } { incr i} { append config_of_app " - <start name=\"vbox${i}\" priority=\"-2\">" + <start name=\"vbox${i}\" priority=\"-2\" caps=\"600\">" append_if [expr $use_vbox4] config_of_app " <binary name=\"$virtualbox_binary\" />" append_if [expr $use_vbox5] config_of_app " diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run index a468e3ce48..32f977dc27 100644 --- a/repos/ports/run/virtualbox.run +++ b/repos/ports/run/virtualbox.run @@ -68,6 +68,7 @@ append config { <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> @@ -220,7 +221,7 @@ append_if [expr $use_gui] config { </route> </start> - <start name="vbox2" priority="-2">} + <start name="vbox2" priority="-2" caps="200">} append_if [expr $use_gui] config " <binary name=\"$virtualbox_binary\"/>" append_if [expr $use_gui] config { @@ -242,7 +243,7 @@ append_if [expr $use_gui] config { </start>} append config { - <start name="vbox1" priority="-2">} + <start name="vbox1" priority="-2" caps="200">} append config " <binary name=\"$virtualbox_binary\"/>" append config { diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index 26671f7bd4..095b878df6 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -70,6 +70,8 @@ append config { <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> @@ -97,7 +99,7 @@ append config { </start>} append_if [expr $use_rumpfs] config { - <start name="rump_fs" priority="-1"> + <start name="rump_fs" priority="-1" caps="200"> <resource name="RAM" quantum="32M"/> <provides><service name="File_system"/></provides> <config ld_verbose="yes" fs="ext2fs">} @@ -113,7 +115,7 @@ append_if [expr $use_rumpfs] config { </start>} append_if [expr $use_ram_fs] config { - <start name="ram_fs" priority="-1">} + <start name="ram_fs" priority="-1" caps="400">} append_if [expr $use_ram_fs] config " <resource name=\"RAM\" quantum=\"[expr $use_vms * 8 * 128]M\"/>" append_if [expr $use_ram_fs] config { @@ -305,7 +307,7 @@ append_if [expr $use_usb] config { } append_if [have_spec framebuffer] config { - <start name="fb_drv" priority="-1"> + <start name="fb_drv" priority="-1" caps="150"> <resource name="RAM" quantum="8M"/> <provides><service name="Framebuffer"/></provides> <config buffered="yes"/>