diff --git a/repos/base-foc/run/cap_integrity.run b/repos/base-foc/run/cap_integrity.run index 065aa33c53..63b2d2222c 100644 --- a/repos/base-foc/run/cap_integrity.run +++ b/repos/base-foc/run/cap_integrity.run @@ -14,9 +14,7 @@ install_config { - - - + } diff --git a/repos/base-hw/run/cpu_quota.run b/repos/base-hw/run/cpu_quota.run index 9bcadbf9af..da0a08851c 100644 --- a/repos/base-hw/run/cpu_quota.run +++ b/repos/base-hw/run/cpu_quota.run @@ -20,14 +20,12 @@ install_config { - - + - + - @@ -47,18 +45,16 @@ install_config { - + - - + - @@ -79,23 +75,20 @@ install_config { - + - - + - - - + diff --git a/repos/base-hw/run/cpu_scheduler.run b/repos/base-hw/run/cpu_scheduler.run index 3e36cf4b03..2f58a6d456 100644 --- a/repos/base-hw/run/cpu_scheduler.run +++ b/repos/base-hw/run/cpu_scheduler.run @@ -14,9 +14,7 @@ install_config { - - - + } build_boot_image [build_artifacts] diff --git a/repos/base-linux/run/lx_fs.run b/repos/base-linux/run/lx_fs.run index 80cf14ad21..de8d2caef6 100644 --- a/repos/base-linux/run/lx_fs.run +++ b/repos/base-linux/run/lx_fs.run @@ -32,13 +32,11 @@ install_config { - - + - - + diff --git a/repos/base-linux/run/lx_fs_notify.run b/repos/base-linux/run/lx_fs_notify.run index ef77682b97..f7b856aa6e 100644 --- a/repos/base-linux/run/lx_fs_notify.run +++ b/repos/base-linux/run/lx_fs_notify.run @@ -44,8 +44,7 @@ install_config { - - + @@ -55,9 +54,8 @@ install_config { - + - @@ -65,9 +63,8 @@ install_config { - + - @@ -75,16 +72,14 @@ install_config { - - + - - + @@ -114,8 +109,7 @@ set init_run_fwrite_test { - - + @@ -151,8 +145,7 @@ set init_run_write_test { - - + diff --git a/repos/base-linux/run/lx_hybrid_ctors.run b/repos/base-linux/run/lx_hybrid_ctors.run index d968a0ab8e..7e138a6677 100644 --- a/repos/base-linux/run/lx_hybrid_ctors.run +++ b/repos/base-linux/run/lx_hybrid_ctors.run @@ -20,10 +20,8 @@ install_config { - - - - + + } diff --git a/repos/base-linux/run/lx_hybrid_errno.run b/repos/base-linux/run/lx_hybrid_errno.run index aaa7747169..08d4f23491 100644 --- a/repos/base-linux/run/lx_hybrid_errno.run +++ b/repos/base-linux/run/lx_hybrid_errno.run @@ -13,9 +13,7 @@ install_config { - - - + } diff --git a/repos/base-linux/run/lx_hybrid_exception.run b/repos/base-linux/run/lx_hybrid_exception.run index 55f780f1e6..029b82e19b 100644 --- a/repos/base-linux/run/lx_hybrid_exception.run +++ b/repos/base-linux/run/lx_hybrid_exception.run @@ -13,10 +13,8 @@ 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 881cc92629..05ecd2a92b 100644 --- a/repos/base-linux/run/lx_hybrid_pthread_ipc.run +++ b/repos/base-linux/run/lx_hybrid_pthread_ipc.run @@ -13,10 +13,8 @@ install_config { - - - - + + } diff --git a/repos/base-linux/run/lx_rmap.inc b/repos/base-linux/run/lx_rmap.inc index e0fdc6010e..d20ed320be 100644 --- a/repos/base-linux/run/lx_rmap.inc +++ b/repos/base-linux/run/lx_rmap.inc @@ -22,9 +22,7 @@ install_config { - - - + } diff --git a/repos/base-linux/run/region_map_mmap.run b/repos/base-linux/run/region_map_mmap.run index b9ae7782dd..02721cce1d 100644 --- a/repos/base-linux/run/region_map_mmap.run +++ b/repos/base-linux/run/region_map_mmap.run @@ -14,19 +14,14 @@ install_config { - - - - + + - - - - + } build_boot_image [build_artifacts] diff --git a/repos/base-nova/run/nova.run b/repos/base-nova/run/nova.run index a304f23f49..4ebd0e2b55 100644 --- a/repos/base-nova/run/nova.run +++ b/repos/base-nova/run/nova.run @@ -24,8 +24,7 @@ set config { - - } + } append config " " diff --git a/repos/base/recipes/pkg/test-ds_ownership/runtime b/repos/base/recipes/pkg/test-ds_ownership/runtime index 850753c53f..631689d805 100644 --- a/repos/base/recipes/pkg/test-ds_ownership/runtime +++ b/repos/base/recipes/pkg/test-ds_ownership/runtime @@ -17,8 +17,7 @@ - - + diff --git a/repos/base/recipes/pkg/test-entrypoint/runtime b/repos/base/recipes/pkg/test-entrypoint/runtime index 1435ee8261..f2a5e57775 100644 --- a/repos/base/recipes/pkg/test-entrypoint/runtime +++ b/repos/base/recipes/pkg/test-entrypoint/runtime @@ -19,8 +19,6 @@ - - - + diff --git a/repos/base/recipes/pkg/test-log/runtime b/repos/base/recipes/pkg/test-log/runtime index 2ee443679c..30942261eb 100644 --- a/repos/base/recipes/pkg/test-log/runtime +++ b/repos/base/recipes/pkg/test-log/runtime @@ -35,8 +35,6 @@ - - - + diff --git a/repos/base/recipes/pkg/test-mmio/runtime b/repos/base/recipes/pkg/test-mmio/runtime index 738f3d935c..a560f7cd9a 100644 --- a/repos/base/recipes/pkg/test-mmio/runtime +++ b/repos/base/recipes/pkg/test-mmio/runtime @@ -23,9 +23,8 @@ - + - diff --git a/repos/base/recipes/pkg/test-new_delete/runtime b/repos/base/recipes/pkg/test-new_delete/runtime index 7c230a7522..ed39ab7901 100644 --- a/repos/base/recipes/pkg/test-new_delete/runtime +++ b/repos/base/recipes/pkg/test-new_delete/runtime @@ -73,8 +73,6 @@ - - - + diff --git a/repos/base/recipes/pkg/test-reconstructible/runtime b/repos/base/recipes/pkg/test-reconstructible/runtime index 741b784df0..9bb1bf9c7a 100644 --- a/repos/base/recipes/pkg/test-reconstructible/runtime +++ b/repos/base/recipes/pkg/test-reconstructible/runtime @@ -54,8 +54,6 @@ - - - + diff --git a/repos/base/recipes/pkg/test-registry/runtime b/repos/base/recipes/pkg/test-registry/runtime index ff1b41c3da..cc3379e516 100644 --- a/repos/base/recipes/pkg/test-registry/runtime +++ b/repos/base/recipes/pkg/test-registry/runtime @@ -20,8 +20,6 @@ - - - + diff --git a/repos/base/recipes/pkg/test-rm_fault/runtime b/repos/base/recipes/pkg/test-rm_fault/runtime index 2de9a7d96c..0e1e4f37a5 100644 --- a/repos/base/recipes/pkg/test-rm_fault/runtime +++ b/repos/base/recipes/pkg/test-rm_fault/runtime @@ -20,9 +20,6 @@ - - - - + diff --git a/repos/base/recipes/pkg/test-rm_fault_no_nox/runtime b/repos/base/recipes/pkg/test-rm_fault_no_nox/runtime index b1095502bc..df7def17f1 100644 --- a/repos/base/recipes/pkg/test-rm_fault_no_nox/runtime +++ b/repos/base/recipes/pkg/test-rm_fault_no_nox/runtime @@ -19,8 +19,7 @@ - - + diff --git a/repos/base/recipes/pkg/test-rm_nested/runtime b/repos/base/recipes/pkg/test-rm_nested/runtime index 72d1e6cb44..105cb4846e 100644 --- a/repos/base/recipes/pkg/test-rm_nested/runtime +++ b/repos/base/recipes/pkg/test-rm_nested/runtime @@ -21,8 +21,6 @@ - - - + diff --git a/repos/base/recipes/pkg/test-rm_stress/runtime b/repos/base/recipes/pkg/test-rm_stress/runtime index c295d68969..5e366edc53 100644 --- a/repos/base/recipes/pkg/test-rm_stress/runtime +++ b/repos/base/recipes/pkg/test-rm_stress/runtime @@ -20,8 +20,6 @@ - - - + diff --git a/repos/base/recipes/pkg/test-stack_smash/runtime b/repos/base/recipes/pkg/test-stack_smash/runtime index 1cb01c0a18..e73d76fa12 100644 --- a/repos/base/recipes/pkg/test-stack_smash/runtime +++ b/repos/base/recipes/pkg/test-stack_smash/runtime @@ -19,8 +19,6 @@ - - - + diff --git a/repos/base/recipes/pkg/test-synced_interface/runtime b/repos/base/recipes/pkg/test-synced_interface/runtime index 302be0ddb5..678784e6c8 100644 --- a/repos/base/recipes/pkg/test-synced_interface/runtime +++ b/repos/base/recipes/pkg/test-synced_interface/runtime @@ -27,8 +27,6 @@ - - - + diff --git a/repos/base/recipes/pkg/test-timer/runtime b/repos/base/recipes/pkg/test-timer/runtime index 971ce5c10f..a60bd9ed79 100644 --- a/repos/base/recipes/pkg/test-timer/runtime +++ b/repos/base/recipes/pkg/test-timer/runtime @@ -26,9 +26,8 @@ - + - diff --git a/repos/base/recipes/pkg/test-tls/runtime b/repos/base/recipes/pkg/test-tls/runtime index 286e58ce2c..4605484c6f 100644 --- a/repos/base/recipes/pkg/test-tls/runtime +++ b/repos/base/recipes/pkg/test-tls/runtime @@ -26,8 +26,6 @@ - - - + diff --git a/repos/base/recipes/pkg/test-token/runtime b/repos/base/recipes/pkg/test-token/runtime index e30a607928..7e4539193b 100644 --- a/repos/base/recipes/pkg/test-token/runtime +++ b/repos/base/recipes/pkg/test-token/runtime @@ -20,8 +20,6 @@ - - - + diff --git a/repos/base/recipes/pkg/test-xml_generator/runtime b/repos/base/recipes/pkg/test-xml_generator/runtime index 1f04982ae6..e6676ab654 100644 --- a/repos/base/recipes/pkg/test-xml_generator/runtime +++ b/repos/base/recipes/pkg/test-xml_generator/runtime @@ -76,8 +76,7 @@ - - + diff --git a/repos/base/recipes/pkg/test-xml_node/runtime b/repos/base/recipes/pkg/test-xml_node/runtime index 11766a652d..de8118bd04 100644 --- a/repos/base/recipes/pkg/test-xml_node/runtime +++ b/repos/base/recipes/pkg/test-xml_node/runtime @@ -131,8 +131,6 @@ - - - + diff --git a/repos/base/run/log.run b/repos/base/run/log.run index 6b1f874cb5..9419d8f4e1 100644 --- a/repos/base/run/log.run +++ b/repos/base/run/log.run @@ -13,10 +13,8 @@ install_config { - - - - + + } diff --git a/repos/base/run/migrate.run b/repos/base/run/migrate.run index 75c3afc3e7..4fbbeac53d 100644 --- a/repos/base/run/migrate.run +++ b/repos/base/run/migrate.run @@ -31,13 +31,11 @@ append config { - - + - - + diff --git a/repos/base/run/smp.run b/repos/base/run/smp.run index ed48030ed0..b434f8a9b2 100644 --- a/repos/base/run/smp.run +++ b/repos/base/run/smp.run @@ -26,9 +26,7 @@ install_config { - - - + } diff --git a/repos/base/run/sub_rm.run b/repos/base/run/sub_rm.run index 97abc6828c..a63ec960d9 100644 --- a/repos/base/run/sub_rm.run +++ b/repos/base/run/sub_rm.run @@ -19,8 +19,7 @@ append config { - - + diff --git a/repos/base/run/thread.run b/repos/base/run/thread.run index bfd5bd603f..2f52be18e1 100644 --- a/repos/base/run/thread.run +++ b/repos/base/run/thread.run @@ -35,8 +35,7 @@ append config { - - + diff --git a/repos/base/run/timeout_smp.run b/repos/base/run/timeout_smp.run index da6e556426..1e42d6bfa4 100644 --- a/repos/base/run/timeout_smp.run +++ b/repos/base/run/timeout_smp.run @@ -18,14 +18,12 @@ install_config { - - + - + - diff --git a/repos/base/run/timer_accuracy.run b/repos/base/run/timer_accuracy.run index fe536905c7..4ce5b19927 100644 --- a/repos/base/run/timer_accuracy.run +++ b/repos/base/run/timer_accuracy.run @@ -18,14 +18,11 @@ install_config { - - + - - - + } diff --git a/repos/base/run/timer_rate.run b/repos/base/run/timer_rate.run index 6be666c3a8..35cae0c39a 100644 --- a/repos/base/run/timer_rate.run +++ b/repos/base/run/timer_rate.run @@ -18,14 +18,12 @@ install_config { - - + - + - -! -! +! ! ! ! diff --git a/repos/dde_bsd/README b/repos/dde_bsd/README index 50748ddae9..478e28c1bf 100644 --- a/repos/dde_bsd/README +++ b/repos/dde_bsd/README @@ -47,8 +47,7 @@ or recording because it may provoke the generation of artefacts. The following configures the driver of playback and recording: -! -! +! ! ! ! diff --git a/repos/dde_bsd/run/audio_in.run b/repos/dde_bsd/run/audio_in.run index a7c34f392f..1f4d1a53c8 100644 --- a/repos/dde_bsd/run/audio_in.run +++ b/repos/dde_bsd/run/audio_in.run @@ -46,8 +46,7 @@ proc record_play_start_nodes { } { if {![use_record_play_sessions]} { return "" } return { - - + @@ -68,9 +67,7 @@ proc audio_in_out_start_nodes { } { if {[use_record_play_sessions]} { return "" } return { - - - + } } @@ -89,14 +86,12 @@ install_config { - + - - - + @@ -104,16 +99,14 @@ install_config { - - + - - + @@ -122,7 +115,6 @@ install_config { - @@ -136,9 +128,8 @@ install_config { - + - diff --git a/repos/dde_bsd/run/audio_out.run b/repos/dde_bsd/run/audio_out.run index 00e5ccc84d..588e041f60 100644 --- a/repos/dde_bsd/run/audio_out.run +++ b/repos/dde_bsd/run/audio_out.run @@ -52,8 +52,7 @@ proc record_play_start_nodes { } { return "" } return { - - + @@ -67,8 +66,7 @@ proc record_play_start_nodes { } { - - + @@ -85,8 +83,7 @@ proc audio_in_out_start_nodes { } { return "" } return { - - + sample.f32 @@ -111,14 +108,12 @@ install_config { - + - - - + @@ -126,16 +121,14 @@ install_config { - - + - - + @@ -144,7 +137,6 @@ install_config { - @@ -158,9 +150,8 @@ install_config { - + - diff --git a/repos/dde_linux/recipes/raw/test-wg_reconnect/dynamic.config b/repos/dde_linux/recipes/raw/test-wg_reconnect/dynamic.config index 686036d10c..fd98288e94 100644 --- a/repos/dde_linux/recipes/raw/test-wg_reconnect/dynamic.config +++ b/repos/dde_linux/recipes/raw/test-wg_reconnect/dynamic.config @@ -16,9 +16,8 @@ - + - - - + diff --git a/repos/dde_linux/run/driver_time.run b/repos/dde_linux/run/driver_time.run index 4041726733..ad2b5d8b2b 100644 --- a/repos/dde_linux/run/driver_time.run +++ b/repos/dde_linux/run/driver_time.run @@ -29,20 +29,16 @@ append config { - + - - - - } + } append_if $use_top config { - - + diff --git a/repos/dde_linux/run/lxip_raw.run b/repos/dde_linux/run/lxip_raw.run index 1eb887cf87..d0eea1c6ca 100644 --- a/repos/dde_linux/run/lxip_raw.run +++ b/repos/dde_linux/run/lxip_raw.run @@ -25,14 +25,12 @@ append config { - + - - - + @@ -54,8 +52,7 @@ append config { - - + @@ -63,8 +60,7 @@ append config { - - + diff --git a/repos/dde_linux/run/nic_router_uplinks.run b/repos/dde_linux/run/nic_router_uplinks.run index a17f051731..0c069c0b9a 100644 --- a/repos/dde_linux/run/nic_router_uplinks.run +++ b/repos/dde_linux/run/nic_router_uplinks.run @@ -37,10 +37,9 @@ install_config { - + - - + @@ -53,12 +52,9 @@ install_config { - - - + - - + @@ -66,8 +62,7 @@ install_config { - - + @@ -80,28 +75,24 @@ install_config { - - - + - - - + @@ -126,9 +117,8 @@ install_config { - + - @@ -142,9 +132,8 @@ install_config { - + - @@ -157,7 +146,6 @@ install_config { - @@ -165,8 +153,7 @@ install_config { - - + - + - - @@ -100,9 +98,8 @@ install_config { - + - @@ -113,8 +110,7 @@ install_config { - - + @@ -128,8 +124,7 @@ install_config { - - + @@ -179,7 +174,6 @@ install_config { - diff --git a/repos/dde_linux/run/usb_hid_reconnect.run b/repos/dde_linux/run/usb_hid_reconnect.run index 70aecbbdc4..443bc91d8b 100644 --- a/repos/dde_linux/run/usb_hid_reconnect.run +++ b/repos/dde_linux/run/usb_hid_reconnect.run @@ -40,24 +40,21 @@ install_config { - + - - - + - @@ -68,8 +65,7 @@ install_config { - - + @@ -81,8 +77,7 @@ install_config { - - + @@ -114,7 +109,6 @@ install_config { - diff --git a/repos/dde_linux/run/usb_net.run b/repos/dde_linux/run/usb_net.run index c62a17eb17..7c5923200e 100644 --- a/repos/dde_linux/run/usb_net.run +++ b/repos/dde_linux/run/usb_net.run @@ -34,16 +34,14 @@ install_config { - + - - + - @@ -53,8 +51,7 @@ install_config { - - + @@ -62,8 +59,7 @@ install_config { - - + @@ -90,8 +86,7 @@ install_config { - - + diff --git a/repos/dde_linux/run/vfs_cfg.run b/repos/dde_linux/run/vfs_cfg.run index 61a37e8730..08b20ff543 100644 --- a/repos/dde_linux/run/vfs_cfg.run +++ b/repos/dde_linux/run/vfs_cfg.run @@ -29,15 +29,13 @@ install_config { - + - - + - - + - - - + @@ -83,8 +79,7 @@ install_config { - - + @@ -106,9 +101,8 @@ install_config { - + - diff --git a/repos/dde_linux/run/wg_fetchurl.run b/repos/dde_linux/run/wg_fetchurl.run index 62d96abd17..75035b5db0 100644 --- a/repos/dde_linux/run/wg_fetchurl.run +++ b/repos/dde_linux/run/wg_fetchurl.run @@ -51,8 +51,7 @@ append config { - - + @@ -64,9 +63,8 @@ append config { - + - @@ -79,8 +77,7 @@ append config { append_if $linux config { - - + @@ -96,8 +93,7 @@ append_if $linux config { append config { - - + @@ -140,9 +136,8 @@ append config { - + - @@ -163,8 +158,7 @@ append config { - - + @@ -216,9 +210,8 @@ append config { - + - @@ -237,8 +230,7 @@ append config { - - + diff --git a/repos/dde_linux/run/wg_lighttpd.run b/repos/dde_linux/run/wg_lighttpd.run index 8463e47cd3..383ce7bc5e 100644 --- a/repos/dde_linux/run/wg_lighttpd.run +++ b/repos/dde_linux/run/wg_lighttpd.run @@ -49,8 +49,7 @@ install_config { - - + @@ -60,8 +59,7 @@ install_config { - - + @@ -80,9 +78,8 @@ install_config { - + - @@ -114,9 +111,8 @@ install_config { - + - @@ -144,8 +140,7 @@ install_config { - - + @@ -164,8 +159,7 @@ install_config { - - + diff --git a/repos/dde_linux/run/wg_ping_inwards.run b/repos/dde_linux/run/wg_ping_inwards.run index a51ba99074..3f7d64f784 100644 --- a/repos/dde_linux/run/wg_ping_inwards.run +++ b/repos/dde_linux/run/wg_ping_inwards.run @@ -26,8 +26,7 @@ install_config { - - + @@ -37,8 +36,7 @@ install_config { - - + @@ -57,9 +55,8 @@ install_config { - + - @@ -85,9 +82,8 @@ install_config { - + - @@ -111,8 +107,7 @@ install_config { - - + diff --git a/repos/dde_linux/run/wg_ping_outwards.run b/repos/dde_linux/run/wg_ping_outwards.run index 4eb32e29f9..abcb8ee187 100644 --- a/repos/dde_linux/run/wg_ping_outwards.run +++ b/repos/dde_linux/run/wg_ping_outwards.run @@ -26,8 +26,7 @@ install_config { - - + @@ -37,8 +36,7 @@ install_config { - - + @@ -57,9 +55,8 @@ install_config { - + - @@ -94,9 +91,8 @@ install_config { - + - @@ -124,8 +120,7 @@ install_config { - - + @@ -146,8 +141,7 @@ install_config { - - + diff --git a/repos/dde_linux/run/wg_reconfig.run b/repos/dde_linux/run/wg_reconfig.run index 173f0ee70d..47d556b2e5 100644 --- a/repos/dde_linux/run/wg_reconfig.run +++ b/repos/dde_linux/run/wg_reconfig.run @@ -106,8 +106,7 @@ append config { - - + @@ -117,8 +116,7 @@ append config { - - + @@ -173,9 +171,8 @@ append config { - + - @@ -185,9 +182,8 @@ append config { - + - @@ -199,9 +195,8 @@ append config { - + - @@ -213,9 +208,8 @@ append config { - + - @@ -246,9 +240,8 @@ append config { - + - @@ -264,9 +257,8 @@ append config { - + - @@ -282,9 +274,8 @@ append config { - + - @@ -305,9 +296,8 @@ append config { - + - @@ -328,8 +318,7 @@ append config { - - + @@ -431,9 +420,8 @@ append config { - + - diff --git a/repos/dde_linux/run/wg_reconnect.run b/repos/dde_linux/run/wg_reconnect.run index 1ad80f608f..191a969e82 100644 --- a/repos/dde_linux/run/wg_reconnect.run +++ b/repos/dde_linux/run/wg_reconnect.run @@ -98,8 +98,7 @@ set server_init_config { - - + @@ -131,9 +130,8 @@ set server_init_config { - the wireguard server doesn't need a Rtc session, which is only - used to initiate handshakes by the client. --> - + - - - + @@ -197,8 +194,7 @@ set client_init_config { - - + @@ -226,8 +222,7 @@ set client_init_config { - - + @@ -237,8 +232,7 @@ set client_init_config { - - + @@ -262,8 +256,7 @@ append config { - - + @@ -272,9 +265,8 @@ append config { - + - @@ -283,8 +275,7 @@ append config { - - + @@ -312,9 +303,8 @@ append config { - + - } $server_init_config { @@ -325,9 +315,8 @@ append config { - + - } $client_init_config { diff --git a/repos/dde_linux/src/driver/usb_net/README b/repos/dde_linux/src/driver/usb_net/README index 6359685398..a429065a04 100644 --- a/repos/dde_linux/src/driver/usb_net/README +++ b/repos/dde_linux/src/driver/usb_net/README @@ -18,8 +18,7 @@ NIC configuration Configuration snippet: -! -! +! ! ! ! @@ -48,8 +47,7 @@ Huawai ME906s (P/V: 12d1:15c1) - "configuration=3" for 'usb_net' Fibocom L830-EB-00 (P/V: 2cb7:0210) - automatically detected -! -! +! ! ! ! diff --git a/repos/dde_linux/src/driver/wifi/README b/repos/dde_linux/src/driver/wifi/README index d4f812d98e..d09d1dc82f 100644 --- a/repos/dde_linux/src/driver/wifi/README +++ b/repos/dde_linux/src/driver/wifi/README @@ -17,8 +17,7 @@ Configuration This configuration snippet shows how to start the component on the PC platform. -! -! +! ! ! ! @@ -45,8 +44,7 @@ platform. On other platforms the wifi library will be different. So, the following snippet illustrates the use of the driver on the PinePhone. -! -! +! ! ! ! diff --git a/repos/dde_rump/run/fs_rom_update_ext2.run b/repos/dde_rump/run/fs_rom_update_ext2.run index 7aea7e15a1..818f47aa8d 100644 --- a/repos/dde_rump/run/fs_rom_update_ext2.run +++ b/repos/dde_rump/run/fs_rom_update_ext2.run @@ -33,13 +33,11 @@ install_config { - + - - - + @@ -52,8 +50,7 @@ install_config { writeable="yes"/> - - + @@ -61,8 +58,7 @@ install_config { - - + @@ -85,8 +81,7 @@ install_config { - - + @@ -97,8 +92,7 @@ install_config { - - + @@ -106,7 +100,6 @@ install_config { - diff --git a/repos/dde_rump/run/rump_ext2.run b/repos/dde_rump/run/rump_ext2.run index df69d7dfbb..042aa91ed8 100644 --- a/repos/dde_rump/run/rump_ext2.run +++ b/repos/dde_rump/run/rump_ext2.run @@ -45,13 +45,11 @@ install_config { - + - - - + @@ -64,16 +62,14 @@ install_config { writeable="yes"/> - - + - - + diff --git a/repos/dde_rump/run/rump_fat.run b/repos/dde_rump/run/rump_fat.run index 9ba6999572..d10c3837b9 100644 --- a/repos/dde_rump/run/rump_fat.run +++ b/repos/dde_rump/run/rump_fat.run @@ -38,13 +38,11 @@ install_config { - + - - - + @@ -57,8 +55,7 @@ install_config { writeable="yes"/> - - + @@ -67,8 +64,7 @@ install_config { - - + diff --git a/repos/dde_rump/run/rump_iso.run b/repos/dde_rump/run/rump_iso.run index af3f0e8c16..dc0056d560 100644 --- a/repos/dde_rump/run/rump_iso.run +++ b/repos/dde_rump/run/rump_iso.run @@ -26,13 +26,11 @@ install_config { - + - - - + @@ -42,20 +40,17 @@ install_config { writeable="no"/> - - + - - + - diff --git a/repos/dde_rump/run/vfs_stress_ext2.run b/repos/dde_rump/run/vfs_stress_ext2.run index 8238c450d6..7e2461a396 100644 --- a/repos/dde_rump/run/vfs_stress_ext2.run +++ b/repos/dde_rump/run/vfs_stress_ext2.run @@ -39,13 +39,11 @@ install_config { - + - - - + @@ -58,8 +56,7 @@ install_config { writeable="yes"/> - - + diff --git a/repos/dde_rump/run/vfs_stress_rump_fs.run b/repos/dde_rump/run/vfs_stress_rump_fs.run index ff5a669e67..ac119f0a17 100644 --- a/repos/dde_rump/run/vfs_stress_rump_fs.run +++ b/repos/dde_rump/run/vfs_stress_rump_fs.run @@ -40,19 +40,16 @@ install_config { - + - - - + - - + @@ -65,8 +62,7 @@ install_config { writeable="yes"/> - - + diff --git a/repos/gems/recipes/pkg/cpu_load_display/runtime b/repos/gems/recipes/pkg/cpu_load_display/runtime index 145f23b08e..37608fac50 100644 --- a/repos/gems/recipes/pkg/cpu_load_display/runtime +++ b/repos/gems/recipes/pkg/cpu_load_display/runtime @@ -24,8 +24,7 @@ - - + @@ -36,8 +35,7 @@ - - + @@ -47,8 +45,7 @@ - - + diff --git a/repos/gems/recipes/pkg/dbg_download/runtime b/repos/gems/recipes/pkg/dbg_download/runtime index 0c7e011ae6..a2896772f8 100644 --- a/repos/gems/recipes/pkg/dbg_download/runtime +++ b/repos/gems/recipes/pkg/dbg_download/runtime @@ -52,9 +52,8 @@ - + - @@ -67,9 +66,8 @@ - + - @@ -82,9 +80,8 @@ - + - - + - @@ -118,8 +114,7 @@ - - + diff --git a/repos/gems/recipes/pkg/file_vault/runtime b/repos/gems/recipes/pkg/file_vault/runtime index d40e283158..b1a84f3cbe 100644 --- a/repos/gems/recipes/pkg/file_vault/runtime +++ b/repos/gems/recipes/pkg/file_vault/runtime @@ -67,8 +67,7 @@ - - + @@ -82,8 +81,7 @@ - - + @@ -108,9 +106,8 @@ - + - diff --git a/repos/gems/recipes/pkg/test-depot_query_index/runtime b/repos/gems/recipes/pkg/test-depot_query_index/runtime index 3c055e5756..7e3aeb27ae 100644 --- a/repos/gems/recipes/pkg/test-depot_query_index/runtime +++ b/repos/gems/recipes/pkg/test-depot_query_index/runtime @@ -32,16 +32,14 @@ - + - - - + diff --git a/repos/gems/recipes/pkg/test-file_vault/runtime b/repos/gems/recipes/pkg/test-file_vault/runtime index 524eb42c7b..28b115b49d 100644 --- a/repos/gems/recipes/pkg/test-file_vault/runtime +++ b/repos/gems/recipes/pkg/test-file_vault/runtime @@ -35,8 +35,7 @@ - - + @@ -63,8 +62,7 @@ - - + @@ -78,9 +76,8 @@ - + - @@ -98,9 +95,8 @@ - + - @@ -118,8 +114,7 @@ - - + diff --git a/repos/gems/recipes/pkg/test-file_vault_no_entropy/runtime b/repos/gems/recipes/pkg/test-file_vault_no_entropy/runtime index 0d4fe756e5..98c86851f9 100644 --- a/repos/gems/recipes/pkg/test-file_vault_no_entropy/runtime +++ b/repos/gems/recipes/pkg/test-file_vault_no_entropy/runtime @@ -35,8 +35,7 @@ - - + @@ -63,8 +62,7 @@ - - + @@ -78,9 +76,8 @@ - + - @@ -98,9 +95,8 @@ - + - @@ -118,8 +114,7 @@ - - + diff --git a/repos/gems/recipes/pkg/test-fs_tool/runtime b/repos/gems/recipes/pkg/test-fs_tool/runtime index e7668e69d4..f38bbaa25e 100644 --- a/repos/gems/recipes/pkg/test-fs_tool/runtime +++ b/repos/gems/recipes/pkg/test-fs_tool/runtime @@ -44,16 +44,14 @@ - + - - - + @@ -70,12 +68,10 @@ - + - - @@ -95,7 +91,6 @@ - @@ -117,7 +112,6 @@ - @@ -126,7 +120,6 @@ - diff --git a/repos/gems/recipes/pkg/test-libc_vfs_audit/runtime b/repos/gems/recipes/pkg/test-libc_vfs_audit/runtime index 5fc226a804..6900c75ee2 100644 --- a/repos/gems/recipes/pkg/test-libc_vfs_audit/runtime +++ b/repos/gems/recipes/pkg/test-libc_vfs_audit/runtime @@ -25,8 +25,7 @@ - - + @@ -36,8 +35,7 @@ - - + diff --git a/repos/gems/recipes/pkg/touch_keyboard/runtime b/repos/gems/recipes/pkg/touch_keyboard/runtime index 0ebe3944d8..a89175a96f 100644 --- a/repos/gems/recipes/pkg/touch_keyboard/runtime +++ b/repos/gems/recipes/pkg/touch_keyboard/runtime @@ -20,9 +20,8 @@ - + - diff --git a/repos/gems/recipes/pkg/window_layouter/runtime b/repos/gems/recipes/pkg/window_layouter/runtime index b743ea9083..062d6f50e2 100644 --- a/repos/gems/recipes/pkg/window_layouter/runtime +++ b/repos/gems/recipes/pkg/window_layouter/runtime @@ -27,10 +27,9 @@ - + - @@ -40,7 +39,6 @@ - @@ -49,8 +47,7 @@ - - + diff --git a/repos/gems/recipes/raw/depot_download/depot_download.config b/repos/gems/recipes/raw/depot_download/depot_download.config index ab99cbe0b7..8bac909fc9 100644 --- a/repos/gems/recipes/raw/depot_download/depot_download.config +++ b/repos/gems/recipes/raw/depot_download/depot_download.config @@ -17,9 +17,8 @@ - + - - + - @@ -58,9 +56,8 @@ - + - @@ -69,9 +66,8 @@ - + - @@ -80,9 +76,8 @@ - + - @@ -99,8 +94,7 @@ - - + diff --git a/repos/gems/recipes/raw/download_coreplus/init.config b/repos/gems/recipes/raw/download_coreplus/init.config index 9ec8df6073..38acb78696 100644 --- a/repos/gems/recipes/raw/download_coreplus/init.config +++ b/repos/gems/recipes/raw/download_coreplus/init.config @@ -12,10 +12,9 @@ - + - - + @@ -45,8 +44,7 @@ cp /machine.vbox /disk0.vmdk /vm - - + @@ -56,8 +54,7 @@ cp /machine.vbox /disk0.vmdk /vm - - + @@ -78,8 +75,7 @@ cp /machine.vbox /disk0.vmdk /vm - - + @@ -92,7 +88,6 @@ cp /machine.vbox /disk0.vmdk /vm - @@ -103,7 +98,6 @@ cp /machine.vbox /disk0.vmdk /vm - @@ -112,10 +106,9 @@ cp /machine.vbox /disk0.vmdk /vm - + - diff --git a/repos/gems/recipes/raw/drivers_nic-pc/drivers.config b/repos/gems/recipes/raw/drivers_nic-pc/drivers.config index 309ac11198..b09886424f 100644 --- a/repos/gems/recipes/raw/drivers_nic-pc/drivers.config +++ b/repos/gems/recipes/raw/drivers_nic-pc/drivers.config @@ -13,13 +13,12 @@ - + - - + @@ -32,7 +31,6 @@ - @@ -49,8 +47,7 @@ - - + @@ -63,8 +60,7 @@ - - + @@ -87,7 +83,6 @@ - @@ -103,9 +98,8 @@ - + - diff --git a/repos/gems/recipes/raw/motif_wm/decorator_init.config b/repos/gems/recipes/raw/motif_wm/decorator_init.config index 8d0e912d0d..bea8fea6d0 100644 --- a/repos/gems/recipes/raw/motif_wm/decorator_init.config +++ b/repos/gems/recipes/raw/motif_wm/decorator_init.config @@ -8,8 +8,7 @@ - - + </controls> <default-policy/> diff --git a/repos/gems/recipes/raw/motif_wm/wm.config b/repos/gems/recipes/raw/motif_wm/wm.config index 29aaabbc08..079f142ba8 100644 --- a/repos/gems/recipes/raw/motif_wm/wm.config +++ b/repos/gems/recipes/raw/motif_wm/wm.config @@ -27,8 +27,7 @@ <default-policy> <child name="wm"/> </default-policy> </service> - <start name="report_rom"> - <resource name="RAM" quantum="4M"/> + <start name="report_rom" ram="4M"> <provides> <service name="Report"/> <service name="ROM"/> @@ -46,8 +45,7 @@ </config> </start> - <start name="wm" caps="100"> - <resource name="RAM" quantum="2M"/> + <start name="wm" caps="100" ram="2M"> <provides> <service name="Gui"/> <service name="Report"/> <service name="ROM"/> </provides> @@ -70,9 +68,8 @@ </route> </start> - <start name="layouter" caps="120"> + <start name="layouter" caps="120" ram="4M"> <binary name="window_layouter"/> - <resource name="RAM" quantum="4M"/> <route> <service name="ROM" label="config"> <parent label="layouter.config"/> </service> <service name="ROM" label="window_list"> <child name="report_rom"/> </service> @@ -87,9 +84,8 @@ </route> </start> - <start name="decorator" caps="450"> + <start name="decorator" caps="450" ram="20M"> <binary name="init"/> - <resource name="RAM" quantum="20M"/> <route> <service name="ROM" label="config"> <parent label="decorator_init.config"/> </service> diff --git a/repos/gems/recipes/raw/themed_wm/decorator_init.config b/repos/gems/recipes/raw/themed_wm/decorator_init.config index 9e8bf6b7ca..14a550f575 100644 --- a/repos/gems/recipes/raw/themed_wm/decorator_init.config +++ b/repos/gems/recipes/raw/themed_wm/decorator_init.config @@ -8,9 +8,8 @@ <service name="Timer"/> <service name="Report"/> </parent-provides> - <start name="decorator" caps="320"> + <start name="decorator" caps="320" ram="11M"> <binary name="themed_decorator"/> - <resource name="RAM" quantum="11M"/> <config> <libc/> <vfs> <tar name="plain_decorator_theme.tar"/> </vfs> diff --git a/repos/gems/recipes/raw/wm/wm.config b/repos/gems/recipes/raw/wm/wm.config index 56235b11c2..00e119ec40 100644 --- a/repos/gems/recipes/raw/wm/wm.config +++ b/repos/gems/recipes/raw/wm/wm.config @@ -55,8 +55,7 @@ <policy label_suffix=" -> clipboard"> <child name="wm"/> </policy> </service> - <start name="report_rom"> - <resource name="RAM" quantum="4M"/> + <start name="report_rom" ram="4M"> <provides> <service name="Report"/> <service name="ROM"/> @@ -74,8 +73,7 @@ </config> </start> - <start name="wm" caps="150"> - <resource name="RAM" quantum="2M"/> + <start name="wm" caps="150" ram="2M"> <provides> <service name="Gui"/> <service name="Report"/> <service name="ROM"/> </provides> diff --git a/repos/gems/run/aes_cbc_4k.run b/repos/gems/run/aes_cbc_4k.run index 28727021b9..a4bc82acb8 100644 --- a/repos/gems/run/aes_cbc_4k.run +++ b/repos/gems/run/aes_cbc_4k.run @@ -22,7 +22,7 @@ append config { </parent-provides> <default-route> <any-service> <parent/> </any-service> </default-route> <default caps="100"/> - <start name="test-aes_cbc_4k"> + <start name="test-aes_cbc_4k" ram="3M"> <config block_number="} $block_number {" test_rounds="} $test_rounds {"> <libc stdout="/dev/log" stderr="/dev/log"/> @@ -33,7 +33,6 @@ append config { </vfs> </config> - <resource name="RAM" quantum="3M"/> </start> </config>} diff --git a/repos/gems/run/cpu_load_display.run b/repos/gems/run/cpu_load_display.run index 174ae118f2..57ee1d7f12 100644 --- a/repos/gems/run/cpu_load_display.run +++ b/repos/gems/run/cpu_load_display.run @@ -25,15 +25,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -45,7 +43,6 @@ install_config { </start> <start name="nitpicker"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -61,15 +58,13 @@ install_config { </start> <start name="pointer"> - <resource name="RAM" quantum="1M"/> <route> <service name="Gui"> <child name="nitpicker"/> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="report_rom"> - <resource name="RAM" quantum="4M"/> + <start name="report_rom" ram="4M"> <provides> <service name="Report"/> <service name="ROM"/> @@ -80,8 +75,7 @@ install_config { </config> </start> - <start name="trace_subject_reporter" > - <resource name="RAM" quantum="6M"/> + <start name="trace_subject_reporter" ram="6M"> <config period_ms="500"> <report activity="yes" affinity="yes"/> </config> @@ -92,16 +86,14 @@ install_config { </route> </start> - <start name="cpu_load_display"> - <resource name="RAM" quantum="6M"/> + <start name="cpu_load_display" ram="6M"> <route> <service name="ROM" label="trace_subjects"> <child name="report_rom"/> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="cpu_burner1.config"> @@ -129,7 +121,6 @@ install_config { <start name="cpu_burner.1"> <binary name="cpu_burner"/> - <resource name="RAM" quantum="1M"/> <route> <service name="ROM" label="config"> <child name="dynamic_rom" label="cpu_burner1.config"/> </service> @@ -139,7 +130,6 @@ install_config { <start name="cpu_burner.2"> <binary name="cpu_burner"/> - <resource name="RAM" quantum="1M"/> <route> <service name="ROM" label="config"> <child name="dynamic_rom" label="cpu_burner2.config"/> </service> diff --git a/repos/gems/run/cpu_sampler.run b/repos/gems/run/cpu_sampler.run index 31ada1f0c9..c94c4956ea 100644 --- a/repos/gems/run/cpu_sampler.run +++ b/repos/gems/run/cpu_sampler.run @@ -34,15 +34,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="cpu_sampler"> - <resource name="RAM" quantum="4M"/> + <start name="cpu_sampler" ram="4M"> <provides> <service name="CPU"/> </provides> @@ -51,7 +49,6 @@ install_config { </config> </start> <start name="test-cpu_sampler"> - <resource name="RAM" quantum="1M"/> <config ld_verbose="yes"/> <route> <service name="CPU"> <child name="cpu_sampler"/> </service> diff --git a/repos/gems/run/decorator.run b/repos/gems/run/decorator.run index 6f3025733e..5200bc015d 100644 --- a/repos/gems/run/decorator.run +++ b/repos/gems/run/decorator.run @@ -27,15 +27,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -46,8 +44,7 @@ install_config { </route> </start> - <start name="report_rom"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M"> <provides> <service name="ROM" /> <service name="Report" /> </provides> <config> @@ -56,7 +53,6 @@ install_config { </start> <start name="nitpicker"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -68,8 +64,7 @@ install_config { </config> </start> - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="window_layout"> @@ -173,8 +168,7 @@ install_config { </config> </start> - <start name="decorator"> - <resource name="RAM" quantum="8M"/> + <start name="decorator" ram="8M"> <route> <service name="ROM" label="pointer"> <child name="report_rom" /> diff --git a/repos/gems/run/decorator_stress.run b/repos/gems/run/decorator_stress.run index 76675c72bd..8c473312c1 100644 --- a/repos/gems/run/decorator_stress.run +++ b/repos/gems/run/decorator_stress.run @@ -29,15 +29,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -49,7 +47,6 @@ install_config { </start> <start name="nitpicker" caps="200"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -65,8 +62,7 @@ install_config { </route> </start> - <start name="report_rom"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M"> <provides> <service name="ROM" /> <service name="Report" /> </provides> <config> @@ -77,16 +73,14 @@ install_config { </config> </start> - <start name="test-decorator_stress"> - <resource name="RAM" quantum="2M"/> + <start name="test-decorator_stress" ram="2M"> <route> <service name="Report"> <child name="report_rom"/> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="decorator" caps="200"> - <resource name="RAM" quantum="8M"/> + <start name="decorator" caps="200" ram="8M"> <config> <default-policy/> </config> diff --git a/repos/gems/run/depot_autopilot.run b/repos/gems/run/depot_autopilot.run index 58e8ee3b5f..034c0889ee 100644 --- a/repos/gems/run/depot_autopilot.run +++ b/repos/gems/run/depot_autopilot.run @@ -312,16 +312,14 @@ proc prepare_to_run_genode { } { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer" priority="0"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="report_rom" priority="-1"> + <start name="report_rom" priority="-1" ram="2M"> <binary name="report_rom"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="no"> <policy label="depot_autopilot -> blueprint" report="depot_query -> blueprint"/> @@ -330,8 +328,7 @@ proc prepare_to_run_genode { } { </config> </start> - <start name="vfs" priority="-1"> - <resource name="RAM" quantum="16M"/> + <start name="vfs" priority="-1" ram="16M"> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -345,13 +342,11 @@ proc prepare_to_run_genode { } { </config> </start> - <start name="fs_rom" priority="-1" caps="300"> - <resource name="RAM" quantum="32M"/> + <start name="fs_rom" priority="-1" caps="300" ram="32M"> <provides> <service name="ROM"/> </provides> </start> - <start name="depot_query" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="depot_query" priority="-1" ram="2M"> <config query="rom"> <vfs> <dir name="depot"> <fs label="depot"/> </dir> </vfs> </config> @@ -361,8 +356,7 @@ proc prepare_to_run_genode { } { </route> </start> - <start name="depot_autopilot" priority="-1"> - <resource name="RAM" quantum="8M"/> + <start name="depot_autopilot" priority="-1" ram="8M"> <provides> <service name="LOG"/> </provides> <config repeat="} $test_repeat {" arch="} [depot_spec] {" children_label_prefix="dynamic -> "> <static> @@ -414,8 +408,7 @@ proc prepare_to_run_genode { } { </route> </start> - <start name="dynamic" caps="8000" priority="-1"> - <resource name="RAM" quantum="286M"/> + <start name="dynamic" caps="8000" ram="286M" priority="-1"> <binary name="init"/> <route> diff --git a/repos/gems/run/depot_deploy.run b/repos/gems/run/depot_deploy.run index 97c2fc6b6e..0ab676e32d 100644 --- a/repos/gems/run/depot_deploy.run +++ b/repos/gems/run/depot_deploy.run @@ -41,15 +41,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -60,8 +58,7 @@ install_config { </route> </start> - <start name="nitpicker"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" ram="4M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -77,7 +74,6 @@ install_config { </start> <start name="pointer"> - <resource name="RAM" quantum="1M"/> <route> <service name="Gui"> <child name="nitpicker" /> </service> <any-service> <parent/> <any-child/> </any-service> @@ -86,7 +82,6 @@ install_config { <start name="report_rom"> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="no"> <policy label="depot_deploy -> blueprint" report="depot_query -> blueprint"/> @@ -96,8 +91,7 @@ install_config { </config> </start> - <start name="vfs"> - <resource name="RAM" quantum="4M"/> + <start name="vfs" ram="4M"> <provides> <service name="File_system"/> </provides> <config> <vfs> <tar name="depot.tar"/> </vfs> @@ -106,8 +100,7 @@ install_config { </config> </start> - <start name="fs_rom"> - <resource name="RAM" quantum="50M"/> + <start name="fs_rom" ram="50M"> <provides> <service name="ROM"/> </provides> <route> <service name="File_system"> <child name="vfs"/> </service> @@ -115,8 +108,7 @@ install_config { </route> </start> - <start name="depot_query"> - <resource name="RAM" quantum="2M"/> + <start name="depot_query" ram="2M"> <config query="rom"> <vfs> <dir name="depot"> <fs label="depot"/> </dir> </vfs> </config> @@ -127,8 +119,7 @@ install_config { </route> </start> - <start name="ram_fs"> - <resource name="RAM" quantum="8M"/> + <start name="ram_fs" ram="8M"> <binary name="vfs"/> <provides> <service name="File_system"/> </provides> <config> @@ -138,7 +129,6 @@ install_config { </start> <start name="depot_deploy"> - <resource name="RAM" quantum="1M"/> <config arch="} [depot_spec] {"> <static> <parent-provides> @@ -248,8 +238,7 @@ install_config { </route> </start> - <start name="dynamic" caps="8000"> - <resource name="RAM" quantum="180M"/> + <start name="dynamic" caps="8000" ram="180M"> <binary name="init"/> <route> <service name="ROM" label_last="ld.lib.so"> <parent/> </service> diff --git a/repos/gems/run/depot_download.run b/repos/gems/run/depot_download.run index 24bf521b42..b0b55d70dc 100644 --- a/repos/gems/run/depot_download.run +++ b/repos/gems/run/depot_download.run @@ -48,7 +48,7 @@ set config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/>} + <default caps="100" ram="1M"/>} proc depot_user_download { user } { return [exec cat [select_from_repositories sculpt/depot/$user/download]] } @@ -58,12 +58,10 @@ proc depot_user_pubkey { user } { append config { <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="drivers" caps="1200" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1200" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -73,8 +71,7 @@ append config { </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -106,8 +103,7 @@ append config { </config> </start> - <start name="vfs"> - <resource name="RAM" quantum="20M"/> + <start name="vfs" ram="20M"> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -126,15 +122,13 @@ append config { </start> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"> </config> </start> - <start name="depot_download" caps="2000"> + <start name="depot_download" caps="2000" ram="70M"> <binary name="init"/> - <resource name="RAM" quantum="70M"/> <route> <service name="ROM" label="config"> <parent label="depot_download.config"/> </service> diff --git a/repos/gems/run/depot_query.run b/repos/gems/run/depot_query.run index 7a20e20085..de0144e677 100644 --- a/repos/gems/run/depot_query.run +++ b/repos/gems/run/depot_query.run @@ -30,16 +30,14 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> <start name="report_rom"> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"> <policy label="depot_deploy -> blueprint" report="depot_query -> blueprint"/> @@ -48,8 +46,7 @@ install_config { </config> </start> - <start name="vfs"> - <resource name="RAM" quantum="4M"/> + <start name="vfs" ram="4M"> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -76,13 +73,11 @@ install_config { </config> </start> - <start name="fs_rom"> - <resource name="RAM" quantum="4M"/> + <start name="fs_rom" ram="4M"> <provides> <service name="ROM"/> </provides> </start> - <start name="depot_query"> - <resource name="RAM" quantum="2M"/> + <start name="depot_query" ram="2M"> <config query="rom"> <vfs> <dir name="depot"> <fs label="depot"/> </dir> </vfs> </config> @@ -93,7 +88,6 @@ install_config { </start> <start name="depot_deploy"> - <resource name="RAM" quantum="1M"/> <config arch="} [depot_spec] {"> <static> <parent-provides> @@ -121,8 +115,7 @@ install_config { </route> </start> - <start name="dynamic" caps="8000"> - <resource name="RAM" quantum="64M"/> + <start name="dynamic" caps="8000" ram="64M"> <binary name="init"/> <route> <service name="ROM" label_last="ld.lib.so"> <parent/> </service> diff --git a/repos/gems/run/depot_remove.run b/repos/gems/run/depot_remove.run index 7f53945b1e..76695f0917 100644 --- a/repos/gems/run/depot_remove.run +++ b/repos/gems/run/depot_remove.run @@ -42,29 +42,25 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="report_rom"> - <resource name="RAM" quantum="100M"/> + <start name="report_rom" ram="100M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> </start> - <start name="lx_fs" ld="no"> - <resource name="RAM" quantum="100M"/> + <start name="lx_fs" ld="no" ram="100M"> <provides> <service name="File_system"/> </provides> <config> <policy label="depot_remove -> " root="/depot" writeable="yes"/> </config> </start> - <start name="depot_remove"> - <resource name="RAM" quantum="2M"/> + <start name="depot_remove" ram="2M"> <route> <service name="ROM" label="config"> <parent label="depot_remove_config"/> </service> <service name="File_system"> <child name="lx_fs"/> </service> diff --git a/repos/gems/run/dialog.run b/repos/gems/run/dialog.run index 07c4e7797e..d60126f175 100644 --- a/repos/gems/run/dialog.run +++ b/repos/gems/run/dialog.run @@ -25,19 +25,17 @@ install_config { <service name="IO_PORT"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -49,7 +47,6 @@ install_config { </start> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"> <policy label="text_area.1 -> hover" report="nitpicker -> hover"/> @@ -57,8 +54,7 @@ install_config { </config> </start> - <start name="nitpicker"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" ram="4M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -77,15 +73,13 @@ install_config { </start> <start name="pointer"> - <resource name="RAM" quantum="1M"/> <route> <service name="Gui"> <child name="nitpicker" /> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="fonts_fs" caps="300"> - <resource name="RAM" quantum="8M"/> + <start name="fonts_fs" caps="300" ram="8M"> <binary name="vfs"/> <route> <service name="ROM" label="config"> <parent label="fonts_fs.config"/> </service> @@ -94,8 +88,7 @@ install_config { <provides> <service name="File_system"/> </provides> </start> - <start name="test-dialog" caps="1000"> - <resource name="RAM" quantum="8M"/> + <start name="test-dialog" caps="1000" ram="8M"> <config/> <route> <service name="ROM" label="hover"> <child name="report_rom"/> </service> diff --git a/repos/gems/run/file_vault.run b/repos/gems/run/file_vault.run index 969f9b271e..ec3016d368 100644 --- a/repos/gems/run/file_vault.run +++ b/repos/gems/run/file_vault.run @@ -55,8 +55,7 @@ append config { <service name="IO_PORT"/> </parent-provides> - <start name="timer" caps="200"> - <resource name="RAM" quantum="1M"/> + <start name="timer" caps="200" ram="1M"> <resource name="CPU" quantum="5"/> <provides> <service name="Timer"/> </provides> <route> @@ -69,8 +68,7 @@ append config { </route> </start> - <start name="dynamic_rom" caps="100"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" caps="100" ram="4M"> <provides><service name="ROM"/> </provides> <config verbose="yes"> <rom name="file_vault_ui_config"> @@ -97,8 +95,7 @@ append config { </route> </start> - <start name="report_rom" caps="70"> - <resource name="RAM" quantum="1M"/> + <start name="report_rom" caps="70" ram="1M"> <provides> <service name="ROM" /> <service name="Report" /> @@ -114,9 +111,8 @@ append config { append_if [have_board linux] config { - <start name="data_fs" caps="200" ld="no"> + <start name="data_fs" caps="200" ram="4M" ld="no"> <binary name="lx_fs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> @@ -132,9 +128,8 @@ append_if [have_board linux] config { </route> </start> - <start name="trust_anchor_fs" caps="200" ld="no"> + <start name="trust_anchor_fs" caps="200" ram="4M" ld="no"> <binary name="lx_fs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> @@ -152,9 +147,8 @@ append_if [have_board linux] config { append_if [expr ![have_board linux]] config { - <start name="data_fs" caps="2000"> + <start name="data_fs" caps="2000" ram="200M"> <binary name="vfs"/> - <resource name="RAM" quantum="200M"/> <provides><service name="File_system"/></provides> <config> <vfs> @@ -172,9 +166,8 @@ append_if [expr ![have_board linux]] config { </route> </start> - <start name="trust_anchor_fs" caps="100"> + <start name="trust_anchor_fs" caps="100" ram="5M"> <binary name="vfs"/> - <resource name="RAM" quantum="5M"/> <provides><service name="File_system"/></provides> <config> <vfs> @@ -194,8 +187,7 @@ append_if [expr ![have_board linux]] config { append config { - <start name="file_vault" caps="1000"> - <resource name="RAM" quantum="80M"/> + <start name="file_vault" caps="1000" ram="80M"> <config jitterentropy_available="} [jent_avail_attr] {"> <vfs> <dir name="tresor"> diff --git a/repos/gems/run/file_vault_client.run b/repos/gems/run/file_vault_client.run index f3991a24bf..be0288ac54 100644 --- a/repos/gems/run/file_vault_client.run +++ b/repos/gems/run/file_vault_client.run @@ -93,8 +93,7 @@ append config { <service name="IO_PORT"/> </parent-provides> - <start name="timer" caps="200"> - <resource name="RAM" quantum="1M"/> + <start name="timer" caps="200" ram="1M"> <provides> <service name="Timer"/> </provides> <route> <service name="PD"> <parent/> </service> @@ -107,8 +106,7 @@ append config { </route> </start> - <start name="dynamic_rom" caps="100"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" caps="100" ram="4M"> <provides><service name="ROM"/> </provides> <config verbose="yes"> <rom name="file_vault_ui_config"> @@ -148,8 +146,7 @@ append config { <service name="File_system"/> </parent-provides> - <start name="log_terminal" caps="110"> - <resource name="RAM" quantum="2M"/> + <start name="log_terminal" caps="110" ram="2M"> <provides><service name="Terminal"/></provides> <route> <service name="LOG"> <parent/> </service> @@ -159,8 +156,7 @@ append config { </route> </start> - <start name="vfs" caps="120"> - <resource name="RAM" quantum="30M"/> + <start name="vfs" caps="120" ram="30M"> <provides><service name="File_system"/></provides> <config> <vfs> @@ -189,8 +185,7 @@ append config { </route> </start> - <start name="fs_rom" caps="100"> - <resource name="RAM" quantum="8M"/> + <start name="fs_rom" caps="100" ram="8M"> <provides> <service name="ROM"/> </provides> <config/> <route> @@ -202,8 +197,7 @@ append config { </route> </start> - <start name="bash" caps="500"> - <resource name="RAM" quantum="32M"/> + <start name="bash" caps="500" ram="32M"> <binary name="/bin/bash"/> <config> <libc stdin="/dev/terminal" stdout="/dev/terminal" @@ -251,8 +245,7 @@ append config { </route> </start> - <start name="report_rom" caps="70"> - <resource name="RAM" quantum="1M"/> + <start name="report_rom" caps="70" ram="1M"> <provides> <service name="ROM" /> <service name="Report" /> @@ -270,9 +263,8 @@ if {[have_board linux]} { append config { - <start name="data_fs" caps="200" ld="no"> + <start name="data_fs" caps="200" ram="4M" ld="no"> <binary name="lx_fs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> @@ -290,9 +282,8 @@ if {[have_board linux]} { </route> </start> - <start name="trust_anchor_fs" caps="200" ld="no"> + <start name="trust_anchor_fs" caps="200" ram="4M" ld="no"> <binary name="lx_fs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> @@ -315,9 +306,8 @@ if {[have_board linux]} { append config { - <start name="data_fs" caps="100"> + <start name="data_fs" caps="100" ram="10M"> <binary name="vfs"/> - <resource name="RAM" quantum="10M"/> <provides><service name="File_system"/></provides> <config> <vfs> @@ -335,9 +325,8 @@ if {[have_board linux]} { </route> </start> - <start name="trust_anchor_fs" caps="100"> + <start name="trust_anchor_fs" caps="100" ram="4M"> <binary name="vfs"/> - <resource name="RAM" quantum="4M"/> <provides><service name="File_system"/></provides> <config> <vfs> @@ -358,8 +347,7 @@ if {[have_board linux]} { } append config { - <start name="file_vault" caps="1000"> - <resource name="RAM" quantum="80M"/> + <start name="file_vault" caps="1000" ram="80M"> <provides> <service name="File_system"/> </provides> @@ -389,8 +377,7 @@ append config { </route> </start> - <start name="dynamic_init" caps="1000"> - <resource name="RAM" quantum="100M"/> + <start name="dynamic_init" caps="1000" ram="100M"> <binary name="init"/> <route> <service name="ROM" label="config"> <child label="dynamic_init_config" name="dynamic_rom"/> </service> diff --git a/repos/gems/run/file_vault_gui.run b/repos/gems/run/file_vault_gui.run index e33b00605f..0000d018b2 100644 --- a/repos/gems/run/file_vault_gui.run +++ b/repos/gems/run/file_vault_gui.run @@ -57,8 +57,7 @@ append config { <service name="IO_PORT"/> </parent-provides> - <start name="timer" caps="200"> - <resource name="RAM" quantum="1M"/> + <start name="timer" caps="200" ram="1M"> <resource name="CPU" quantum="5"/> <provides> <service name="Timer"/> </provides> <route> @@ -71,8 +70,7 @@ append config { </route> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="Timer"> <child name="timer"/> </service> @@ -90,8 +88,7 @@ append config { </route> </start> - <start name="nitpicker" caps="100"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" caps="100" ram="4M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -114,8 +111,7 @@ append config { </route> </start> - <start name="pointer" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="pointer" caps="100" ram="1M"> <route> <service name="Gui"> <child name="nitpicker" /> </service> <service name="PD"> <parent/> </service> @@ -125,9 +121,8 @@ append config { </route> </start> - <start name="fonts_fs" caps="150"> + <start name="fonts_fs" caps="150" ram="4M"> <binary name="vfs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> @@ -164,9 +159,8 @@ append config { append_if [have_board linux] config { - <start name="data_fs" caps="200" ld="no"> + <start name="data_fs" caps="200" ram="4M" ld="no"> <binary name="lx_fs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> @@ -182,9 +176,8 @@ append_if [have_board linux] config { </route> </start> - <start name="trust_anchor_fs" caps="200" ld="no"> + <start name="trust_anchor_fs" caps="200" ram="4M" ld="no"> <binary name="lx_fs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> @@ -202,9 +195,8 @@ append_if [have_board linux] config { append_if [expr ![have_board linux]] config { - <start name="data_fs" caps="2000"> + <start name="data_fs" caps="2000" ram="200M"> <binary name="vfs"/> - <resource name="RAM" quantum="200M"/> <provides><service name="File_system"/></provides> <config> <vfs> <dir name="data"> <ram/> </dir> </vfs> @@ -218,9 +210,8 @@ append_if [expr ![have_board linux]] config { </route> </start> - <start name="trust_anchor_fs" caps="100"> + <start name="trust_anchor_fs" caps="100" ram="5M"> <binary name="vfs"/> - <resource name="RAM" quantum="5M"/> <provides><service name="File_system"/></provides> <config> <vfs> <dir name="trust_anchor"> <ram/> </dir> </vfs> @@ -236,8 +227,7 @@ append_if [expr ![have_board linux]] config { append config { - <start name="report_rom" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="report_rom" caps="100" ram="1M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"> <policy label="file_vault_gui -> ui_report" report="file_vault -> ui_report"/> @@ -251,8 +241,7 @@ append config { </route> </start> - <start name="file_vault" caps="1200"> - <resource name="RAM" quantum="100M"/> + <start name="file_vault" caps="1200" ram="100M"> <config jitterentropy_available="} [jent_avail_attr] {"> <vfs> <dir name="tresor"> <fs label="tresor"/> </dir> </vfs> </config> @@ -274,8 +263,7 @@ append config { </route> </start> - <start name="file_vault_gui" caps="400"> - <resource name="RAM" quantum="8M"/> + <start name="file_vault_gui" caps="400" ram="8M"> <route> <service name="File_system" label_last="fonts"> <child name="fonts_fs"/> </service> <service name="Gui"> <child name="nitpicker"/> </service> diff --git a/repos/gems/run/fs_query.run b/repos/gems/run/fs_query.run index 7116c586ab..8cf48b954f 100644 --- a/repos/gems/run/fs_query.run +++ b/repos/gems/run/fs_query.run @@ -32,28 +32,24 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> </start> <start name="report_rom_empty_vfs"> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> </start> - <start name="vfs"> - <resource name="RAM" quantum="10M"/> + <start name="vfs" ram="10M"> <provides><service name="File_system"/></provides> <config> <vfs> @@ -73,8 +69,7 @@ install_config { </config> </start> - <start name="vfs_rom"> - <resource name="RAM" quantum="10M"/> + <start name="vfs_rom" ram="10M"> <binary name="fs_rom"/> <provides> <service name="ROM"/> </provides> <config/> @@ -84,9 +79,8 @@ install_config { </route> </start> - <start name="fs_query_empty_vfs" caps="120"> + <start name="fs_query_empty_vfs" caps="120" ram="2M"> <binary name="fs_query"/> - <resource name="RAM" quantum="2M"/> <config> <vfs/> <query path="/non_existent_1"/> @@ -101,8 +95,7 @@ install_config { </route> </start> - <start name="fs_query" caps="120"> - <resource name="RAM" quantum="2M"/> + <start name="fs_query" caps="120" ram="2M"> <config> <vfs> <dir name="empty"/> @@ -121,9 +114,8 @@ install_config { </route> </start> - <start name="test" caps="700"> + <start name="test" caps="700" ram="20M"> <binary name="sequence"/> - <resource name="RAM" quantum="20M"/> <config> <start name="/bin/sleep" caps="500"> <config> diff --git a/repos/gems/run/gpt_write.run b/repos/gems/run/gpt_write.run index 3993a4ba9a..8b7e8755d9 100644 --- a/repos/gems/run/gpt_write.run +++ b/repos/gems/run/gpt_write.run @@ -29,18 +29,15 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="lx_block" ld="no"> - <resource name="RAM" quantum="2M"/> + <start name="lx_block" ld="no" ram="2M"> <provides> <service name="Block"/> </provides> <config file="gpt.img" block_size="512" writeable="yes"/> </start> - <start name="gpt_write"> - <resource name="RAM" quantum="2M"/> + <start name="gpt_write" ram="2M"> <config verbose="yes" initialize="yes" align="4K"> <actions> <add entry="1" type="BIOS" label="GRUB BIOS" start="2048" size="1M"/> diff --git a/repos/gems/run/gui_fader.run b/repos/gems/run/gui_fader.run index b8912ee71f..0a40a09429 100644 --- a/repos/gems/run/gui_fader.run +++ b/repos/gems/run/gui_fader.run @@ -20,19 +20,17 @@ install_config { <service name="IO_PORT"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -44,7 +42,6 @@ install_config { </start> <start name="nitpicker"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -60,15 +57,13 @@ install_config { </start> <start name="pointer"> - <resource name="RAM" quantum="1M"/> <route> <service name="Gui"> <child name="nitpicker" /> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="gui_fader.config"> @@ -93,8 +88,7 @@ install_config { </config> </start> - <start name="gui_fader"> - <resource name="RAM" quantum="8M"/> + <start name="gui_fader" ram="8M"> <provides><service name="Gui"/></provides> <route> <service name="ROM" label="config"> @@ -105,17 +99,15 @@ install_config { </route> </start> - <start name="scout"> - <resource name="RAM" quantum="16M"/> + <start name="scout" ram="16M"> <route> <service name="Gui"> <child name="gui_fader" /> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="scout2"> + <start name="scout2" ram="16M"> <binary name="scout" /> - <resource name="RAM" quantum="16M"/> <route> <service name="Gui"> <child name="nitpicker" /> </service> <any-service> <parent/> <any-child/> </any-service> diff --git a/repos/gems/run/menu_view.run b/repos/gems/run/menu_view.run index 553b73cc69..00e32527e6 100644 --- a/repos/gems/run/menu_view.run +++ b/repos/gems/run/menu_view.run @@ -24,19 +24,17 @@ install_config { <service name="IO_PORT"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -47,8 +45,7 @@ install_config { </route> </start> - <start name="nitpicker"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" ram="4M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -65,15 +62,13 @@ install_config { </start> <start name="pointer"> - <resource name="RAM" quantum="1M"/> <route> <service name="Gui"> <child name="nitpicker" /> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="fonts_fs_config_rom"> - <resource name="RAM" quantum="4M"/> + <start name="fonts_fs_config_rom" ram="4M"> <binary name="dynamic_rom"/> <provides> <service name="ROM"/> </provides> <config verbose="yes"> @@ -137,8 +132,7 @@ install_config { </config> </start> - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides> <service name="ROM"/> </provides> <config verbose="yes"> <rom name="dialog"> @@ -292,13 +286,11 @@ install_config { </start> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> </start> - <start name="fonts_fs" caps="300"> - <resource name="RAM" quantum="8M"/> + <start name="fonts_fs" caps="300" ram="8M"> <binary name="vfs"/> <route> <service name="ROM" label="config"> <child name="fonts_fs_config_rom"/> </service> @@ -307,8 +299,7 @@ install_config { <provides> <service name="File_system"/> </provides> </start> - <start name="menu_view" caps="200"> - <resource name="RAM" quantum="8M"/> + <start name="menu_view" caps="200" ram="8M"> <config> <report hover="yes"/> <libc stderr="/dev/log"/> diff --git a/repos/gems/run/mixer_gui_qt6_test.run b/repos/gems/run/mixer_gui_qt6_test.run index 62542e1225..c9cd78c2af 100644 --- a/repos/gems/run/mixer_gui_qt6_test.run +++ b/repos/gems/run/mixer_gui_qt6_test.run @@ -17,8 +17,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt6_start_nodes] { - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="channel_list"> @@ -52,8 +51,7 @@ install_config { </config> </start> - <start name="mixer_gui_qt" caps="200"> - <resource name="RAM" quantum="32M"/> + <start name="mixer_gui_qt" caps="200" ram="32M"> <config> <vfs> <dir name="dev"> diff --git a/repos/gems/run/mixer_gui_qt_test.run b/repos/gems/run/mixer_gui_qt_test.run index 2e4ea5c5d9..54a15a00d6 100644 --- a/repos/gems/run/mixer_gui_qt_test.run +++ b/repos/gems/run/mixer_gui_qt_test.run @@ -17,8 +17,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt5_start_nodes] { - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="channel_list"> @@ -52,8 +51,7 @@ install_config { </config> </start> - <start name="mixer_gui_qt" caps="200"> - <resource name="RAM" quantum="32M"/> + <start name="mixer_gui_qt" caps="200" ram="32M"> <config> <vfs> <dir name="dev"> diff --git a/repos/gems/run/nano3d.run b/repos/gems/run/nano3d.run index 34cc8c1412..d5fe09d263 100644 --- a/repos/gems/run/nano3d.run +++ b/repos/gems/run/nano3d.run @@ -24,10 +24,9 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -39,12 +38,10 @@ install_config { </start> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> <start name="nitpicker"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -59,8 +56,7 @@ install_config { </config> </start> - <start name="backdrop" caps="130"> - <resource name="RAM" quantum="20M"/> + <start name="backdrop" caps="130" ram="20M"> <config> <libc/> <vfs> @@ -77,8 +73,7 @@ install_config { </route> </start> - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="nano3d.config"> @@ -102,8 +97,7 @@ install_config { </config> </start> - <start name="nano3d"> - <resource name="RAM" quantum="8M"/> + <start name="nano3d" ram="8M"> <route> <service name="ROM" label="config"> <child name="dynamic_rom" label="nano3d.config"/> </service> diff --git a/repos/gems/run/screenshot_trigger.run b/repos/gems/run/screenshot_trigger.run index 3c1004d7e1..b6b5d68c1d 100644 --- a/repos/gems/run/screenshot_trigger.run +++ b/repos/gems/run/screenshot_trigger.run @@ -21,15 +21,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -41,13 +39,11 @@ install_config { </start> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> </start> - <start name="nitpicker"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" ram="4M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -64,15 +60,13 @@ install_config { </start> <start name="pointer"> - <resource name="RAM" quantum="1M"/> <route> <service name="Gui"> <child name="nitpicker"/> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="screenshot_trigger"> - <resource name="RAM" quantum="8M"/> + <start name="screenshot_trigger" ram="8M"> <binary name="screenshot_trigger"/> <config size="200"/> <route> diff --git a/repos/gems/run/sculpt.run b/repos/gems/run/sculpt.run index 94019ecdd8..742c99a057 100644 --- a/repos/gems/run/sculpt.run +++ b/repos/gems/run/sculpt.run @@ -244,7 +244,6 @@ proc log_core_start_node { } { return { <start name="log_core" priority="-1"> - <resource name="RAM" quantum="1M"/> <config period_ms="2000"/> <route> <service name="ROM" label="log"> <parent label="core_log"/> </service> @@ -263,7 +262,6 @@ proc log_kernel_start_node { } { return { <start name="log_kernel" priority="-1"> <binary name="log_core"/> - <resource name="RAM" quantum="1M"/> <config period_ms="2000"/> <route> <service name="ROM" label="log"> <parent label="kernel_log"/> </service> @@ -296,19 +294,17 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <resource name="RAM" preserve="2M"/> <start name="timer" priority="0"> - <resource name="RAM" quantum="1M"/> <resource name="CPU" quantum="5"/> <provides><service name="Timer"/></provides> </start> - <start name="report_rom" priority="-1"> + <start name="report_rom" priority="-1" ram="2M"> <binary name="report_rom"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="no"> <policy label="leitzentrale_config -> leitzentrale" @@ -339,14 +335,12 @@ install_config { <start name="report_logger" priority="-1"> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> </start> - <start name="config_fs" caps="200" priority="-1"> + <start name="config_fs" caps="200" ram="12M" priority="-1"> <binary name="vfs"/> - <resource name="RAM" quantum="12M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -358,9 +352,8 @@ install_config { </config> </start> - <start name="config_fs_rom" priority="-1"> + <start name="config_fs_rom" ram="10M" priority="-1"> <binary name="fs_rom"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="ROM"/> </provides> <route> <service name="File_system"> <child name="config_fs"/> </service> @@ -368,9 +361,8 @@ install_config { </route> </start> - <start name="report_fs_rom" priority="-1"> + <start name="report_fs_rom" ram="3M" priority="-1"> <binary name="fs_rom"/> - <resource name="RAM" quantum="3M"/> <provides> <service name="ROM"/> </provides> <route> <service name="File_system"> <child name="report_fs"/> </service> @@ -378,9 +370,8 @@ install_config { </route> </start> - <start name="report_fs" priority="-1"> + <start name="report_fs" ram="16M" priority="-1"> <binary name="vfs"/> - <resource name="RAM" quantum="16M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -402,9 +393,8 @@ install_config { </config> </start> - <start name="log_terminal" priority="-1"> + <start name="log_terminal" ram="2M" priority="-1"> <binary name="file_terminal"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Terminal"/> </provides> <config> <default-policy filename="log" /> @@ -419,7 +409,6 @@ install_config { <start name="log" priority="-1"> <binary name="terminal_log"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config/> <route> @@ -432,7 +421,6 @@ install_config { } [log_kernel_start_node] { <start name="fs_report" priority="-1"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> </provides> <config> <vfs> <fs/> </vfs> </config> <route> @@ -441,8 +429,7 @@ install_config { </route> </start> - <start name="drivers" caps="4850" priority="-1" managing_system="yes"> - <resource name="RAM" quantum="200M"/> + <start name="drivers" caps="4850" ram="200M" priority="-1" managing_system="yes"> <resource name="CPU" quantum="5"/> <binary name="init"/> <route> @@ -474,8 +461,7 @@ install_config { </provides> </start> - <start name="nitpicker" caps="1000" priority="-1"> - <resource name="RAM" quantum="18M"/> + <start name="nitpicker" caps="1000" ram="18M" priority="-1"> <resource name="CPU" quantum="10"/> <affinity xpos="1" width="1"/> <!-- decouple nitpicker from boot CPU --> <provides> @@ -499,7 +485,6 @@ install_config { <!-- toggle key mappings depending on the numlock state --> <start name="numlock_remap_rom" priority="-1"> <binary name="rom_filter"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="ROM"/> </provides> <route> <service name="ROM" label="config"> @@ -509,8 +494,7 @@ install_config { </route> </start> - <start name="event_filter" priority="-1" caps="120"> - <resource name="RAM" quantum="2M"/> + <start name="event_filter" caps="120" ram="2M" priority="-1"> <provides> <service name="Event"/> </provides> <route> <service name="ROM" label="config"> @@ -531,7 +515,6 @@ install_config { <!-- override user focus when leitzentrale is active --> <start name="nit_focus" priority="-1"> <binary name="rom_filter"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="ROM"/> </provides> <config> <input name="lockscreen_enabled" rom="hover" node="hover"> @@ -576,8 +559,7 @@ install_config { </route> </start> - <start name="pointer" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="pointer" ram="2M" priority="-1"> <provides> <service name="Report"/> </provides> <config shapes="yes"/> <route> @@ -589,7 +571,6 @@ install_config { </start> <start name="global_keys_handler" priority="-1"> - <resource name="RAM" quantum="1M"/> <route> <service name="Report"> <child name="report_rom"/> </service> <service name="Gui"> <child name="nitpicker"/> </service> @@ -602,7 +583,6 @@ install_config { <start name="leitzentrale_config" priority="-1"> <binary name="rom_filter"/> - <resource name="RAM" quantum="1M"/> <provides><service name="ROM"/></provides> <route> <service name="ROM" label="leitzentrale"> <child name="report_rom"/> </service> @@ -612,8 +592,7 @@ install_config { </route> </start> - <start name="clipboard" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="clipboard" ram="2M" priority="-1"> <provides> <service name="ROM"/> <service name="Report"/> </provides> @@ -625,9 +604,8 @@ install_config { </route> </start> - <start name="leitzentrale" caps="2400" priority="-1"> + <start name="leitzentrale" caps="2400" ram="203M" priority="-1"> <binary name="init"/> - <resource name="RAM" quantum="203M"/> <resource name="CPU" quantum="10"/> <affinity xpos="1" width="1"/> <!-- decouple leitzentrale from boot CPU --> <provides> @@ -669,17 +647,15 @@ install_config { </route> </start> - <start name="terminal_monitor" priority="-1"> + <start name="terminal_monitor" ram="2M" priority="-1"> <binary name="terminal_crosslink"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Terminal"/> </provides> </start> - <start name="runtime" caps="50000" priority="-1" managing_system="yes"> + <start name="runtime" caps="50000" ram="32G" priority="-1" managing_system="yes"> <binary name="monitor"/> - <resource name="RAM" quantum="32G"/> <resource name="CPU" quantum="70"/> <route> <service name="ROM" label="config"> diff --git a/repos/gems/run/tcp_terminal.run b/repos/gems/run/tcp_terminal.run index 8fcdaf5b4b..0988209cf9 100644 --- a/repos/gems/run/tcp_terminal.run +++ b/repos/gems/run/tcp_terminal.run @@ -40,13 +40,11 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="drivers" caps="1000" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1000" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -55,8 +53,7 @@ install_config { <any-service> <parent/> </any-service> </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -92,8 +89,7 @@ install_config { </config> </start> - <start name="tcp_terminal" caps="200"> - <resource name="RAM" quantum="8M"/> + <start name="tcp_terminal" caps="200" ram="8M"> <provides> <service name="Terminal"/> </provides> <config> <policy label_prefix="test-terminal_echo" port="8888"/> @@ -109,9 +105,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="test-terminal_echo"> - <resource name="RAM" quantum="1M"/> - </start> + <start name="test-terminal_echo"/> </config> } diff --git a/repos/gems/run/terminal_echo.run b/repos/gems/run/terminal_echo.run index 8e2f43aa1b..de3ae7740f 100644 --- a/repos/gems/run/terminal_echo.run +++ b/repos/gems/run/terminal_echo.run @@ -24,15 +24,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -43,8 +41,7 @@ install_config { </route> </start> - <start name="nitpicker"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" ram="4M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -55,8 +52,7 @@ install_config { </config> </start> - <start name="terminal" caps="110"> - <resource name="RAM" quantum="6M"/> + <start name="terminal" caps="110" ram="6M"> <provides><service name="Terminal"/></provides> <route> <service name="ROM" label="config"> <parent label="terminal.config"/> </service> @@ -65,9 +61,7 @@ install_config { </route> </start> - <start name="test-terminal_echo"> - <resource name="RAM" quantum="1M"/> - </start> + <start name="test-terminal_echo"/> </config> } diff --git a/repos/gems/run/terminal_log.run b/repos/gems/run/terminal_log.run index 1a6488abf9..561e8a02c6 100644 --- a/repos/gems/run/terminal_log.run +++ b/repos/gems/run/terminal_log.run @@ -27,15 +27,13 @@ install_config { <any-service><parent/></any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -46,8 +44,7 @@ install_config { </route> </start> - <start name="nitpicker"> - <resource name="RAM" quantum="2M"/> + <start name="nitpicker" ram="2M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -61,12 +58,9 @@ install_config { <route> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="pointer"> - <resource name="RAM" quantum="2M"/> - </start> + <start name="pointer" ram="2M"/> - <start name="terminal" caps="110"> - <resource name="RAM" quantum="6M"/> + <start name="terminal" caps="110" ram="6M"> <provides><service name="Terminal"/></provides> <route> <service name="ROM" label="config"> <parent label="terminal.config"/> </service> @@ -76,12 +70,10 @@ install_config { </start> <start name="terminal_log"> - <resource name="RAM" quantum="1M"/> <provides><service name="LOG"/></provides> </start> - <start name="launchpad" caps="2000"> - <resource name="RAM" quantum="32M"/> + <start name="launchpad" caps="2000" ram="32M"> <route> <service name="LOG"> <child name="terminal_log"/> </service> <any-service> <any-child/> <parent/></any-service> diff --git a/repos/gems/run/text_area.run b/repos/gems/run/text_area.run index d0573d5a94..26826070ca 100644 --- a/repos/gems/run/text_area.run +++ b/repos/gems/run/text_area.run @@ -24,19 +24,17 @@ install_config { <service name="IO_PORT"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -48,7 +46,6 @@ install_config { </start> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"> <policy label="text_area.1 -> hover" report="nitpicker -> hover"/> @@ -56,8 +53,7 @@ install_config { </config> </start> - <start name="nitpicker"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" ram="4M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -76,15 +72,13 @@ install_config { </start> <start name="pointer"> - <resource name="RAM" quantum="1M"/> <route> <service name="Gui"> <child name="nitpicker" /> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="fonts_fs" caps="300"> - <resource name="RAM" quantum="8M"/> + <start name="fonts_fs" caps="300" ram="8M"> <binary name="vfs"/> <route> <service name="ROM" label="config"> <parent label="fonts_fs.config"/> </service> @@ -93,8 +87,7 @@ install_config { <provides> <service name="File_system"/> </provides> </start> - <start name="data_fs" caps="300"> - <resource name="RAM" quantum="8M"/> + <start name="data_fs" caps="300" ram="8M"> <binary name="vfs"/> <config> <vfs> @@ -109,9 +102,8 @@ install_config { <provides> <service name="File_system"/> </provides> </start> - <start name="text_area.1" caps="250"> + <start name="text_area.1" caps="250" ram="8M"> <binary name="text_area"/> - <resource name="RAM" quantum="8M"/> <config path="/data/drivers.config" max_lines="20" min_width="500" min_height="300" watch="yes"> <vfs> <dir name="data"> <fs label="data"/> </dir> </vfs> </config> @@ -123,9 +115,8 @@ install_config { </route> </start> - <start name="text_area.2" caps="250"> + <start name="text_area.2" caps="250" ram="8M"> <binary name="text_area"/> - <resource name="RAM" quantum="8M"/> <config path="/data/drivers.config" copy="yes" paste="yes" max_lines="10" min_width="600"> <report saved="yes"/> diff --git a/repos/gems/run/text_painter.run b/repos/gems/run/text_painter.run index 87d6c24f12..a7cf63bd33 100644 --- a/repos/gems/run/text_painter.run +++ b/repos/gems/run/text_painter.run @@ -26,15 +26,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -45,8 +43,7 @@ install_config { </route> </start> - <start name="nitpicker"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" ram="4M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -59,8 +56,7 @@ install_config { <route> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="gui_fb"> - <resource name="RAM" quantum="4M"/> + <start name="gui_fb" ram="4M"> <provides> <service name="Framebuffer"/> <service name="Input"/> </provides> <config/> <route> @@ -69,9 +65,8 @@ install_config { </route> </start> - <start name="font_vfs"> + <start name="font_vfs" ram="4M"> <binary name="vfs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -84,8 +79,7 @@ install_config { </config> </start> - <start name="test-text_painter"> - <resource name="RAM" quantum="2M"/> + <start name="test-text_painter" ram="2M"> <config> <vfs> <dir name="fonts"> <fs/> </dir> </vfs> </config> diff --git a/repos/gems/run/tiled_wm.run b/repos/gems/run/tiled_wm.run index 45dc3813fd..6e63a19423 100644 --- a/repos/gems/run/tiled_wm.run +++ b/repos/gems/run/tiled_wm.run @@ -39,14 +39,13 @@ install_config { <config> <parent-provides>} [qt5_parent_provides] { </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route>} [qt5_start_nodes] { <start name="test_reports"> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="no"> <policy label="test-tiled_wm-panel -> apps" report="test-tiled_wm-manager -> apps"/> @@ -55,9 +54,8 @@ install_config { <policy label="test-tiled_wm-manager -> overlay_request" report="test-tiled_wm-panel -> overlay_request"/> </config> </start> - <start name="wifi_reports"> + <start name="wifi_reports" ram="4M"> <binary name="dynamic_rom"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="ROM"/> </provides> <config verbose="no"> <rom name="accesspoints"> @@ -92,8 +90,7 @@ install_config { </config> </start> - <start name="test-tiled_wm-manager" caps="120"> - <resource name="RAM" quantum="8M"/> + <start name="test-tiled_wm-manager" caps="120" ram="8M"> <route> <service name="ROM" label="content_request"> <child name="test_reports" /> </service> <service name="ROM" label="overlay_request"> <child name="test_reports" /> </service> @@ -102,8 +99,7 @@ install_config { <any-service> <parent /> <any-child/> </any-service> </route> </start> - <start name="test-tiled_wm-panel" caps="250"> - <resource name="RAM" quantum="32M"/> + <start name="test-tiled_wm-panel" caps="250" ram="32M"> <config> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> @@ -128,8 +124,7 @@ install_config { <any-service> <parent /> <any-child/> </any-service> </route> </start> - <start name="test-tiled_wm-overlay" caps="250"> - <resource name="RAM" quantum="32M"/> + <start name="test-tiled_wm-overlay" caps="250" ram="32M"> <config> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> @@ -150,9 +145,8 @@ install_config { <any-service> <parent /> <any-child/> </any-service> </route> </start> - <start name="test-tiled_wm-app-1" caps="250"> + <start name="test-tiled_wm-app-1" caps="250" ram="32M"> <binary name="test-tiled_wm-app"/> - <resource name="RAM" quantum="32M"/> <config name="app1"> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> @@ -173,9 +167,8 @@ install_config { <any-service> <parent /> <any-child/> </any-service> </route> </start> - <start name="test-tiled_wm-app-2" caps="250"> + <start name="test-tiled_wm-app-2" caps="250" ram="32M"> <binary name="test-tiled_wm-app"/> - <resource name="RAM" quantum="32M"/> <config name="app2"> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> @@ -196,8 +189,7 @@ install_config { <any-service> <parent /> <any-child/> </any-service> </route> </start> - <start name="textedit" caps="350"> - <resource name="RAM" quantum="70M"/> + <start name="textedit" caps="350" ram="70M"> <config> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> diff --git a/repos/gems/run/tiled_wm_qt6.run b/repos/gems/run/tiled_wm_qt6.run index 2b2cfc589f..25ca9e81ca 100644 --- a/repos/gems/run/tiled_wm_qt6.run +++ b/repos/gems/run/tiled_wm_qt6.run @@ -37,14 +37,13 @@ install_config { <config> <parent-provides>} [qt6_parent_provides] { </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route>} [qt6_start_nodes] { <start name="test_reports"> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="no"> <policy label="test-tiled_wm-panel -> apps" report="test-tiled_wm-manager -> apps"/> @@ -53,9 +52,8 @@ install_config { <policy label="test-tiled_wm-manager -> overlay_request" report="test-tiled_wm-panel -> overlay_request"/> </config> </start> - <start name="wifi_reports"> + <start name="wifi_reports" ram="4M"> <binary name="dynamic_rom"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="ROM"/> </provides> <config verbose="no"> <rom name="accesspoints"> @@ -90,8 +88,7 @@ install_config { </config> </start> - <start name="test-tiled_wm-manager" caps="120"> - <resource name="RAM" quantum="8M"/> + <start name="test-tiled_wm-manager" caps="120" ram="8M"> <route> <service name="ROM" label="content_request"> <child name="test_reports" /> </service> <service name="ROM" label="overlay_request"> <child name="test_reports" /> </service> @@ -100,8 +97,7 @@ install_config { <any-service> <parent /> <any-child/> </any-service> </route> </start> - <start name="test-tiled_wm-panel" caps="250"> - <resource name="RAM" quantum="32M"/> + <start name="test-tiled_wm-panel" caps="250" ram="32M"> <config> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> @@ -126,8 +122,7 @@ install_config { <any-service> <parent /> <any-child/> </any-service> </route> </start> - <start name="test-tiled_wm-overlay" caps="250"> - <resource name="RAM" quantum="32M"/> + <start name="test-tiled_wm-overlay" caps="250" ram="32M"> <config> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> @@ -148,9 +143,8 @@ install_config { <any-service> <parent /> <any-child/> </any-service> </route> </start> - <start name="test-tiled_wm-app-1" caps="250"> + <start name="test-tiled_wm-app-1" caps="250" ram="32M"> <binary name="test-tiled_wm-app"/> - <resource name="RAM" quantum="32M"/> <config name="app1"> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> @@ -171,9 +165,8 @@ install_config { <any-service> <parent /> <any-child/> </any-service> </route> </start> - <start name="test-tiled_wm-app-2" caps="250"> + <start name="test-tiled_wm-app-2" caps="250" ram="32M"> <binary name="test-tiled_wm-app"/> - <resource name="RAM" quantum="32M"/> <config name="app2"> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> @@ -194,8 +187,7 @@ install_config { <any-service> <parent /> <any-child/> </any-service> </route> </start> - <start name="textedit" caps="350"> - <resource name="RAM" quantum="70M"/> + <start name="textedit" caps="350" ram="70M"> <config> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> diff --git a/repos/gems/run/trace_recorder.run b/repos/gems/run/trace_recorder.run index 78b463ddf4..fcb8a6c589 100644 --- a/repos/gems/run/trace_recorder.run +++ b/repos/gems/run/trace_recorder.run @@ -63,20 +63,17 @@ install_config { <service name="File_system"> <child name="vfs"/> </service> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> <start name="linux_rtc" ld="no"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Rtc"/> </provides> </start> - <start name="lx_fs" ld="no"> - <resource name="RAM" quantum="4M"/> + <start name="lx_fs" ld="no" ram="4M"> <provides> <service name="File_system"/> </provides> <config> <default-policy root="/fs" writeable="yes"/> @@ -84,7 +81,6 @@ install_config { </start> <start name="nic_router"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -98,14 +94,12 @@ install_config { </config> </start> - <start name="ping"> - <resource name="RAM" quantum="10M"/> + <start name="ping" ram="10M"> <config dst_ip="10.0.4.1" period_sec="1" count="10" verbose="yes"/> </start> <!-- using dynamic_rom to delay enabling of trace_recorder --> <start name="dynamic_rom"> - <resource name="RAM" quantum="1M"/> <provides><service name="ROM"/></provides> <config> <rom name="config"> @@ -134,8 +128,7 @@ install_config { </config> </start> - <start name="trace_recorder" caps="200"> - <resource name="RAM" quantum="16M"/> + <start name="trace_recorder" caps="200" ram="16M"> <route> <service name="File_system"> <child name="lx_fs"/> </service> <service name="ROM" label="config"> <child name="dynamic_rom"/> </service> diff --git a/repos/gems/run/trace_recorder_ctf.run b/repos/gems/run/trace_recorder_ctf.run index f5d4515644..5d0225a942 100644 --- a/repos/gems/run/trace_recorder_ctf.run +++ b/repos/gems/run/trace_recorder_ctf.run @@ -48,15 +48,13 @@ install_config { <service name="File_system"> <child name="vfs"/> </service> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> <start name="dynamic_rom"> - <resource name="RAM" quantum="1M"/> <provides><service name="ROM"/></provides> <config> <rom name="test"> @@ -105,7 +103,6 @@ install_config { </start> <start name="rom_logger"> - <resource name="RAM" quantum="1M"/> <config rom="test"/> <route> <service name="ROM" label="test"> <child name="dynamic_rom"/> </service> @@ -114,12 +111,10 @@ install_config { </start> <start name="dummy_rtc"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Rtc"/> </provides> </start> - <start name="lx_fs" ld="no"> - <resource name="RAM" quantum="4M"/> + <start name="lx_fs" ld="no" ram="4M"> <provides> <service name="File_system"/> </provides> <config> <default-policy root="/fs" writeable="yes"/> @@ -127,7 +122,6 @@ install_config { </start> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> @@ -136,8 +130,7 @@ install_config { </config> </start> - <start name="trace_recorder" caps="200"> - <resource name="RAM" quantum="16M"/> + <start name="trace_recorder" caps="200" ram="16M"> <config period_ms="5000" enable="yes"> <vfs> <fs/> </vfs> <policy label_suffix="dynamic_rom" thread="dynamic_rom" policy="ctf0"> diff --git a/repos/gems/run/trace_recorder_pcapng.run b/repos/gems/run/trace_recorder_pcapng.run index 6500f2424c..17412a87bd 100644 --- a/repos/gems/run/trace_recorder_pcapng.run +++ b/repos/gems/run/trace_recorder_pcapng.run @@ -47,20 +47,17 @@ install_config { <service name="File_system"> <child name="vfs"/> </service> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> <start name="linux_rtc" ld="no"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Rtc"/> </provides> </start> - <start name="lx_fs" ld="no"> - <resource name="RAM" quantum="4M"/> + <start name="lx_fs" ld="no" ram="4M"> <provides> <service name="File_system"/> </provides> <config> <default-policy root="/fs" writeable="yes"/> @@ -68,7 +65,6 @@ install_config { </start> <start name="nic_router"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -82,14 +78,12 @@ install_config { </config> </start> - <start name="ping"> - <resource name="RAM" quantum="10M"/> + <start name="ping" ram="10M"> <config dst_ip="10.0.4.1" period_sec="1" count="10" verbose="yes"/> </start> <!-- using dynamic_rom to delay enabling of trace_recorder --> <start name="dynamic_rom"> - <resource name="RAM" quantum="1M"/> <provides><service name="ROM"/></provides> <config> <rom name="config"> @@ -114,8 +108,7 @@ install_config { </config> </start> - <start name="trace_recorder" caps="200"> - <resource name="RAM" quantum="16M"/> + <start name="trace_recorder" caps="200" ram="16M"> <route> <service name="File_system"> <child name="lx_fs"/> </service> <service name="ROM" label="config"> <child name="dynamic_rom"/> </service> diff --git a/repos/gems/run/tresor_tester.run b/repos/gems/run/tresor_tester.run index 9984db8cd4..8d142c4700 100644 --- a/repos/gems/run/tresor_tester.run +++ b/repos/gems/run/tresor_tester.run @@ -64,8 +64,7 @@ append config { <service name="LOG"/> </parent-provides> - <start name="timer" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="timer" caps="100" ram="1M"> <provides><service name="Timer"/></provides> <route> <service name="PD"> <parent/> </service> @@ -78,8 +77,7 @@ append config { </route> </start> - <start name="report_rom" caps="100"> - <resource name="RAM" quantum="4M"/> + <start name="report_rom" caps="100" ram="4M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> <route> @@ -90,8 +88,7 @@ append config { </route> </start> - <start name="log_terminal" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="log_terminal" caps="100" ram="1M"> <provides><service name="Terminal"/></provides> <route> <service name="LOG"> <parent/> </service> @@ -103,9 +100,8 @@ append config { append_if [have_board linux] config { - <start name="block_io_fs" caps="100" ld="no"> + <start name="block_io_fs" caps="100" ram="4M" ld="no"> <binary name="lx_fs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> <config> <default-policy root="/" writeable="yes"/> @@ -120,9 +116,8 @@ append_if [have_board linux] config { append_if [expr ![have_board linux]] config { - <start name="block_io_fs" caps="400"> + <start name="block_io_fs" caps="400" ram="36M"> <binary name="vfs"/> - <resource name="RAM" quantum="36M"/> <provides><service name="File_system"/></provides> <config> <vfs> @@ -147,9 +142,8 @@ append_if [expr ![have_board linux]] config { append config { - <start name="trust_anchor_fs" caps="200"> + <start name="trust_anchor_fs" caps="200" ram="10M"> <binary name="vfs"/> - <resource name="RAM" quantum="10M"/> <provides><service name="File_system"/></provides> <config> <vfs> @@ -183,10 +177,9 @@ append config { </route> </start> - <start name="test" caps="200"> + <start name="test" caps="200" ram="10M"> <binary name="tresor_tester"/> - <resource name="RAM" quantum="10M"/> <config ld_verbose="yes"> <block-io type="vfs" path="/} [tresor_image_name] {"/> diff --git a/repos/gems/run/tresor_utils.run b/repos/gems/run/tresor_utils.run index ca2e517b2e..07b71440e7 100644 --- a/repos/gems/run/tresor_utils.run +++ b/repos/gems/run/tresor_utils.run @@ -20,8 +20,7 @@ append config { <service name="CPU"/> </parent-provides> - <start name="timer" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="timer" caps="100" ram="1M"> <provides><service name="Timer"/></provides> <route> <service name="PD"> <parent/> </service> @@ -31,8 +30,7 @@ append config { </route> </start> - <start name="lx_fs" ld="no" caps="100"> - <resource name="RAM" quantum="2M"/> + <start name="lx_fs" ld="no" caps="100" ram="2M"> <provides> <service name="File_system"/> </provides> <config> <default-policy root="/" writeable="yes"/> </config> <route> @@ -43,8 +41,7 @@ append config { </route> </start> - <start name="vfs" caps="120"> - <resource name="RAM" quantum="16M"/> + <start name="vfs" caps="120" ram="16M"> <provides><service name="File_system"/></provides> <config> <vfs> @@ -65,12 +62,10 @@ append config { </route> </start> - <start name="sequence" caps="200"> - <resource name="RAM" quantum="128M"/> + <start name="sequence" caps="200" ram="128M"> <config> - <start name="tresor_init_trust_anchor"> - <resource name="RAM" quantum="4M"/> + <start name="tresor_init_trust_anchor" ram="4M"> <config passphrase="foobar" trust_anchor_dir="/trust_anchor"> <vfs> <dir name="trust_anchor"> <fs label="ta"/> </dir> </vfs> </config> @@ -82,8 +77,7 @@ append config { </route> </start> - <start name="tresor_init"> - <resource name="RAM" quantum="4M"/> + <start name="tresor_init" ram="4M"> <config> <block-io type="vfs" path="/tresor.img"/> @@ -110,8 +104,7 @@ append config { </route> </start> - <start name="tresor_check" caps="100"> - <resource name="RAM" quantum="4M"/> + <start name="tresor_check" caps="100" ram="4M"> <config> <block-io type="vfs" path="/tresor.img"/> <crypto path="/crypto"/> diff --git a/repos/gems/run/vfs_import.run b/repos/gems/run/vfs_import.run index 48c2ec5891..54693f9047 100644 --- a/repos/gems/run/vfs_import.run +++ b/repos/gems/run/vfs_import.run @@ -31,15 +31,13 @@ install_config { <default-route> <any-service> <parent/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="vfs"> - <resource name="RAM" quantum="4M"/> + <start name="vfs" ram="4M"> <provides><service name="File_system"/></provides> <config> <vfs> @@ -50,8 +48,7 @@ install_config { </config> </start> - <start name="vfs_rom"> - <resource name="RAM" quantum="10M"/> + <start name="vfs_rom" ram="10M"> <binary name="fs_rom"/> <provides> <service name="ROM"/> </provides> <config/> @@ -61,9 +58,8 @@ install_config { </route> </start> - <start name="test" caps="500"> + <start name="test" caps="500" ram="1G"> <binary name="sequence"/> - <resource name="RAM" quantum="1G"/> <config> <start name="/bin/true" caps="500"> <config> diff --git a/repos/gems/run/vfs_tresor.run b/repos/gems/run/vfs_tresor.run index c1fbf12748..296a0d7fe4 100644 --- a/repos/gems/run/vfs_tresor.run +++ b/repos/gems/run/vfs_tresor.run @@ -62,32 +62,28 @@ append config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="log_terminal" caps="110"> - <resource name="RAM" quantum="2M"/> + <start name="log_terminal" caps="110" ram="2M"> <provides><service name="Terminal"/></provides> <route> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="lx_fs" ld="no"> - <resource name="RAM" quantum="4M"/> + <start name="lx_fs" ld="no" ram="4M"> <provides> <service name="File_system"/> </provides> <config> <default-policy root="/" writeable="yes"/> </config> </start> - <start name="vfs_tresor_trust_anchor" caps="120"> + <start name="vfs_tresor_trust_anchor" caps="120" ram="16M"> <binary name="vfs"/> - <resource name="RAM" quantum="16M"/> <provides><service name="File_system"/></provides> <config> <vfs> @@ -105,12 +101,10 @@ append config { </route> </start> - <start name="sequence" caps="3000"> - <resource name="RAM" quantum="300M"/> + <start name="sequence" caps="3000" ram="300M"> <config> <start name="tresor_init_trust_anchor"> - <resource name="RAM" quantum="4M"/> <config passphrase="foobar" trust_anchor_dir="/trust_anchor"> <vfs> <dir name="trust_anchor"> @@ -121,7 +115,6 @@ append config { </start> <start name="tresor_init"> - <resource name="RAM" quantum="4M"/> <config> <block-io type="vfs" path="/} [tresor_image_name] {"/> @@ -146,7 +139,6 @@ append config { </start> <start name="init" caps="1600"> - <resource name="RAM" quantum="256M"/> <config verbose="yes"> <parent-provides> @@ -165,9 +157,8 @@ append config { <default caps="100"/> - <start name="vfs_tresor" caps="200"> + <start name="vfs_tresor" caps="200" ram="16M"> <binary name="vfs"/> - <resource name="RAM" quantum="16M"/> <provides><service name="File_system"/></provides> <config> <vfs> @@ -189,8 +180,7 @@ append config { </route> </start> - <start name="vfs" caps="120"> - <resource name="RAM" quantum="30M"/> + <start name="vfs" caps="120" ram="30M"> <provides><service name="File_system"/></provides> <config> <vfs> @@ -217,8 +207,7 @@ append config { </route> </start> - <start name="vfs_rom"> - <resource name="RAM" quantum="30M"/> + <start name="vfs_rom" ram="30M"> <binary name="fs_rom"/> <provides> <service name="ROM"/> </provides> <config/> @@ -228,8 +217,7 @@ append config { </route> </start> - <start name="/bin/bash" caps="1000"> - <resource name="RAM" quantum="64M"/> + <start name="/bin/bash" caps="1000" ram="64M"> <config ld_verbose="yes"> <libc stdin="/dev/terminal" stdout="/dev/terminal" stderr="/dev/terminal" rtc="/dev/rtc" pipe="/dev/pipe"/> diff --git a/repos/gems/run/waveform_player.run b/repos/gems/run/waveform_player.run index 0057b34662..7c9dabe582 100644 --- a/repos/gems/run/waveform_player.run +++ b/repos/gems/run/waveform_player.run @@ -46,23 +46,20 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <resource name="CPU" quantum="10"/> <provides> <service name="Timer"/> </provides> </start> - <start name="report_rom" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M" priority="-1"> <provides> <service name="ROM"/> <service name="Report"/> </provides> <config> </config> </start> - <start name="drivers" caps="1500" managing_system="yes" priority="-1"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes" priority="-1"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -73,8 +70,7 @@ install_config { </route> </start> - <start name="nitpicker" priority="-2"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" ram="4M" priority="-2"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -87,12 +83,9 @@ install_config { </config> </start> - <start name="pointer" priority="-1"> - <resource name="RAM" quantum="1M"/> - </start> + <start name="pointer" priority="-1"/> - <start name="fonts_fs" caps="300" priority="-1"> - <resource name="RAM" quantum="8M"/> + <start name="fonts_fs" caps="300" ram="8M" priority="-1"> <binary name="vfs"/> <route> <service name="ROM" label="config"> <parent label="fonts_fs.config"/> </service> @@ -101,8 +94,7 @@ install_config { <provides> <service name="File_system"/> </provides> </start> - <start name="mixer"> - <resource name="RAM" quantum="2M"/> + <start name="mixer" ram="2M"> <resource name="CPU" quantum="10"/> <binary name="record_play_mixer"/> <provides> <service name="Record"/> <service name="Play"/> </provides> @@ -126,9 +118,8 @@ install_config { </config> </start> - <start name="waveform_config" priority="-2"> + <start name="waveform_config" ram="2M" priority="-2"> <binary name="dynamic_rom"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="ROM"/> </provides> <config verbose="yes"> <rom name="config"> @@ -158,7 +149,6 @@ install_config { </start> <start name="waveform_player" priority="0"> - <resource name="RAM" quantum="1M"/> <resource name="CPU" quantum="10"/> <route> <service name="ROM" label="config"> <child name="waveform_config"/> </service> @@ -166,8 +156,7 @@ install_config { </route> </start> - <start name="record_rom" priority="0"> - <resource name="RAM" quantum="8M"/> + <start name="record_rom" ram="8M" priority="0"> <resource name="CPU" quantum="10"/> <provides> <service name="ROM"/> </provides> <config period_ms="} [record_period_ms] {" sample_rate_hz="44100"> @@ -178,8 +167,7 @@ install_config { </config> </start> - <start name="rom_osci" priority="-1"> - <resource name="RAM" quantum="8M"/> + <start name="rom_osci" ram="8M" priority="-1"> <config width="640" height="480" xpos="200" ypos="100" fps="20" v_scale="0.15" phase_lock="yes"> <channel label="left" color="#ff6633" v_pos="0.2"/> <channel label="lefty" color="#cc7777" v_pos="0.4"/> diff --git a/repos/gems/run/wm.run b/repos/gems/run/wm.run index 4b05218668..dc695cfc72 100644 --- a/repos/gems/run/wm.run +++ b/repos/gems/run/wm.run @@ -31,15 +31,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -50,8 +48,7 @@ install_config { </route> </start> - <start name="nitpicker"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" ram="4M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -69,15 +66,13 @@ install_config { </start> <start name="pointer"> - <resource name="RAM" quantum="1M"/> <route> <service name="Gui"> <child name="nitpicker"/> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="wm" caps="1000"> - <resource name="RAM" quantum="32M"/> + <start name="wm" caps="1000" ram="32M"> <binary name="init"/> <provides> <service name="Gui"/> <service name="Report"/> <service name="ROM"/> @@ -89,8 +84,7 @@ install_config { </route> </start> - <start name="launchpad" priority="-1" caps="1000"> - <resource name="RAM" quantum="20M"/> + <start name="launchpad" priority="-1" caps="1000" ram="20M"> <config> <launcher name="gui_fb" ram_quota="7M" caps="100"> <config initial_width="500" initial_height="400" /> @@ -110,8 +104,7 @@ install_config { </route> </start> - <start name="backdrop" priority="-1" caps="120"> - <resource name="RAM" quantum="24M"/> + <start name="backdrop" priority="-1" caps="120" ram="24M"> <config> <libc/> <vfs> @@ -129,9 +122,8 @@ install_config { </route> </start> - <start name="wm_backdrop" priority="-1" caps="120"> + <start name="wm_backdrop" priority="-1" caps="120" ram="32M"> <binary name="backdrop" /> - <resource name="RAM" quantum="32M"/> <config> <libc/> <vfs> diff --git a/repos/gems/sculpt/drivers/linux b/repos/gems/sculpt/drivers/linux index ca07cd7a2e..d03e650183 100644 --- a/repos/gems/sculpt/drivers/linux +++ b/repos/gems/sculpt/drivers/linux @@ -9,8 +9,7 @@ <service name="Event"/> </parent-provides> - <start name="fb_sdl" caps="100" ld="no"> - <resource name="RAM" quantum="32M"/> + <start name="fb_sdl" caps="100" ram="32M" ld="no"> <route> <service name="Event"> <parent label="sdl"/> </service> <any-service> <parent/> </any-service> diff --git a/repos/gems/sculpt/drivers/pc b/repos/gems/sculpt/drivers/pc index fffa3b1ee9..b1a282798e 100644 --- a/repos/gems/sculpt/drivers/pc +++ b/repos/gems/sculpt/drivers/pc @@ -19,13 +19,12 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <service name="Platform"> <default-policy> <child name="platform"/> </default-policy> </service> - <start name="report_rom"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="no"> <policy label="pci_decode -> system" report="acpi -> acpi"/> @@ -37,7 +36,6 @@ </start> <start name="rom_reporter"> - <resource name="RAM" quantum="1M"/> <config> <rom label="acpi"/> <rom label="devices"/> @@ -54,8 +52,7 @@ </route> </start> - <start name="acpi" caps="350"> - <resource name="RAM" quantum="7M"/> + <start name="acpi" caps="350" ram="7M"> <route> <service name="Report" label="acpi"> <child name="report_rom"/> </service> <service name="Report" label="intel_opregion"> <parent label="intel_opregion"/> </service> @@ -69,8 +66,7 @@ </route> </start> - <start name="pci_decode" caps="350"> - <resource name="RAM" quantum="2M"/> + <start name="pci_decode" caps="350" ram="2M"> <route> <service name="Report"> <child name="report_rom"/> </service> <service name="ROM" label="system"> <child name="report_rom"/> </service> @@ -83,9 +79,8 @@ </route> </start> - <start name="platform" caps="400" managing_system="yes"> + <start name="platform" caps="400" ram="6M" managing_system="yes"> <binary name="pc_platform"/> - <resource name="RAM" quantum="6M"/> <provides> <service name="Platform"/> </provides> <route> <service name="ROM" label="system"> <parent label="system"/> </service> diff --git a/repos/gems/sculpt/drivers/phone_linux b/repos/gems/sculpt/drivers/phone_linux index f9b7e66e04..bd9f09f339 100644 --- a/repos/gems/sculpt/drivers/phone_linux +++ b/repos/gems/sculpt/drivers/phone_linux @@ -10,17 +10,15 @@ <service name="Event"/> </parent-provides> - <start name="fb_sdl" caps="100" ld="no"> - <resource name="RAM" quantum="10M"/> + <start name="fb_sdl" caps="100" ram="10M" ld="no"> <route> <service name="Event"> <parent label="sdl"/> </service> <any-service> <parent/> </any-service> </route> </start> - <start name="modem" caps="120"> + <start name="modem" caps="120" ram="1M"> <binary name="dummy_modem"/> - <resource name="RAM" quantum="1M"/> <route> <service name="ROM" label="config"> <parent label="modem.config"/> </service> <service name="ROM"> <parent/> </service> diff --git a/repos/gems/sculpt/leitzentrale/default b/repos/gems/sculpt/leitzentrale/default index e4be530b53..7e8cfeaa29 100644 --- a/repos/gems/sculpt/leitzentrale/default +++ b/repos/gems/sculpt/leitzentrale/default @@ -43,9 +43,8 @@ <has_value input="leitzentrale_enabled" value="yes" /> <then> <inline> - <start name="fader" priority="-1"> + <start name="fader" ram="100M" priority="-1"> <binary name="gui_fader"/> - <resource name="RAM" quantum="100M"/> <resource name="CPU" quantum="20"/> <provides> <service name="Gui"/> </provides> <config initial_fade_in_steps="100" fade_in_steps="20" alpha="210"/> @@ -58,9 +57,8 @@ </then> <else> <inline> - <start name="fader" priority="-1"> + <start name="fader" ram="100M" priority="-1"> <binary name="gui_fader"/> - <resource name="RAM" quantum="50M"/> <resource name="CPU" quantum="20"/> <provides> <service name="Gui"/> </provides> <config fade_out_steps="30" alpha="0"/> @@ -73,8 +71,7 @@ </else> </if> <inline> - <start name="gui_fb" priority="-1"> - <resource name="RAM" quantum="33M"/> + <start name="gui_fb" ram="33M" priority="-1"> <resource name="CPU" quantum="20"/> <provides> <service name="Framebuffer"/> <service name="Input"/> </provides> <route> @@ -84,8 +81,7 @@ </route> </start> - <start name="nitpicker" caps="200" priority="-1"> - <resource name="RAM" quantum="14M"/> + <start name="nitpicker" caps="200" ram="14M" priority="-1"> <resource name="CPU" quantum="40"/> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> @@ -106,8 +102,7 @@ </route> </start> - <start name="report_rom" caps="200" priority="-1"> - <resource name="RAM" quantum="4M"/> + <start name="report_rom" caps="200" ram="4M" priority="-1"> <provides> <service name="Report"/> <service name="ROM"/> @@ -143,8 +138,7 @@ </config> </start> - <start name="wm" caps="150" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="wm" caps="150" ram="2M" priority="-1"> <provides> <service name="Gui"/> <service name="Report"/> <service name="ROM"/> </provides> @@ -161,9 +155,8 @@ </route> </start> - <start name="decorator" caps="580" priority="-1"> + <start name="decorator" caps="580" ram="20M" priority="-1"> <binary name="themed_decorator"/> - <resource name="RAM" quantum="20M"/> <resource name="CPU" quantum="20"/> <config> <libc/> @@ -202,9 +195,8 @@ </route> </start> - <start name="config_fs_report" priority="-1"> + <start name="config_fs_report" ram="2M" priority="-1"> <binary name="fs_report"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Report"/> </provides> <config> <vfs> <fs/> </vfs> </config> <route> @@ -213,9 +205,8 @@ </route> </start> - <start name="manager" caps="400" priority="-1"> + <start name="manager" caps="400" ram="3M" priority="-1"> <binary name="sculpt_manager"/> - <resource name="RAM" quantum="3M"/> <provides> <service name="Gui"/> </provides> <route> <service name="ROM" label="config"> @@ -256,9 +247,8 @@ </route> </start> - <start name="fonts_fs" caps="100" priority="-1"> + <start name="fonts_fs" caps="100" ram="4M" priority="-1"> <binary name="vfs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> <route> <service name="ROM" label="config"> @@ -267,9 +257,8 @@ </route> </start> - <start name="log_terminal" priority="-1" caps="120"> + <start name="log_terminal" caps="120" ram="8M" priority="-1"> <binary name="terminal"/> - <resource name="RAM" quantum="8M"/> <provides> <service name="Terminal"/> </provides> <config> <initial width="400"/> @@ -292,9 +281,8 @@ </route> </start> - <start name="log" caps="100" priority="-1"> + <start name="log" caps="100" ram="2M" priority="-1"> <binary name="stdin2out"/> - <resource name="RAM" quantum="2M" /> <config> <libc stdin="/report/log" stdout="/dev/terminal"/> <vfs> @@ -308,8 +296,7 @@ </route> </start> - <start name="backdrop" caps="150" priority="-1"> - <resource name="RAM" quantum="4M" /> + <start name="backdrop" caps="150" ram="4M" priority="-1"> <config width="300" height="150"> <libc/> <vfs> <rom name="genode_logo.png"/> </vfs> diff --git a/repos/gems/sculpt/leitzentrale/phone b/repos/gems/sculpt/leitzentrale/phone index fb0f25eb2f..01fc680b50 100644 --- a/repos/gems/sculpt/leitzentrale/phone +++ b/repos/gems/sculpt/leitzentrale/phone @@ -32,8 +32,7 @@ <service name="Report"> <default-policy> <child name="report_rom"/> </default-policy> </service> - <start name="report_rom" caps="200"> - <resource name="RAM" quantum="4M"/> + <start name="report_rom" caps="200" ram="4M"> <provides> <service name="Report"/> <service name="ROM"/> @@ -52,8 +51,7 @@ </config> </start> - <start name="wm" caps="300"> - <resource name="RAM" quantum="4M"/> + <start name="wm" caps="300" ram="4M"> <provides> <service name="Gui"/> <service name="Report"/> <service name="ROM"/> </provides> @@ -70,9 +68,8 @@ </route> </start> - <start name="decorator" caps="350"> + <start name="decorator" caps="350" ram="12M"> <binary name="themed_decorator"/> - <resource name="RAM" quantum="12M"/> <resource name="CPU" quantum="20"/> <config> <libc/> @@ -105,9 +102,8 @@ </route> </start> - <start name="config_fs_report"> + <start name="config_fs_report" ram="2M"> <binary name="fs_report"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Report"/> </provides> <config> <vfs> <fs/> </vfs> </config> <route> @@ -116,9 +112,8 @@ </route> </start> - <start name="manager" caps="400"> + <start name="manager" caps="400" ram="3M"> <binary name="phone_manager"/> - <resource name="RAM" quantum="3M"/> <provides> <service name="Gui"/> </provides> <route> <service name="ROM" label="config"> @@ -156,9 +151,8 @@ </route> </start> - <start name="fonts_fs" caps="100"> + <start name="fonts_fs" caps="100" ram="4M"> <binary name="vfs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> <route> <service name="ROM" label="config"> diff --git a/repos/gems/src/app/depot_autopilot/README b/repos/gems/src/app/depot_autopilot/README index 18bd24b738..876fe8cf80 100644 --- a/repos/gems/src/app/depot_autopilot/README +++ b/repos/gems/src/app/depot_autopilot/README @@ -185,9 +185,7 @@ Besides the mandatory package content, a test package is expected to provide a ! ... ! </default-route> ! <default caps="100"/> -! <start name="test-example" caps="500"> -! <resource name="RAM" quantum="10M"/> -! </start> +! <start name="test-example" caps="500" ram="10M"/> ! </config> ! </runtime> @@ -291,9 +289,8 @@ Integration ! <config> ! ... # content of <static> tag in Autopilot configuration ! - ! <start name="test-spark" caps="1000"> + ! <start name="test-spark" caps="1000" ram="32M"> ! <binary name="init"/> - ! <resource name="RAM" quantum="32M"/> ! ! <config ...> ... <config> # from the tests runtime file ! diff --git a/repos/gems/src/lib/vfs/pipe/README b/repos/gems/src/lib/vfs/pipe/README index a3decd105c..19f4bab912 100644 --- a/repos/gems/src/lib/vfs/pipe/README +++ b/repos/gems/src/lib/vfs/pipe/README @@ -17,9 +17,8 @@ component to a named pipe and write data using standard fwrite() calls. Here a sample scenario where stdin of a component is attached to a named pipe: -! <start name="vfs"> +! <start name="vfs" ram="4M"> ! <provides> <service name="File_system"/> </provides> -! <resource name="RAM" quantum="4M"/> ! <config> ! <vfs> ! <pipe> @@ -31,8 +30,7 @@ Here a sample scenario where stdin of a component is attached to a named pipe: ! </config> ! </start> ! -! <start name="my-libc-app"> -! <resource name="RAM" quantum="4M"/> +! <start name="my-libc-app" ram="4M"> ! <config> ! <vfs> ! <dir name="dev"> diff --git a/repos/hello_tutorial/run/hello.run b/repos/hello_tutorial/run/hello.run index 6804253a6f..22b683bba6 100644 --- a/repos/hello_tutorial/run/hello.run +++ b/repos/hello_tutorial/run/hello.run @@ -21,14 +21,11 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="60"/> + <default caps="60" ram="1M"/> <start name="hello_server"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Hello"/> </provides> </start> - <start name="hello_client"> - <resource name="RAM" quantum="1M"/> - </start> + <start name="hello_client"/> </config>} # diff --git a/repos/libports/recipes/pkg/gcov/runtime b/repos/libports/recipes/pkg/gcov/runtime index 05aa7f7095..8e4edecf46 100644 --- a/repos/libports/recipes/pkg/gcov/runtime +++ b/repos/libports/recipes/pkg/gcov/runtime @@ -31,8 +31,7 @@ <any-service> <parent/> </any-service> </default-route> <default caps="175"/> - <start name="gcov"> - <resource name="RAM" quantum="10M"/> + <start name="gcov" ram="10M"> <config> <arg value="gcov"/> <arg value="--genode-autopilot"/> diff --git a/repos/libports/recipes/pkg/mesa_gpu-cpu/runtime b/repos/libports/recipes/pkg/mesa_gpu-cpu/runtime index 98397a5917..e54f4e67c8 100644 --- a/repos/libports/recipes/pkg/mesa_gpu-cpu/runtime +++ b/repos/libports/recipes/pkg/mesa_gpu-cpu/runtime @@ -34,8 +34,7 @@ <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <start name="vfs" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="vfs" caps="100" ram="1M"> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -45,8 +44,7 @@ </config> </start> - <start name="cached_fs_rom" caps="100"> - <resource name="RAM" quantum="8M"/> + <start name="cached_fs_rom" caps="100" ram="8M"> <provides> <service name="ROM"/> </provides> <config/> </start> diff --git a/repos/libports/recipes/pkg/mesa_gpu-etnaviv/runtime b/repos/libports/recipes/pkg/mesa_gpu-etnaviv/runtime index 9fc9a5fb07..6b5ef7ad63 100644 --- a/repos/libports/recipes/pkg/mesa_gpu-etnaviv/runtime +++ b/repos/libports/recipes/pkg/mesa_gpu-etnaviv/runtime @@ -34,8 +34,7 @@ <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <start name="vfs" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="vfs" caps="100" ram="1M"> <provides> <service name="File_system"/> </provides> <config verbose="yes"> <vfs> @@ -45,8 +44,7 @@ </config> </start> - <start name="cached_fs_rom" caps="100"> - <resource name="RAM" quantum="9M"/> + <start name="cached_fs_rom" caps="100" ram="9M"> <provides> <service name="ROM"/> </provides> <config/> </start> diff --git a/repos/libports/recipes/pkg/mesa_gpu-intel/runtime b/repos/libports/recipes/pkg/mesa_gpu-intel/runtime index c3049fa4c3..c2e66eee6e 100644 --- a/repos/libports/recipes/pkg/mesa_gpu-intel/runtime +++ b/repos/libports/recipes/pkg/mesa_gpu-intel/runtime @@ -34,8 +34,7 @@ <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <start name="vfs" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="vfs" caps="100" ram="1M"> <provides> <service name="File_system"/> </provides> <config verbose="yes"> <vfs> @@ -45,8 +44,7 @@ </config> </start> - <start name="cached_fs_rom" caps="100"> - <resource name="RAM" quantum="9M"/> + <start name="cached_fs_rom" caps="100" ram="9M"> <provides> <service name="ROM"/> </provides> <config/> </start> diff --git a/repos/libports/recipes/pkg/mesa_gpu-lima/runtime b/repos/libports/recipes/pkg/mesa_gpu-lima/runtime index f1eb36a1b8..cea5ec2460 100644 --- a/repos/libports/recipes/pkg/mesa_gpu-lima/runtime +++ b/repos/libports/recipes/pkg/mesa_gpu-lima/runtime @@ -34,8 +34,7 @@ <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <start name="vfs" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="vfs" caps="100" ram="1M"> <provides> <service name="File_system"/> </provides> <config verbose="yes"> <vfs> @@ -45,8 +44,7 @@ </config> </start> - <start name="cached_fs_rom" caps="100"> - <resource name="RAM" quantum="9M"/> + <start name="cached_fs_rom" caps="100" ram="9M"> <provides> <service name="ROM"/> </provides> <config/> </start> diff --git a/repos/libports/recipes/pkg/system_clock-dummy/runtime b/repos/libports/recipes/pkg/system_clock-dummy/runtime index 1a99e82846..fd0155f260 100644 --- a/repos/libports/recipes/pkg/system_clock-dummy/runtime +++ b/repos/libports/recipes/pkg/system_clock-dummy/runtime @@ -22,13 +22,12 @@ <service name="Timer"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <service name="Rtc"> <default-policy> <child name="system_rtc"/> </default-policy> </service> <start name="dummy_rtc"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Rtc"/> </provides> <config year="2021" month="10" day="14" hour="10" minute="0" second="0"/> <route> @@ -37,7 +36,6 @@ </start> <start name="system_rtc"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Rtc"/> </provides> <config/> <route> diff --git a/repos/libports/recipes/pkg/system_clock-pc/runtime b/repos/libports/recipes/pkg/system_clock-pc/runtime index 2caf7a72d0..4f75fa1215 100644 --- a/repos/libports/recipes/pkg/system_clock-pc/runtime +++ b/repos/libports/recipes/pkg/system_clock-pc/runtime @@ -25,13 +25,12 @@ <service name="Timer"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <service name="Rtc"> <default-policy> <child name="system_rtc"/> </default-policy> </service> <start name="pc_rtc"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Rtc"/> </provides> <config/> <route> @@ -40,7 +39,6 @@ </start> <start name="system_rtc"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Rtc"/> </provides> <config/> <route> diff --git a/repos/libports/recipes/pkg/test-expat/runtime b/repos/libports/recipes/pkg/test-expat/runtime index e53a29bf1d..f596228283 100644 --- a/repos/libports/recipes/pkg/test-expat/runtime +++ b/repos/libports/recipes/pkg/test-expat/runtime @@ -38,8 +38,7 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="200"/> - <start name="test-expat"> - <resource name="RAM" quantum="3M"/> + <start name="test-expat" ram="3M"> <config> <vfs> <inline name="config"><config> diff --git a/repos/libports/recipes/pkg/test-ldso/runtime b/repos/libports/recipes/pkg/test-ldso/runtime index 893e51f814..1b90d06806 100644 --- a/repos/libports/recipes/pkg/test-ldso/runtime +++ b/repos/libports/recipes/pkg/test-ldso/runtime @@ -125,8 +125,7 @@ <any-service> <parent/> </any-service> </default-route> <default caps="100"/> - <start name="test-ldso"> - <resource name="RAM" quantum="3M"/> + <start name="test-ldso" ram="3M"> <config ld_bind_now="no" ld_verbose="no"> <vfs> <dir name="dev"> <log/> </dir> </vfs> <libc stdout="/dev/log"/> diff --git a/repos/libports/recipes/pkg/test-libc/runtime b/repos/libports/recipes/pkg/test-libc/runtime index 411212a4e8..a657da7a27 100644 --- a/repos/libports/recipes/pkg/test-libc/runtime +++ b/repos/libports/recipes/pkg/test-libc/runtime @@ -31,8 +31,7 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="200"/> - <start name="test-libc"> - <resource name="RAM" quantum="256M"/> + <start name="test-libc" ram="256M"> <config> <vfs> <dir name="dev"> <log/> </dir> </vfs> <libc stdout="/dev/log" stderr="/dev/log"/> diff --git a/repos/libports/recipes/pkg/test-libc_connect_lwip/runtime b/repos/libports/recipes/pkg/test-libc_connect_lwip/runtime index cbee9905ac..39c0d6f0dc 100644 --- a/repos/libports/recipes/pkg/test-libc_connect_lwip/runtime +++ b/repos/libports/recipes/pkg/test-libc_connect_lwip/runtime @@ -35,8 +35,7 @@ </default-route> <default caps="256"/> - <start name="nic_router"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -47,9 +46,8 @@ </config> </start> - <start name="server"> + <start name="server" ram="12M"> <binary name="test-netty_tcp"/> - <resource name="RAM" quantum="12M"/> <config port="80" read_write="yes" nonblock="false"> <vfs> <dir name="dev"> <log/> </dir> @@ -62,8 +60,7 @@ </config> </start> - <start name="test-libc_connect" caps="200"> - <resource name="RAM" quantum="48M"/> + <start name="test-libc_connect" caps="200" ram="48M"> <config> <vfs> <dir name="dev"> <log/> </dir> diff --git a/repos/libports/recipes/pkg/test-libc_connect_lxip/runtime b/repos/libports/recipes/pkg/test-libc_connect_lxip/runtime index 50c3a36e4c..ee29569fba 100644 --- a/repos/libports/recipes/pkg/test-libc_connect_lxip/runtime +++ b/repos/libports/recipes/pkg/test-libc_connect_lxip/runtime @@ -37,8 +37,7 @@ </default-route> <default caps="200"/> - <start name="nic_router"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -53,16 +52,14 @@ </config> </start> - <start name="black_hole"> - <resource name="RAM" quantum="2M"/> + <start name="black_hole" ram="2M"> <config> <uplink_client/> </config> </start> - <start name="server"> + <start name="server" ram="10M"> <binary name="test-netty_tcp"/> - <resource name="RAM" quantum="10M"/> <config port="80" read_write="yes" nonblock="false"> <vfs> <dir name="dev"> <log/> </dir> @@ -75,8 +72,7 @@ </config> </start> - <start name="test-libc_connect" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="test-libc_connect" caps="200" ram="10M"> <config> <vfs> <dir name="dev"> <log/> </dir> diff --git a/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lwip/runtime b/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lwip/runtime index f05a16a748..88bd3746e2 100644 --- a/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lwip/runtime +++ b/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lwip/runtime @@ -36,8 +36,7 @@ </default-route> <default caps="150"/> - <start name="nic_router"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -48,9 +47,8 @@ </config> </start> - <start name="socket_fs_server"> + <start name="socket_fs_server" ram="32M"> <binary name="vfs"/> - <resource name="RAM" quantum="32M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> <lwip ip_addr="10.0.1.2" netmask="255.255.255.0" gateway="10.0.1.1"/> </vfs> @@ -58,9 +56,8 @@ </config> </start> - <start name="socket_fs_client"> + <start name="socket_fs_client" ram="32M"> <binary name="vfs"/> - <resource name="RAM" quantum="32M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> <lwip ip_addr="10.0.1.3" netmask="255.255.255.0" gateway="10.0.1.1"/> </vfs> @@ -68,9 +65,8 @@ </config> </start> - <start name="server"> + <start name="server" ram="4M"> <binary name="test-netty_tcp"/> - <resource name="RAM" quantum="4M"/> <config port="80" read_write="yes" nonblock="false"> <vfs> <dir name="dev"> <log/> </dir> @@ -85,8 +81,7 @@ </route> </start> - <start name="test-libc_connect"> - <resource name="RAM" quantum="4M"/> + <start name="test-libc_connect" ram="4M"> <config> <vfs> <dir name="dev"> <log/> </dir> diff --git a/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lxip/runtime b/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lxip/runtime index 0f43336386..fd5978c5e5 100644 --- a/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lxip/runtime +++ b/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lxip/runtime @@ -38,8 +38,7 @@ </default-route> <default caps="150"/> - <start name="nic_router"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -54,16 +53,14 @@ </config> </start> - <start name="black_hole"> - <resource name="RAM" quantum="2M"/> + <start name="black_hole" ram="2M"> <config> <uplink_client/> </config> </start> - <start name="socket_fs_server" caps="200"> + <start name="socket_fs_server" caps="200" ram="10M"> <binary name="vfs"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> <lxip ip_addr="10.0.1.2" netmask="255.255.255.0" gateway="10.0.1.1"/> </vfs> @@ -71,9 +68,8 @@ </config> </start> - <start name="socket_fs_client" caps="200"> + <start name="socket_fs_client" caps="200" ram="10M"> <binary name="vfs"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> <lxip ip_addr="10.0.1.3" netmask="255.255.255.0" gateway="10.0.1.1"/> </vfs> @@ -81,9 +77,8 @@ </config> </start> - <start name="server"> + <start name="server" ram="4M"> <binary name="test-netty_tcp"/> - <resource name="RAM" quantum="4M"/> <config port="80" read_write="yes" nonblock="false"> <vfs> <dir name="dev"> <log/> </dir> @@ -98,8 +93,7 @@ </route> </start> - <start name="test-libc_connect"> - <resource name="RAM" quantum="4M"/> + <start name="test-libc_connect" ram="4M"> <config> <vfs> <dir name="dev"> <log/> </dir> diff --git a/repos/libports/recipes/pkg/test-libc_counter/runtime b/repos/libports/recipes/pkg/test-libc_counter/runtime index a1ea6a1f95..9e3d526ba3 100644 --- a/repos/libports/recipes/pkg/test-libc_counter/runtime +++ b/repos/libports/recipes/pkg/test-libc_counter/runtime @@ -32,13 +32,11 @@ </default-route> <default caps="100"/> - <start name="terminal_crosslink"> - <resource name="RAM" quantum="2M"/> + <start name="terminal_crosslink" ram="2M"> <provides> <service name="Terminal"/> </provides> </start> - <start name="test-libc_counter-source"> - <resource name="RAM" quantum="8M"/> + <start name="test-libc_counter-source" ram="8M"> <config> <vfs> <dir name="dev"> <terminal/> <log/> </dir> @@ -46,8 +44,7 @@ <libc stdin="/dev/terminal" stdout="/dev/terminal" stderr="/dev/log"/> </config> </start> - <start name="test-libc_counter-sink"> - <resource name="RAM" quantum="8M"/> + <start name="test-libc_counter-sink" ram="8M"> <config> <vfs> <dir name="dev"> <terminal/> <log/> <null/> </dir> diff --git a/repos/libports/recipes/pkg/test-libc_execve/runtime b/repos/libports/recipes/pkg/test-libc_execve/runtime index 3545594ac8..673144c46e 100644 --- a/repos/libports/recipes/pkg/test-libc_execve/runtime +++ b/repos/libports/recipes/pkg/test-libc_execve/runtime @@ -22,8 +22,7 @@ <service name="CPU"/> <service name="PD"/> </parent-provides> - <start name="test-execve" caps="300"> - <resource name="RAM" quantum="1G"/> + <start name="test-execve" caps="300" ram="1G"> <config ld_verbose="yes"> <arg value="name_of_executeable"/> <arg value="100"/> diff --git a/repos/libports/recipes/pkg/test-libc_fifo_pipe/runtime b/repos/libports/recipes/pkg/test-libc_fifo_pipe/runtime index 073007e196..4b836ba4f2 100644 --- a/repos/libports/recipes/pkg/test-libc_fifo_pipe/runtime +++ b/repos/libports/recipes/pkg/test-libc_fifo_pipe/runtime @@ -28,11 +28,10 @@ </default-route> <default caps="128"/> - <start name="vfs"> + <start name="vfs" ram="4M"> <provides> <service name="File_system"/> </provides> - <resource name="RAM" quantum="4M"/> <config> <vfs> <pipe> @@ -46,9 +45,8 @@ </config> </start> - <start name="ram_fs"> + <start name="ram_fs" ram="2M"> <binary name="vfs"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="File_system"/> </provides> @@ -67,9 +65,8 @@ </parent-provides> <default caps="120"/> - <start name="echo"> + <start name="echo" ram="3M"> <binary name="test-libc_fifo_pipe"/> - <resource name="RAM" quantum="3M"/> <config type="echo"> <vfs> <dir name="dev"> @@ -92,8 +89,7 @@ </config> </start> - <start name="fs_rom"> - <resource name="RAM" quantum="2M"/> + <start name="fs_rom" ram="2M"> <provides> <service name="ROM"/> </provides> @@ -103,8 +99,7 @@ </route> </start> - <start name="report_rom"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M"> <provides> <service name="ROM"/> <service name="Report"/> @@ -114,9 +109,8 @@ </config> </start> - <start name="fifo-pipe-test" caps="150"> + <start name="fifo-pipe-test" caps="150" ram="8M"> <binary name="test-libc_fifo_pipe"/> - <resource name="RAM" quantum="8M"/> <config iterations="15"> <vfs> <dir name="ro"> @@ -143,8 +137,7 @@ </route> </start> - <start name="init" caps="250"> - <resource name="RAM" quantum="16M"/> + <start name="init" caps="250" ram="16M"> <route> <service name="ROM" label="config"> <child name="report_rom" label="init.config"/> </service> <service name="File_system"> <child name="vfs"/> </service> diff --git a/repos/libports/recipes/pkg/test-libc_fork/runtime b/repos/libports/recipes/pkg/test-libc_fork/runtime index b041676ae5..fc0d9277e5 100644 --- a/repos/libports/recipes/pkg/test-libc_fork/runtime +++ b/repos/libports/recipes/pkg/test-libc_fork/runtime @@ -22,8 +22,7 @@ <service name="CPU"/> <service name="PD"/> </parent-provides> - <start name="test-fork" caps="500"> - <resource name="RAM" quantum="1G"/> + <start name="test-fork" caps="500" ram="1G"> <config> <arg value="name_of_executeable"/> <env key="WIZARD" value="gandalf"/> diff --git a/repos/libports/recipes/pkg/test-libc_getenv/runtime b/repos/libports/recipes/pkg/test-libc_getenv/runtime index 9c7b069677..2375ed4a19 100644 --- a/repos/libports/recipes/pkg/test-libc_getenv/runtime +++ b/repos/libports/recipes/pkg/test-libc_getenv/runtime @@ -29,8 +29,7 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="test-libc_getenv"> - <resource name="RAM" quantum="4M"/> + <start name="test-libc_getenv" ram="4M"> <config> <vfs> <dir name="dev"> <log/> </dir> </vfs> <libc stdout="/dev/log"/> diff --git a/repos/libports/recipes/pkg/test-libc_pipe/runtime b/repos/libports/recipes/pkg/test-libc_pipe/runtime index fa12b257bd..8f75680350 100644 --- a/repos/libports/recipes/pkg/test-libc_pipe/runtime +++ b/repos/libports/recipes/pkg/test-libc_pipe/runtime @@ -29,17 +29,15 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="256"/> - <start name="pipes_fs"> + <start name="pipes_fs" ram="4M"> <binary name="vfs"/> <provides> <service name="File_system"/> </provides> - <resource name="RAM" quantum="4M"/> <config> <vfs> <pipe/> </vfs> <default-policy root="/" writeable="yes"/> </config> </start> - <start name="sequence"> - <resource name="RAM" quantum="4M"/> + <start name="sequence" ram="4M"> <config> <start name="libc_pipe_local"> <binary name="test-libc_pipe"/> diff --git a/repos/libports/recipes/pkg/test-libc_vfs/runtime b/repos/libports/recipes/pkg/test-libc_vfs/runtime index ac084d4990..1df82fb6a7 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs/runtime +++ b/repos/libports/recipes/pkg/test-libc_vfs/runtime @@ -24,8 +24,7 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="ram_fs"> - <resource name="RAM" quantum="12M"/> + <start name="ram_fs" ram="12M"> <binary name="vfs"/> <provides> <service name="File_system"/> </provides> <config> @@ -33,8 +32,7 @@ <default-policy root="/" writeable="yes"/> </config> </start> - <start name="test-libc_vfs"> - <resource name="RAM" quantum="4M"/> + <start name="test-libc_vfs" ram="4M"> <config> <iterations value="1"/> <write-read size="1M" buffer_size="8K"/> diff --git a/repos/libports/recipes/pkg/test-libc_vfs_block/runtime b/repos/libports/recipes/pkg/test-libc_vfs_block/runtime index 3809ea9ab7..6794d6c707 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs_block/runtime +++ b/repos/libports/recipes/pkg/test-libc_vfs_block/runtime @@ -25,8 +25,7 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="vfs_block"> - <resource name="RAM" quantum="2M"/> + <start name="vfs_block" ram="2M"> <provides> <service name="Block"/> </provides> <config> <vfs> @@ -38,8 +37,7 @@ <default-policy file="/block_file" block_size="4096" writeable="yes"/> </config> </start> - <start name="test-libc_vfs_block"> - <resource name="RAM" quantum="4M"/> + <start name="test-libc_vfs_block" ram="4M"> <config> <vfs> <dir name="dev"> <block/> </dir> </vfs> <libc/> diff --git a/repos/libports/recipes/pkg/test-libc_vfs_counter/runtime b/repos/libports/recipes/pkg/test-libc_vfs_counter/runtime index d614d12a6c..93372b70d9 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs_counter/runtime +++ b/repos/libports/recipes/pkg/test-libc_vfs_counter/runtime @@ -31,12 +31,10 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="terminal_crosslink"> - <resource name="RAM" quantum="2M"/> + <start name="terminal_crosslink" ram="2M"> <provides> <service name="Terminal"/> </provides> </start> - <start name="vfs"> - <resource name="RAM" quantum="12M"/> + <start name="vfs" ram="12M"> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -46,8 +44,7 @@ </config> </start> - <start name="test-libc_counter-source"> - <resource name="RAM" quantum="8M"/> + <start name="test-libc_counter-source" ram="8M"> <config> <vfs> <dir name="dev"> <terminal/> <log/> </dir> @@ -55,8 +52,7 @@ <libc stdin="/dev/terminal" stdout="/dev/terminal" stderr="/dev/log"/> </config> </start> - <start name="test-libc_counter-sink"> - <resource name="RAM" quantum="8M"/> + <start name="test-libc_counter-sink" ram="8M"> <config> <vfs> <dir name="dev"> <log/> <null/> </dir> diff --git a/repos/libports/recipes/pkg/test-libc_vfs_fs/runtime b/repos/libports/recipes/pkg/test-libc_vfs_fs/runtime index f781239558..4242881919 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs_fs/runtime +++ b/repos/libports/recipes/pkg/test-libc_vfs_fs/runtime @@ -24,16 +24,14 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="vfs"> - <resource name="RAM" quantum="12M"/> + <start name="vfs" ram="12M"> <provides> <service name="File_system"/> </provides> <config> <vfs> <ram/> </vfs> <default-policy root="/" writeable="yes"/> </config> </start> - <start name="test-libc_vfs"> - <resource name="RAM" quantum="4M"/> + <start name="test-libc_vfs" ram="4M"> <config> <iterations value="1"/> <write-read size="1M" buffer_size="8K"/> diff --git a/repos/libports/recipes/pkg/test-libc_vfs_fs_chained/runtime b/repos/libports/recipes/pkg/test-libc_vfs_fs_chained/runtime index 7ec9bc45db..68e4a678e8 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs_fs_chained/runtime +++ b/repos/libports/recipes/pkg/test-libc_vfs_fs_chained/runtime @@ -24,18 +24,16 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="vfs1"> + <start name="vfs1" ram="12M"> <binary name="vfs"/> - <resource name="RAM" quantum="12M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> <ram/> </vfs> <default-policy root="/" writeable="yes"/> </config> </start> - <start name="vfs2"> + <start name="vfs2" ram="12M"> <binary name="vfs"/> - <resource name="RAM" quantum="12M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> <fs/> </vfs> @@ -46,8 +44,7 @@ <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="test-libc_vfs"> - <resource name="RAM" quantum="4M"/> + <start name="test-libc_vfs" ram="4M"> <config> <iterations value="1"/> <write-read size="1M" buffer_size="8K"/> diff --git a/repos/libports/recipes/pkg/test-libc_vfs_ram/runtime b/repos/libports/recipes/pkg/test-libc_vfs_ram/runtime index f3212be89e..cd81411f57 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs_ram/runtime +++ b/repos/libports/recipes/pkg/test-libc_vfs_ram/runtime @@ -19,8 +19,7 @@ <service name="CPU"/> <service name="LOG"/> </parent-provides> - <start name="test-libc_vfs" caps="100"> - <resource name="RAM" quantum="12M"/> + <start name="test-libc_vfs" caps="100" ram="12M"> <route> <any-service> <parent/> </any-service> </route> diff --git a/repos/libports/recipes/pkg/test-pipe_read_ready/runtime b/repos/libports/recipes/pkg/test-pipe_read_ready/runtime index cbd8e2943f..054c4da1fd 100644 --- a/repos/libports/recipes/pkg/test-pipe_read_ready/runtime +++ b/repos/libports/recipes/pkg/test-pipe_read_ready/runtime @@ -33,8 +33,7 @@ <default caps="100"/> - <start name="vfs"> - <resource name="RAM" quantum="12M"/> + <start name="vfs" ram="12M"> <provides> <service name="File_system"/> </provides> <config> <vfs> <pipe> <fifo name="fifo"/> </pipe> </vfs> @@ -42,8 +41,7 @@ </config> </start> - <start name="select"> - <resource name="RAM" quantum="3M"/> + <start name="select" ram="3M"> <binary name="test-pipe_read_ready_select"/> <config> <vfs> @@ -54,8 +52,7 @@ </config> </start> - <start name="counter" caps="120"> - <resource name="RAM" quantum="3M"/> + <start name="counter" caps="120" ram="3M"> <binary name="test-pipe_read_ready_counter"/> <config> <vfs> diff --git a/repos/libports/recipes/pkg/test-pthread/runtime b/repos/libports/recipes/pkg/test-pthread/runtime index 1e3ba85f3c..ec85ee17f8 100644 --- a/repos/libports/recipes/pkg/test-pthread/runtime +++ b/repos/libports/recipes/pkg/test-pthread/runtime @@ -27,8 +27,7 @@ <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <start name="test-pthread" caps="600"> - <resource name="RAM" quantum="64M"/> + <start name="test-pthread" caps="600" ram="64M"> <config> <vfs> <dir name="dev"> <log/> </dir> </vfs> <libc stdout="/dev/log"/> diff --git a/repos/libports/recipes/pkg/test-sequence/runtime b/repos/libports/recipes/pkg/test-sequence/runtime index 062f196ddf..746ad9004a 100644 --- a/repos/libports/recipes/pkg/test-sequence/runtime +++ b/repos/libports/recipes/pkg/test-sequence/runtime @@ -35,35 +35,31 @@ <service name="LOG"/> </parent-provides> <default-route> <any-service> <parent/> </any-service> </default-route> - <start name="log_1" caps="100"> + <start name="log_1" caps="100" ram="4M"> <binary name="vfs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> <log/> </vfs> <default-policy root="/" writeable="yes"/> </config> </start> - <start name="log_2" caps="100"> + <start name="log_2" caps="100" ram="4M"> <binary name="vfs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> <log/> </vfs> <default-policy writeable="yes"/> </config> </start> - <start name="log_3" caps="100"> + <start name="log_3" caps="100" ram="4M"> <binary name="vfs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> <log/> </vfs> <default-policy writeable="yes"/> </config> </start> - <start name="sequence" caps="200"> - <resource name="RAM" quantum="16M"/> + <start name="sequence" caps="200" ram="16M"> <route> <service name="File_system" label_prefix="test_1"> <child name="log_1"/> </service> diff --git a/repos/libports/recipes/pkg/test-spark/runtime b/repos/libports/recipes/pkg/test-spark/runtime index 6715e1eff2..3ffde438ac 100644 --- a/repos/libports/recipes/pkg/test-spark/runtime +++ b/repos/libports/recipes/pkg/test-spark/runtime @@ -20,8 +20,6 @@ <any-service> <parent/> </any-service> </default-route> <default caps="100"/> - <start name="test-spark"> - <resource name="RAM" quantum="10M"/> - </start> + <start name="test-spark" ram="10M"/> </config> </runtime> diff --git a/repos/libports/recipes/pkg/test-spark_exception/runtime b/repos/libports/recipes/pkg/test-spark_exception/runtime index 780fa71884..0787177879 100644 --- a/repos/libports/recipes/pkg/test-spark_exception/runtime +++ b/repos/libports/recipes/pkg/test-spark_exception/runtime @@ -25,8 +25,6 @@ <any-service> <parent/> </any-service> </default-route> <default caps="100"/> - <start name="test-spark_exception"> - <resource name="RAM" quantum="10M"/> - </start> + <start name="test-spark_exception" ram="10M"/> </config> </runtime> diff --git a/repos/libports/recipes/pkg/test-spark_secondary_stack/runtime b/repos/libports/recipes/pkg/test-spark_secondary_stack/runtime index 1167688d87..d77ae26c87 100644 --- a/repos/libports/recipes/pkg/test-spark_secondary_stack/runtime +++ b/repos/libports/recipes/pkg/test-spark_secondary_stack/runtime @@ -23,8 +23,6 @@ <any-service> <parent/> </any-service> </default-route> <default caps="100"/> - <start name="test-spark_secondary_stack"> - <resource name="RAM" quantum="10M"/> - </start> + <start name="test-spark_secondary_stack" ram="10M"/> </config> </runtime> diff --git a/repos/libports/recipes/pkg/test-stdcxx/runtime b/repos/libports/recipes/pkg/test-stdcxx/runtime index bb6bd197ab..9d2b68efcd 100644 --- a/repos/libports/recipes/pkg/test-stdcxx/runtime +++ b/repos/libports/recipes/pkg/test-stdcxx/runtime @@ -24,8 +24,7 @@ <any-service> <parent/> </any-service> </default-route> <default caps="100"/> - <start name="test-stdcxx"> - <resource name="RAM" quantum="10M"/> + <start name="test-stdcxx" ram="10M"> <config> <vfs> <dir name="dev"> <log/> </dir> </vfs> <libc stdout="/dev/log"/> diff --git a/repos/libports/recipes/pkg/test-tcp_bulk_lwip/runtime b/repos/libports/recipes/pkg/test-tcp_bulk_lwip/runtime index 1d7f223382..615a901e29 100644 --- a/repos/libports/recipes/pkg/test-tcp_bulk_lwip/runtime +++ b/repos/libports/recipes/pkg/test-tcp_bulk_lwip/runtime @@ -32,12 +32,10 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="256"/> - <start name="nic_loopback"> - <resource name="RAM" quantum="1M"/> + <start name="nic_loopback" ram="1M"> <provides> <service name="Nic"/> </provides> </start> - <start name="nic_bridge"> - <resource name="RAM" quantum="10M"/> + <start name="nic_bridge" ram="10M"> <provides><service name="Nic"/></provides> <config verbose="no"> <policy label_prefix="sequence -> local -> recv" ip_addr="192.168.1.1"/> @@ -51,13 +49,11 @@ </route> </start> - <start name="sequence" caps="1800"> - <resource name="RAM" quantum="260M"/> + <start name="sequence" caps="1800" ram="260M"> <config> <start name="local" caps="1000"> <binary name="init"/> - <resource name="RAM" quantum="100M"/> <config> <parent-provides> <service name="ROM"/> @@ -73,9 +69,8 @@ </default-route> <default caps="256"/> - <start name="recv"> + <start name="recv" ram="32M"> <binary name="test-tcp"/> - <resource name="RAM" quantum="32M"/> <exit propagate="yes"/> <config> <arg value="recv"/> @@ -89,9 +84,8 @@ </config> </start> - <start name="send"> + <start name="send" ram="32M"> <binary name="test-tcp"/> - <resource name="RAM" quantum="32M"/> <config> <arg value="send"/> <arg value="192.168.1.1"/> @@ -109,7 +103,6 @@ <start name="remote" caps="1000"> <binary name="init"/> - <resource name="RAM" quantum="150M"/> <config> <parent-provides> <service name="ROM"/> @@ -125,9 +118,8 @@ </default-route> <default caps="256"/> - <start name="recv_fs" caps="150"> + <start name="recv_fs" caps="150" ram="16M"> <binary name="vfs"/> - <resource name="RAM" quantum="16M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -137,9 +129,8 @@ </config> </start> - <start name="send_fs" caps="150"> + <start name="send_fs" caps="150" ram="16M"> <binary name="vfs"/> - <resource name="RAM" quantum="16M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -149,9 +140,8 @@ </config> </start> - <start name="recv"> + <start name="recv" ram="16M"> <binary name="test-tcp"/> - <resource name="RAM" quantum="16M"/> <exit propagate="yes"/> <config> <arg value="recv"/> @@ -167,9 +157,8 @@ </route> </start> - <start name="send"> + <start name="send" ram="16M"> <binary name="test-tcp"/> - <resource name="RAM" quantum="16M"/> <config> <arg value="send"/> <arg value="192.168.1.1"/> diff --git a/repos/libports/recipes/pkg/test-tcp_bulk_lxip/runtime b/repos/libports/recipes/pkg/test-tcp_bulk_lxip/runtime index 2a22908ed9..ad6758b552 100644 --- a/repos/libports/recipes/pkg/test-tcp_bulk_lxip/runtime +++ b/repos/libports/recipes/pkg/test-tcp_bulk_lxip/runtime @@ -32,12 +32,10 @@ <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <start name="nic_loopback" caps="80"> - <resource name="RAM" quantum="1M"/> + <start name="nic_loopback" caps="80" ram="1M"> <provides> <service name="Nic"/> </provides> </start> - <start name="nic_bridge" caps="100"> - <resource name="RAM" quantum="10M"/> + <start name="nic_bridge" caps="100" ram="10M"> <provides><service name="Nic"/></provides> <config verbose="no"> <policy label_prefix="sequence -> local -> recv" ip_addr="192.168.1.1"/> @@ -51,13 +49,11 @@ </route> </start> - <start name="sequence" caps="1800"> - <resource name="RAM" quantum="100M"/> + <start name="sequence" caps="1800" ram="100M"> <config> <start name="local" caps="800"> <binary name="init"/> - <resource name="RAM" quantum="36M"/> <config> <parent-provides> <service name="ROM"/> @@ -73,9 +69,8 @@ </default-route> <default caps="256"/> - <start name="recv"> + <start name="recv" ram="16M"> <binary name="test-tcp"/> - <resource name="RAM" quantum="16M"/> <exit propagate="yes"/> <config> <arg value="recv"/> @@ -89,9 +84,8 @@ </config> </start> - <start name="send"> + <start name="send" ram="16M"> <binary name="test-tcp"/> - <resource name="RAM" quantum="16M"/> <config> <arg value="send"/> <arg value="192.168.1.1"/> @@ -109,7 +103,6 @@ <start name="remote" caps="800"> <binary name="init"/> - <resource name="RAM" quantum="60M"/> <config> <parent-provides> <service name="ROM"/> @@ -125,9 +118,8 @@ </default-route> <default caps="200"/> - <start name="recv_fs"> + <start name="recv_fs" ram="10M"> <binary name="vfs"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -137,9 +129,8 @@ </config> </start> - <start name="send_fs"> + <start name="send_fs" ram="10M"> <binary name="vfs"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -149,9 +140,8 @@ </config> </start> - <start name="recv"> + <start name="recv" ram="10M"> <binary name="test-tcp"/> - <resource name="RAM" quantum="10M"/> <exit propagate="yes"/> <config> <arg value="recv"/> @@ -167,9 +157,8 @@ </route> </start> - <start name="send"> + <start name="send" ram="10M"> <binary name="test-tcp"/> - <resource name="RAM" quantum="10M"/> <config> <arg value="send"/> <arg value="192.168.1.1"/> diff --git a/repos/libports/recipes/pkg/usb_webcam/runtime b/repos/libports/recipes/pkg/usb_webcam/runtime index aaf9eae234..5658803526 100644 --- a/repos/libports/recipes/pkg/usb_webcam/runtime +++ b/repos/libports/recipes/pkg/usb_webcam/runtime @@ -35,9 +35,8 @@ <service name="Capture"> <default-policy> <child name="nitpicker_camera"/> </default-policy> </service> - <start name="nitpicker_camera" caps="150"> + <start name="nitpicker_camera" caps="150" ram="4M"> <binary name="nitpicker"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="Gui"/> <service name="Capture"/> </provides> @@ -53,9 +52,8 @@ </route> </start> - <start name="report_rom"> + <start name="report_rom" ram="2M"> <binary name="report_rom"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="no"> <policy label="webcam_config -> panorama" report="nitpicker_camera -> panorama"/> @@ -65,9 +63,8 @@ </route> </start> - <start name="webcam_config"> + <start name="webcam_config" ram="1M"> <binary name="rom_filter"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="ROM"/> </provides> <config verbose="no"> <input name="capture_width" rom="panorama" node="panorama" default=""> @@ -91,8 +88,7 @@ <service name="Gui"/> <service name="Usb"/> </parent-provides> - <start name="usb_webcam" caps="300"> - <resource name="RAM" quantum="52M"/> + <start name="usb_webcam" caps="300" ram="52M"> <config ld_verbose="no" enabled="yes" width="640" height="480" format="yuv" fps="15"> <vfs> <dir name="dev"> @@ -119,9 +115,8 @@ </route> </start> - <start name="webcam" caps="400"> + <start name="webcam" caps="400" ram="54M"> <binary name="init"/> - <resource name="RAM" quantum="54M"/> <route> <service name="ROM" label="config"> <child name="webcam_config" label="config"/> diff --git a/repos/libports/recipes/raw/sntp_dummy_rtc/ntp_rtc.config b/repos/libports/recipes/raw/sntp_dummy_rtc/ntp_rtc.config index ef35d7f243..e3feed60cf 100644 --- a/repos/libports/recipes/raw/sntp_dummy_rtc/ntp_rtc.config +++ b/repos/libports/recipes/raw/sntp_dummy_rtc/ntp_rtc.config @@ -12,8 +12,7 @@ <service name="Rtc"> <default-policy> <child name="dummy_rtc"/> </default-policy> </service> - <start name="report_rom" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="report_rom" caps="100" ram="1M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config> <policy label_suffix="set_rtc" report="sntp_client -> set_rtc"/> @@ -21,8 +20,7 @@ <route> <any-service> <parent/> </any-service> </route> </start> - <start name="dummy_rtc" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="dummy_rtc" caps="100" ram="1M"> <provides> <service name="Rtc"/> </provides> <config allow_setting_rtc="true"/> <route> @@ -31,8 +29,7 @@ </route> </start> - <start name="sntp_client" caps="100"> - <resource name="RAM" quantum="4M"/> + <start name="sntp_client" caps="100" ram="4M"> <config verbose="no" dst_addr="pool.ntp.org" period_min="5"/> <route> <service name="Report"> <child name="report_rom"/> </service> diff --git a/repos/libports/recipes/raw/system_rtc-linux/system_rtc.config b/repos/libports/recipes/raw/system_rtc-linux/system_rtc.config index 678d977cd5..245d05d3a7 100644 --- a/repos/libports/recipes/raw/system_rtc-linux/system_rtc.config +++ b/repos/libports/recipes/raw/system_rtc-linux/system_rtc.config @@ -9,13 +9,12 @@ <service name="Timer"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <service name="Rtc"> <default-policy> <child name="system_rtc"/> </default-policy> </service> <service name="Report"> <default-policy> <child name="report_rom"/> </default-policy> </service> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"> <policy label="linux_rtc -> set_rtc" report="test-system_rtc -> drv_set_rtc"/> @@ -27,7 +26,6 @@ </start> <start name="linux_rtc" ld="no"> - <resource name="RAM" quantum="1M"/> <provides><service name="Rtc"/></provides> <config allow_setting_rtc="true"/> <route> @@ -37,7 +35,6 @@ </start> <start name="system_rtc"> - <resource name="RAM" quantum="1M"/> <provides><service name="Rtc"/></provides> <config allow_setting_rtc="true"/> <route> diff --git a/repos/libports/recipes/raw/system_rtc-pc/system_rtc.config b/repos/libports/recipes/raw/system_rtc-pc/system_rtc.config index 2f70c9281b..d8a0d70885 100644 --- a/repos/libports/recipes/raw/system_rtc-pc/system_rtc.config +++ b/repos/libports/recipes/raw/system_rtc-pc/system_rtc.config @@ -12,13 +12,12 @@ <service name="Timer"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <service name="Rtc"> <default-policy> <child name="system_rtc"/> </default-policy> </service> <service name="Report"> <default-policy> <child name="report_rom"/> </default-policy> </service> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"> <policy label="pc_rtc -> set_rtc" report="test-system_rtc -> drv_set_rtc"/> @@ -30,7 +29,6 @@ </start> <start name="pc_rtc"> - <resource name="RAM" quantum="1M"/> <provides><service name="Rtc"/></provides> <config allow_setting_rtc="true"/> <route> @@ -40,7 +38,6 @@ </start> <start name="system_rtc"> - <resource name="RAM" quantum="1M"/> <provides><service name="Rtc"/></provides> <config allow_setting_rtc="true"/> <route> diff --git a/repos/libports/run/acpi_suspend.run b/repos/libports/run/acpi_suspend.run index b836538b22..ee644a4e94 100644 --- a/repos/libports/run/acpi_suspend.run +++ b/repos/libports/run/acpi_suspend.run @@ -65,12 +65,11 @@ proc display_config { } { if {$board_non_intel} { return { - <start name="fb" caps="1000"> + <start name="fb" caps="1000" ram="60M"> <binary name="vesa_fb"/> <!-- <binary name="boot_fb"/> --> - <resource name="RAM" quantum="60M"/> <config ld_verbose="yes" width="1280" height="1024"> <report connectors="yes"/> </config> @@ -83,9 +82,8 @@ proc display_config { } { } return { - <start name="intel_fb" caps="1000"> + <start name="intel_fb" caps="1000" ram="60M"> <binary name="pc_intel_fb"/> - <resource name="RAM" quantum="60M"/> <config ld_verbose="yes" width="1024" height="768" system="yes"> <report connectors="yes"/> </config> @@ -124,8 +122,7 @@ proc restartable_drivers { } { } [input_config] { } [wifi_config] { - <start name="nano3d" caps="100"> - <resource name="RAM" quantum="8M"/> + <start name="nano3d" caps="100" ram="8M"> <route> <any-service> <parent/> </any-service> </route> @@ -143,8 +140,7 @@ proc gui_config { } { append return_gui { - <start name="nitpicker" caps="120" } [priority_gui] {> - <resource name="RAM" quantum="8M"/> + <start name="nitpicker" caps="120" ram="8M" } [priority_gui] {> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -166,8 +162,7 @@ proc gui_config { } { </route> </start> - <start name="pointer" caps="100" } [priority_gui] {> - <resource name="RAM" quantum="2M"/> + <start name="pointer" caps="100" ram="2M" } [priority_gui] {> <provides> <service name="Report"/> </provides> <config shapes="yes" verbose="no"/> <route> @@ -178,9 +173,8 @@ proc gui_config { } { </route> </start> - <start name="gui_reports" caps="100" } [priority_gui] {> + <start name="gui_reports" caps="100" ram="1M" } [priority_gui] {> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config> <policy label="pointer -> hover" report="nitpicker -> hover"/> @@ -189,8 +183,7 @@ proc gui_config { } { </config> </start> - <start name="wm" caps="1000" } [priority_wm] {> - <resource name="RAM" quantum="32M"/> + <start name="wm" caps="1000" ram="32M" } [priority_wm] {> <binary name="init"/> <provides> <service name="Gui"/> <service name="Report"/> <service name="ROM"/> @@ -211,8 +204,7 @@ proc gui_config { } { proc input_config { } { return { - <start name="ps2" caps="100"> - <resource name="RAM" quantum="3M"/> + <start name="ps2" caps="100" ram="3M"> <config/> <route> <service name="Platform"> <parent/> </service> @@ -221,8 +213,7 @@ proc input_config { } { </route> </start> - <start name="event_filter" caps="100"> - <resource name="RAM" quantum="1280K"/> + <start name="event_filter" caps="100" ram="1280M"> <provides> <service name="Event"/> </provides> <route> <service name="ROM" label="config"> <parent label="event_filter.config"/> </service> @@ -239,8 +230,7 @@ proc log_output { } { set return_log "" append return_log { - <start name="log_core" caps="100" } [priority_log] {> - <resource name="RAM" quantum="10M"/> + <start name="log_core" caps="100" ram="10M" } [priority_log] {> <config period_ms="2000"/> <route> <service name="ROM" unscoped_label="log_core"> <parent/> </service> @@ -254,8 +244,7 @@ proc log_output { } { </route> </start> - <start name="terminal_log" caps="100" } [priority_log] {> - <resource name="RAM" quantum="1M"/> + <start name="terminal_log" caps="100" ram="1M" } [priority_log] {> <provides> <service name="LOG"/> </provides> <config/> <route> @@ -264,8 +253,7 @@ proc log_output { } { </route> </start> - <start name="terminal" caps="110" } [priority_log] {> - <resource name="RAM" quantum="6M"/> + <start name="terminal" caps="110" ram="6M" } [priority_log] {> <provides><service name="Terminal"/></provides> <config> <initial width="1200" height="780"/> @@ -290,9 +278,8 @@ proc log_output { } { } append_if [have_spec nova] return_log { - <start name="log_kernel" caps="100" } [priority_log] {> + <start name="log_kernel" caps="100" ram="10M" } [priority_log] {> <binary name="log_core"/> - <resource name="RAM" quantum="10M"/> <config period_ms="2000"/> <route> <service name="ROM" unscoped_label="log_core"> <parent/> </service> @@ -321,8 +308,7 @@ proc ahci_config { } { } append return_ahci { - <start name="ahci" caps="300" } [priority_drivers] {> - <resource name="RAM" quantum="12M" /> + <start name="ahci" caps="300" ram="12M" } [priority_drivers] {> <provides><service name="Block" /></provides> <config atapi="yes" system="yes"> <report ports="yes"/> @@ -347,9 +333,8 @@ proc ahci_config { } { } append return_ahci { - <start name="test-ahci" caps="200" } [priority_scenario] {> + <start name="test-ahci" caps="200" ram="50M" } [priority_scenario] {> <binary name="block_tester" /> - <resource name="RAM" quantum="50M" /> <config verbose="yes" report="no" log="yes" stop_on_error="no"> <tests> <random size="128K" length="1024G" seed="0xaffeaffe" batch="8"/> @@ -377,8 +362,7 @@ proc nvme_config { } { } append return_nvme { - <start name="nvme" caps="300" } [priority_drivers] {> - <resource name="RAM" quantum="24M"/> + <start name="nvme" caps="300" ram="24M" } [priority_drivers] {> <provides> <service name="Block"/> </provides> <config max_hmb_size="16M" verbose_regs="yes" verbose_identify="yes" system="yes"> <policy label="test-nvme -> " writeable="no"/> @@ -402,9 +386,8 @@ proc nvme_config { } { } append return_nvme { - <start name="test-nvme" caps="200" } [priority_scenario] {> + <start name="test-nvme" caps="200" ram="50M" } [priority_scenario] {> <binary name="block_tester" /> - <resource name="RAM" quantum="50M" /> <config verbose="yes" report="no" log="yes" stop_on_error="no"> <tests> <random size="128K" length="1024G" seed="0xaffeaffe" batch="8"/> @@ -429,9 +412,8 @@ proc gpu_config { } { set return_gpu "" append return_gpu { - <start name="gpu" caps="2000" } [priority_drivers] {> + <start name="gpu" caps="2000" ram="40M" } [priority_drivers] {> <binary name="intel_gpu"/> - <resource name="RAM" quantum="40M"/> <provides> <service name="Gpu"/> <service name="Platform"/> @@ -473,8 +455,7 @@ proc gpu_client { } { set return_gpu "" append return_gpu { - <start name="glmark2" caps="500" } [priority_scenario] {> - <resource name="RAM" quantum="240M"/> + <start name="glmark2" caps="500" ram="240M" } [priority_scenario] {> <config> <vfs> <dir name="dev"> @@ -516,15 +497,13 @@ proc wifi_config { } { if {!$use_wifi} { return $return_wifi } append return_wifi { - <start name="pc_rtc" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="pc_rtc" caps="100" ram="1M"> <provides> <service name="Rtc"/> </provides> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="config_rom" caps="100"> + <start name="config_rom" caps="100" ram="4M"> <binary name="dynamic_rom"/> - <resource name="RAM" quantum="4M"/> <provides><service name="ROM"/></provides> <config verbose="no"> <rom name="wifi_config"> @@ -536,8 +515,7 @@ proc wifi_config { } { <route> <any-service> <parent/> </any-service> </route> </start> - <start name="wifi" caps="260" priority="-1"> - <resource name="RAM" quantum="32M"/> + <start name="wifi" caps="260" priority="-1" ram="32M"> <config ld_verbose="no"> <report mac_address="true"/> <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" rng="/dev/urandom"/> @@ -632,15 +610,13 @@ append config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <start name="timer" caps="100" } [priority_timer] {> + <start name="timer" caps="100" ram="1M" } [priority_timer] {> <resource name="CPU" quantum="10"/> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers_reports" caps="100" } [priority_base] {> + <start name="drivers_reports" caps="100" ram="1M" } [priority_base] {> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> @@ -654,8 +630,7 @@ append config { </config> </start> - <start name="acpi" caps="350" } [priority_base] {> - <resource name="RAM" quantum="5M"/> + <start name="acpi" caps="350" ram="5M" } [priority_base] {> <config report="yes"/> <route> <service name="Report"> <child name="drivers_reports"/> </service> @@ -663,8 +638,7 @@ append config { </route> </start> - <start name="pci_decode" caps="350" } [priority_base] {> - <resource name="RAM" quantum="1M"/> + <start name="pci_decode" caps="350" ram="1M" } [priority_base] {> <route> <service name="ROM" label="system"> <child name="drivers_reports"/> </service> <service name="Report"> <child name="drivers_reports"/> </service> @@ -672,9 +646,8 @@ append config { </route> </start> - <start name="platform" caps="300" managing_system="yes" } [priority_base] {> + <start name="platform" caps="300" managing_system="yes" ram="8M" } [priority_base] {> <binary name="pc_platform"/> - <resource name="RAM" quantum="8M"/> <provides> <service name="Platform"/> </provides> @@ -712,9 +685,8 @@ append config { } [ ahci_config] { } [ nvme_config] { - <start name="drivers_init" caps="10000" } [priority_drivers] {> + <start name="drivers_init" caps="10000" ram="128M" } [priority_drivers] {> <binary name="init"/> - <resource name="RAM" quantum="128M"/> <route> <service name="Report"> <child name="drivers_reports"/> @@ -747,9 +719,8 @@ append config { </route> </start> - <start name="drivers_init_config" caps="100" } [priority_config] {> + <start name="drivers_init_config" caps="100" ram="1M" } [priority_config] {> <binary name="rom_filter"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="ROM"/> </provides> <config verbose="yes"> <input name="check_system" rom="system" node="system" default=""> @@ -778,8 +749,7 @@ append config { </route> </start> - <start name="acpica" caps="200" } [priority_scenario] {> - <resource name="RAM" quantum="8M"/> + <start name="acpica" caps="200" ram="8M" } [priority_scenario] {> <config ld_verbose="yes" sleep="yes" reset="no" poweroff="no" report="yes" acpi_ready="no" use_gpe="} $use_gpe {"> </config> <route> @@ -790,8 +760,7 @@ append config { </route> </start> - <start name="dynamic_rom" caps="100" } [priority_config] {> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" caps="100" ram="4M" } [priority_config] {> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="system"> diff --git a/repos/libports/run/acpica.run b/repos/libports/run/acpica.run index 336353ece0..2997dcbc05 100644 --- a/repos/libports/run/acpica.run +++ b/repos/libports/run/acpica.run @@ -44,14 +44,12 @@ set config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <start name="timer" caps="100"> - <resource name="RAM" quantum="2M"/> + <start name="timer" caps="100" ram="2M"> <provides><service name="Timer"/></provides> </start> - <start name="drivers_reports" caps="100"> + <start name="drivers_reports" caps="100" ram="1M"> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> @@ -63,16 +61,14 @@ set config { </config> </start> - <start name="acpi" caps="350"> - <resource name="RAM" quantum="4M"/> + <start name="acpi" caps="350" ram="4M"> <route> <service name="Report"> <child name="drivers_reports"/> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="pci_decode" caps="350"> - <resource name="RAM" quantum="2M"/> + <start name="pci_decode" caps="350" ram="2M"> <route> <service name="ROM" label="system"> <child name="drivers_reports"/> </service> <service name="Report"> <child name="drivers_reports"/> </service> @@ -80,8 +76,7 @@ set config { </route> </start> - <start name="platform" caps="400" managing_system="yes"> - <resource name="RAM" quantum="4M"/> + <start name="platform" caps="400" managing_system="yes" ram="4M"> <provides> <service name="Platform"/> </provides> @@ -96,8 +91,7 @@ set config { </route> </start> - <start name="ps2" caps="100"> - <resource name="RAM" quantum="2M"/> + <start name="ps2" caps="100" ram="2M"> <config verbose_keyboard="no" verbose_mouse="no" verbose_scancodes="no"/> <route> <service name="Platform"> <child name="platform"/> </service> @@ -107,9 +101,8 @@ set config { </route> </start> - <start name="usb" caps="200"> + <start name="usb" caps="200" ram="20M"> <binary name="pc_usb_host"/> - <resource name="RAM" quantum="20M"/> <provides> <service name="Usb"/> </provides> <config bios_handoff="no"> <report devices="yes"/> @@ -121,8 +114,7 @@ set config { </route> </start> - <start name="usb_hid" caps="140"> - <resource name="RAM" quantum="10M"/> + <start name="usb_hid" caps="140" ram="10M"> <route> <service name="ROM" label="report"> <child name="drivers_reports"/> </service> <service name="Event"> <child name="event_filter" label="usb"/> </service> @@ -131,8 +123,7 @@ set config { </route> </start> - <start name="event_filter" caps="100"> - <resource name="RAM" quantum="1M" /> + <start name="event_filter" caps="100" ram="1M"> <provides> <service name="Event" /> </provides> <config> <output> @@ -152,8 +143,7 @@ set config { </route> </start> - <start name="event_dump" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="event_dump" caps="100" ram="1M"> <provides> <service name="Event"/> </provides> <route> <service name="Timer"> <child name="timer"/> </service> @@ -161,8 +151,7 @@ set config { </route> </start> - <start name="acpica" caps="400"> - <resource name="RAM" quantum="8M"/> + <start name="acpica" caps="400" ram="8M"> <config ld_verbose="yes" reset="yes" poweroff="yes" report="yes" report_period_ms="0" verbose="yes"> </config> @@ -173,9 +162,8 @@ set config { </route> </start> - <start name="acpi_state" caps="100"> + <start name="acpi_state" caps="100" ram="2M"> <binary name="report_rom"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="ROM" /> <service name="Report" /> @@ -193,8 +181,7 @@ set config { </route> </start> - <start name="acpi_event" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="acpi_event" caps="100" ram="1M"> <config> <!-- example mapping - adapt to your target notebook !!! --> <!-- as="PRESS_RELEASE" is default if nothing specified --> @@ -221,8 +208,7 @@ set config { </route> </start> - <start name="dynamic_rom" caps="100"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" caps="100" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="system"> diff --git a/repos/libports/run/extract.run b/repos/libports/run/extract.run index 6db30811a9..761955c307 100644 --- a/repos/libports/run/extract.run +++ b/repos/libports/run/extract.run @@ -19,8 +19,7 @@ install_config { <default-route> <any-service> <parent/> </any-service> </default-route> - <start name="extract" caps="200"> - <resource name="RAM" quantum="12M"/> + <start name="extract" caps="200" ram="12M"> <config verbose="yes"> <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/null" update_mtime="no"/> diff --git a/repos/libports/run/fatfs_blkio.run b/repos/libports/run/fatfs_blkio.run index 642f0e7c50..98cd95d734 100644 --- a/repos/libports/run/fatfs_blkio.run +++ b/repos/libports/run/fatfs_blkio.run @@ -28,19 +28,16 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="128"/> - <start name="timer"> - <resource name="RAM" quantum="1M"/> + <start name="timer" ram="1M"> <provides><service name="Timer"/></provides> </start> - <start name="test-fatfs_block_io"> - <resource name="RAM" quantum="10M"/> + <start name="test-fatfs_block_io" ram="10M"> <config ld_verbose="true"> <libc stdout="/log" stderr="/log"/> <vfs> <log/> </vfs> </config> </start> - <start name="vfs_block"> - <resource name="RAM" quantum="4M" /> + <start name="vfs_block" ram="4M"> <provides><service name="Block"/></provides> <config> <vfs> diff --git a/repos/libports/run/fetchurl.inc b/repos/libports/run/fetchurl.inc index a9ce37e02a..a94606727c 100644 --- a/repos/libports/run/fetchurl.inc +++ b/repos/libports/run/fetchurl.inc @@ -69,19 +69,17 @@ install_config { <service name="RM"/> <service name="ROM"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <default-route> <service name="Report"> <child name="report_rom"/> </service> <any-service> <parent/> <any-child/> </any-service> </default-route> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="drivers" caps="1200" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1200" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="Uplink"> <child name="nic_router"/> </service> @@ -91,8 +89,7 @@ install_config { </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -124,14 +121,12 @@ install_config { </config> </start> - <start name="report_rom"> - <resource name="RAM" quantum="4M"/> + <start name="report_rom" ram="4M"> <provides> <service name="ROM"/> <service name="Report"/> </provides> <config verbose="yes"/> </start> - <start name="fetchurl" caps="500"> - <resource name="RAM" quantum="32M"/> + <start name="fetchurl" caps="500" ram="32M"> <config> <report progress="yes"/> <vfs> diff --git a/repos/libports/run/fs_rom_update_fat.run b/repos/libports/run/fs_rom_update_fat.run index 1a2ceb4e53..580a2d1c9d 100644 --- a/repos/libports/run/fs_rom_update_fat.run +++ b/repos/libports/run/fs_rom_update_fat.run @@ -32,13 +32,11 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="vfs_block"> - <resource name="RAM" quantum="8M"/> + <start name="vfs_block" ram="8M"> <provides><service name="Block"/></provides> <config> <vfs> @@ -51,8 +49,7 @@ install_config { writeable="yes"/> </config> </start> - <start name="vfs"> - <resource name="RAM" quantum="10M"/> + <start name="vfs" ram="10M"> <provides><service name="File_system"/></provides> <config> <vfs> <fatfs/> </vfs> @@ -60,8 +57,7 @@ install_config { <policy label_prefix="fs_rom" root="/" writeable="no"/> </config> </start> - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="dynamic_rom"> @@ -84,8 +80,7 @@ install_config { </rom> </config> </start> - <start name="rom_to_file"> - <resource name="RAM" quantum="2M"/> + <start name="rom_to_file" ram="2M"> <config rom="dynamic_rom"> <vfs> <fs/> </vfs> </config> @@ -96,8 +91,7 @@ install_config { </route> </start> - <start name="fs_rom"> - <resource name="RAM" quantum="2M"/> + <start name="fs_rom" ram="2M"> <provides><service name="ROM"/></provides> <route> <service name="File_system" > <child name="vfs"/> </service> @@ -105,7 +99,6 @@ install_config { </route> </start> <start name="rom_logger"> - <resource name="RAM" quantum="1M"/> <config rom="dynamic_rom"/> <route> <service name="ROM" label="dynamic_rom"> <child name="fs_rom"/> </service> diff --git a/repos/libports/run/ieee754.run b/repos/libports/run/ieee754.run index 3c52674fde..2a4bdfb5c2 100644 --- a/repos/libports/run/ieee754.run +++ b/repos/libports/run/ieee754.run @@ -23,33 +23,29 @@ install_config { <any-service> <parent/> </any-service> </default-route> <default caps="100"/> - <start name="test1"> + <start name="test1" ram="2144K"> <binary name="test-ieee754"/> - <resource name="RAM" quantum="2144K"/> <config> <vfs> <dir name="dev"><log/></dir></vfs> <libc stdout="/dev/log"/> </config> </start> - <start name="test2"> + <start name="test2" ram="2144K"> <binary name="test-ieee754"/> - <resource name="RAM" quantum="2144K"/> <config> <vfs> <dir name="dev"><log/></dir></vfs> <libc stdout="/dev/log"/> </config> </start> - <start name="test3"> + <start name="test3" ram="2144K"> <binary name="test-ieee754"/> - <resource name="RAM" quantum="2144K"/> <config> <vfs> <dir name="dev"><log/></dir></vfs> <libc stdout="/dev/log"/> </config> </start> - <start name="test4"> + <start name="test4" ram="2144K"> <binary name="test-ieee754"/> - <resource name="RAM" quantum="2144K"/> <config> <vfs> <dir name="dev"><log/></dir></vfs> <libc stdout="/dev/log"/> diff --git a/repos/libports/run/libc.run b/repos/libports/run/libc.run index c10ab35fea..b9dc670472 100644 --- a/repos/libports/run/libc.run +++ b/repos/libports/run/libc.run @@ -17,13 +17,11 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="200"/> + <default caps="200" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="test-libc"> - <resource name="RAM" quantum="400M"/> + <start name="test-libc" ram="400M"> <config> <vfs> <dir name="dev"> <log/> <inline name="rtc">2019-08-20 15:01</inline> </dir> </vfs> <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/> diff --git a/repos/libports/run/libc_block.run b/repos/libports/run/libc_block.run index ebb3f19a77..83f04119e0 100644 --- a/repos/libports/run/libc_block.run +++ b/repos/libports/run/libc_block.run @@ -26,13 +26,11 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="200"/> + <default caps="200" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="test-libc_block"> - <resource name="RAM" quantum="2M"/> + <start name="test-libc_block" ram="2M"> <config> <libc stdout="/dev/log"/> <vfs> @@ -43,8 +41,7 @@ install_config { </vfs> </config> </start> - <start name="vfs_block"> - <resource name="RAM" quantum="68M"/> + <start name="vfs_block" ram="68M"> <provides><service name="Block"/></provides> <config> <vfs> diff --git a/repos/libports/run/libc_component.run b/repos/libports/run/libc_component.run index 6f70208cb6..ee41fe461a 100644 --- a/repos/libports/run/libc_component.run +++ b/repos/libports/run/libc_component.run @@ -17,19 +17,16 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> <start name="terminal_crosslink"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Terminal"/> </provides> </start> - <start name="test-libc_component"> - <resource name="RAM" quantum="8M"/> + <start name="test-libc_component" ram="8M"> <provides> <service name="LOG"/> </provides> <config ld_verbose="yes"> <vfs> @@ -39,9 +36,8 @@ install_config { <libc stdin="/dev/log" stdout="/dev/log" stderr="/dev/log"/> </config> </start> - <start name="counter-terminal"> + <start name="counter-terminal" ram="8M"> <binary name="test-libc_counter-source"/> - <resource name="RAM" quantum="8M"/> <config> <vfs> <dir name="dev"> <terminal/> <log/> </dir> @@ -49,9 +45,8 @@ install_config { <libc stdin="/dev/terminal" stdout="/dev/terminal" stderr="/dev/log"/> </config> </start> - <start name="counter-log"> + <start name="counter-log" ram="8M"> <binary name="test-libc_counter-source"/> - <resource name="RAM" quantum="8M"/> <config> <vfs> <dir name="dev"> <log/> <log name="log2" label="2"/> </dir> diff --git a/repos/libports/run/libc_getaddrinfo.run b/repos/libports/run/libc_getaddrinfo.run index 1bca7575f9..9ae9acca3d 100644 --- a/repos/libports/run/libc_getaddrinfo.run +++ b/repos/libports/run/libc_getaddrinfo.run @@ -32,15 +32,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="128"/> + <default caps="128" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="drivers" caps="1000" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1000" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -50,8 +48,7 @@ install_config { </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -86,8 +83,7 @@ install_config { </config> </start> - <start name="test-libc_getaddrinfo" caps="256"> - <resource name="RAM" quantum="16M"/> + <start name="test-libc_getaddrinfo" caps="256" ram="16M"> <config> <vfs> <dir name="dev"> <log/> </dir> diff --git a/repos/libports/run/libc_getpwent.run b/repos/libports/run/libc_getpwent.run index ac8f3bff4d..9fd4069eaa 100644 --- a/repos/libports/run/libc_getpwent.run +++ b/repos/libports/run/libc_getpwent.run @@ -19,9 +19,8 @@ install_config { </default-route> <default caps="128"/> - <start name="fs"> + <start name="fs" ram="4M"> <binary name="vfs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> <log label="log"/> </vfs> @@ -29,9 +28,8 @@ install_config { </config> </start> - <start name="test" caps="1000"> + <start name="test" caps="1000" ram="4M"> <binary name="sequence"/> - <resource name="RAM" quantum="4M"/> <config> <start name="root"> diff --git a/repos/libports/run/libc_integration.run b/repos/libports/run/libc_integration.run index 736410a16f..547bc02b39 100644 --- a/repos/libports/run/libc_integration.run +++ b/repos/libports/run/libc_integration.run @@ -72,14 +72,12 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="200"/> + <default caps="200" ram="1M"/> <start name="timer"> <resource name="CPU" quantum="20"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="test-libc_integration" caps="400" priority="-1"> - <resource name="RAM" quantum="256M"/> + <start name="test-libc_integration" caps="400" ram="256M" priority="-1"> <config> <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" pipe="/dev/pipe"/> <arg value="test-libc_integration"/> diff --git a/repos/libports/run/libc_many_writes.run b/repos/libports/run/libc_many_writes.run index b75971b6fe..69c82ddff6 100644 --- a/repos/libports/run/libc_many_writes.run +++ b/repos/libports/run/libc_many_writes.run @@ -23,16 +23,14 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="128"/> + <default caps="128" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="ramfs"> + <start name="ramfs" ram="4M"> <binary name="vfs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -43,9 +41,8 @@ install_config { </config> </start> - <start name="fs"> + <start name="fs" ram="4M"> <binary name="vfs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -60,8 +57,7 @@ install_config { </route> </start> - <start name="test-libc_many_writes" caps="1000"> - <resource name="RAM" quantum="4M"/> + <start name="test-libc_many_writes" caps="1000" ram="4M"> <config> <vfs> <dir name="rw"> <fs/> </dir> diff --git a/repos/libports/run/libc_select.run b/repos/libports/run/libc_select.run index 80a1e09c32..02ccf39e36 100644 --- a/repos/libports/run/libc_select.run +++ b/repos/libports/run/libc_select.run @@ -20,19 +20,16 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> - <start name="timer"> - <resource name="RAM" quantum="2M"/> + <start name="timer" ram="2M"> <provides> <service name="Timer"/> </provides> </start> <start name="terminal_crosslink"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Terminal"/> </provides> </start> - <start name="test-libc_counter-source"> - <resource name="RAM" quantum="8M"/> + <start name="test-libc_counter-source" ram="8M"> <config> <vfs> <dir name="dev"> <terminal/> <log/> </dir> @@ -40,8 +37,7 @@ install_config { <libc stdin="/dev/terminal" stdout="/dev/terminal" stderr="/dev/log"/> </config> </start> - <start name="test-libc_select"> - <resource name="RAM" quantum="4M"/> + <start name="test-libc_select" ram="4M"> <config> <arg value="test-libc_select"/> <arg value="/dev/log"/> diff --git a/repos/libports/run/libc_vfs_component.run b/repos/libports/run/libc_vfs_component.run index 8d881568fd..b1194d7b85 100644 --- a/repos/libports/run/libc_vfs_component.run +++ b/repos/libports/run/libc_vfs_component.run @@ -17,18 +17,15 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> <start name="terminal_crosslink"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Terminal"/> </provides> </start> - <start name="vfs"> - <resource name="RAM" quantum="12M"/> + <start name="vfs" ram="12M"> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -39,9 +36,8 @@ install_config { </config> </start> - <start name="test-libc_component"> - <resource name="RAM" quantum="8M"/> - <provides> <service name="LOG"/> </provides> + <start name="test-libc_component" ram="8M"> + <provides> <service name="LOG"/> </provides> <config ld_verbose="yes"> <vfs> <dir name="dev"> <log/> </dir> @@ -50,9 +46,8 @@ install_config { <libc stdin="/dev/log" stdout="/dev/log" stderr="/dev/log"/> </config> </start> - <start name="counter-terminal"> + <start name="counter-terminal" ram="8M"> <binary name="test-libc_counter-source"/> - <resource name="RAM" quantum="8M"/> <config> <vfs> <dir name="dev"> <terminal/> <log/> </dir> @@ -60,9 +55,8 @@ install_config { <libc stdin="/dev/terminal" stdout="/dev/terminal" stderr="/dev/log"/> </config> </start> - <start name="counter-log"> + <start name="counter-log" ram="8M"> <binary name="test-libc_counter-source"/> - <resource name="RAM" quantum="8M"/> <config> <vfs> <dir name="dev"> <log/> <log name="log2" label="2"/> </dir> diff --git a/repos/libports/run/libc_vfs_filesystem_test.inc b/repos/libports/run/libc_vfs_filesystem_test.inc index 44e44c655c..89c90cff02 100644 --- a/repos/libports/run/libc_vfs_filesystem_test.inc +++ b/repos/libports/run/libc_vfs_filesystem_test.inc @@ -61,13 +61,11 @@ set config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="test-libc_vfs" caps="200"> - <resource name="RAM" quantum="28M"/> + <start name="test-libc_vfs" caps="200" ram="28M"> <config> <iterations value="1"/>} append_if [have_include "power_on/qemu"] config { @@ -86,8 +84,7 @@ append config { </config> </start> - <start name="vfs_block" caps="200"> - <resource name="RAM" quantum="68M" /> + <start name="vfs_block" caps="200" ram="68M"> <provides><service name="Block"/></provides> <config> <vfs> @@ -102,8 +99,7 @@ append config { </start>} append_if $use_vfs_server config " - <start name=\"vfs\" caps=\"200\"> - <resource name=\"RAM\" quantum=\"24M\" /> + <start name=\"vfs\" caps=\"200\" ram=\"24M\"> <provides><service name=\"File_system\"/></provides> <config> <vfs> diff --git a/repos/libports/run/libc_vfs_select.run b/repos/libports/run/libc_vfs_select.run index a3176ea31a..6ab7eab62e 100644 --- a/repos/libports/run/libc_vfs_select.run +++ b/repos/libports/run/libc_vfs_select.run @@ -20,20 +20,17 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> - <start name="timer"> - <resource name="RAM" quantum="2M"/> + <start name="timer" ram="2M"> <provides> <service name="Timer"/> </provides> </start> <start name="terminal_crosslink"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Terminal"/> </provides> </start> - <start name="vfs"> - <resource name="RAM" quantum="12M"/> + <start name="vfs" ram="12M"> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -44,8 +41,7 @@ install_config { </config> </start> - <start name="test-libc_counter-source"> - <resource name="RAM" quantum="8M"/> + <start name="test-libc_counter-source" ram="8M"> <config> <vfs> <dir name="dev"> <terminal/> <log/> </dir> @@ -54,8 +50,7 @@ install_config { </config> </start> - <start name="test-libc_select"> - <resource name="RAM" quantum="4M"/> + <start name="test-libc_select" ram="4M"> <config> <arg value="test-libc_select"/> <arg value="/dev/log"/> diff --git a/repos/libports/run/libc_vfs_tap.run b/repos/libports/run/libc_vfs_tap.run index 763042e195..5561cad5a7 100644 --- a/repos/libports/run/libc_vfs_tap.run +++ b/repos/libports/run/libc_vfs_tap.run @@ -20,15 +20,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="nic_router"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -45,9 +43,8 @@ install_config { </config> </start> - <start name="tap_uplink_client"> + <start name="tap_uplink_client" ram="8M"> <binary name="test-libc_vfs_tap"/> - <resource name="RAM" quantum="8M"/> <config> <libc stdin="/dev/log" stdout="/dev/log" stderr="/dev/log"/> <vfs> @@ -59,9 +56,8 @@ install_config { </config> </start> - <start name="tap_nic_client"> + <start name="tap_nic_client" ram="8M"> <binary name="test-libc_vfs_tap"/> - <resource name="RAM" quantum="8M"/> <config> <libc stdin="/dev/log" stdout="/dev/log" stderr="/dev/log"/> <vfs> diff --git a/repos/libports/run/libc_with_libc.run b/repos/libports/run/libc_with_libc.run index 5bc7dfddc3..deef33968a 100644 --- a/repos/libports/run/libc_with_libc.run +++ b/repos/libports/run/libc_with_libc.run @@ -17,14 +17,12 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="test-libc_with_libc"> - <resource name="RAM" quantum="4M"/> + <start name="test-libc_with_libc" ram="4M"> <config> <vfs> <dir name="dev"> <log/> </dir> </vfs> <libc stdout="/dev/log"/> diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index 327315ebef..e65c485608 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -55,15 +55,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="drivers" caps="1200" managing_system="yes" priority="-1"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1200" ram="32M" managing_system="yes" priority="-1"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -73,8 +71,7 @@ install_config { </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -112,8 +109,7 @@ install_config { </config> </start> - <start name="test-lwip_httpsrv" caps="120" priority="-1"> - <resource name="RAM" quantum="8M"/> + <start name="test-lwip_httpsrv" caps="120" ram="8M" priority="-1"> <config> <vfs> <dir name="dev"> <log/> </dir> diff --git a/repos/libports/run/lwip_lx.run b/repos/libports/run/lwip_lx.run index 1bb9d7d371..45010c86a1 100644 --- a/repos/libports/run/lwip_lx.run +++ b/repos/libports/run/lwip_lx.run @@ -47,22 +47,19 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="devices_report_rom"> + <start name="devices_report_rom" ram="1200K"> <binary name="report_rom"/> - <resource name="RAM" quantum="1200K"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> </start> - <start name="linux_nic" ld="no"> - <resource name="RAM" quantum="8M"/> + <start name="linux_nic" ld="no" ram="8M"> <config> <report mac_address="true"/> </config> @@ -73,8 +70,7 @@ install_config { </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -101,8 +97,7 @@ install_config { </config> </start> - <start name="test-lwip_httpsrv"> - <resource name="RAM" quantum="5M"/> + <start name="test-lwip_httpsrv" ram="5M"> <config ld_verbose="true"> <vfs> <dir name="dev"> <log/> </dir> diff --git a/repos/libports/run/memcpy.run b/repos/libports/run/memcpy.run index 51ea6594c3..92549772b6 100644 --- a/repos/libports/run/memcpy.run +++ b/repos/libports/run/memcpy.run @@ -25,8 +25,7 @@ install_config { <default-route> <any-service> <parent/> </any-service> </default-route> <default caps="200"/> - <start name="test-memcpy"> - <resource name="RAM" quantum="40M"/> + <start name="test-memcpy" ram="40M"> <config> <vfs> <dir name="dev"> <log/> <null/> </dir> </vfs> <libc stdout="/dev/log" stderr="/dev/log" socket="/socket"/> diff --git a/repos/libports/run/mupdf.run b/repos/libports/run/mupdf.run index 0fd33d44e7..1156b7d306 100644 --- a/repos/libports/run/mupdf.run +++ b/repos/libports/run/mupdf.run @@ -28,15 +28,13 @@ install_config { <service name="Gui"> <child name="wm"/> </service> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -47,8 +45,7 @@ install_config { </route> </start> - <start name="nitpicker"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" ram="4M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -64,15 +61,13 @@ install_config { </start> <start name="pointer"> - <resource name="RAM" quantum="1M"/> <route> <service name="Gui"> <child name="nitpicker"/> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="wm" caps="1000"> - <resource name="RAM" quantum="32M"/> + <start name="wm" caps="1000" ram="32M"> <binary name="init"/> <provides> <service name="Gui"/> <service name="Report"/> <service name="ROM"/> @@ -84,8 +79,7 @@ install_config { </route> </start> - <start name="pdf_view" caps="256"> - <resource name="RAM" quantum="1G"/> + <start name="pdf_view" caps="256" ram="1G"> <config> <vfs> <rom name="test.pdf" /> diff --git a/repos/libports/run/netty.inc b/repos/libports/run/netty.inc index 96c8b795e0..ad49b1972f 100644 --- a/repos/libports/run/netty.inc +++ b/repos/libports/run/netty.inc @@ -45,15 +45,13 @@ append config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="drivers" caps="1000" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1000" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -63,8 +61,7 @@ append config { </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -105,8 +102,7 @@ append config { } append_if [use_dynamic_rom] config { - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/> </provides> <config verbose="yes"> <rom name="socket_fs.config"> <inline description="MTU default"> @@ -136,9 +132,8 @@ append_if [use_dynamic_rom] config { } append config { - <start name="socket_fs" caps="200"> + <start name="socket_fs" caps="200" ram="32M"> <binary name="vfs"/> - <resource name="RAM" quantum="32M"/> <provides> <service name="File_system"/> </provides> <route> <service name="Nic"> <child name="nic_router"/> </service>} @@ -174,9 +169,8 @@ append config { } if {[protocol] == "tcp"} { append config { - <start name="netty-server-80"> + <start name="netty-server-80" ram="4M"> <binary name="test-netty_tcp"/> - <resource name="RAM" quantum="4M"/> <config ld_verbose="yes" port="80" read_write="no" nonblock="true"> <vfs> <dir name="dev"> <log/> </dir> @@ -186,9 +180,8 @@ if {[protocol] == "tcp"} { append config { <libc stdout="/dev/log" stderr="/dev/log" socket="/socket"/> </config> </start> - <start name="netty-server-8080"> + <start name="netty-server-8080" ram="4M"> <binary name="test-netty_tcp"/> - <resource name="RAM" quantum="4M"/> <config ld_verbose="yes" mode="server" port="8080" nonblock="false"> <vfs> <dir name="dev"> <log/> </dir> @@ -199,9 +192,8 @@ if {[protocol] == "tcp"} { append config { </config> </start> <!-- - <start name="netty-client-A"> + <start name="netty-client-A" ram="4M"> <binary name="test-netty_tcp"/> - <resource name="RAM" quantum="4M"/> <config ld_verbose="yes" mode="client" ip="10.0.3.1" port="80"> <vfs> <dir name="dev"> <log/> </dir> @@ -213,9 +205,8 @@ if {[protocol] == "tcp"} { append config { </start> -->} } else { append config { - <start name="netty-server-7"> + <start name="netty-server-7" ram="4M"> <binary name="test-netty_udp"/> - <resource name="RAM" quantum="4M"/> <config ld_verbose="yes" port="7" read_write="no" nonblock="true"> <vfs> <dir name="dev"> <log/> </dir> @@ -225,9 +216,8 @@ if {[protocol] == "tcp"} { append config { <libc stdout="/dev/log" stderr="/dev/log" socket="/socket"/> </config> </start> - <start name="netty-server-7070"> + <start name="netty-server-7070" ram="4M"> <binary name="test-netty_udp"/> - <resource name="RAM" quantum="4M"/> <config ld_verbose="yes" mode="server" port="7070" nonblock="false"> <vfs> <dir name="dev"> <log/> </dir> @@ -238,9 +228,8 @@ if {[protocol] == "tcp"} { append config { </config> </start> <!-- - <start name="netty-client-A"> + <start name="netty-client-A" ram="4M"> <binary name="test-netty_udp"/> - <resource name="RAM" quantum="4M"/> <config ld_verbose="yes" mode="client" ip="10.0.3.1" port="7"> <vfs> <dir name="dev"> <log/> </dir> diff --git a/repos/libports/run/nic_bridge.run b/repos/libports/run/nic_bridge.run index aa06e337b8..d1cf388eb6 100644 --- a/repos/libports/run/nic_bridge.run +++ b/repos/libports/run/nic_bridge.run @@ -40,15 +40,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -66,8 +64,7 @@ install_config { </config> </start> - <start name="nic_bridge" caps="200"> - <resource name="RAM" quantum="24M"/> + <start name="nic_bridge" caps="200" ram="24M"> <provides><service name="Nic"/></provides> <config verbose="yes" mac="02:02:02:02:42:00"> <policy label_prefix="client_1"/> @@ -81,9 +78,8 @@ install_config { </route> </start> - <start name="server_1" caps="120"> + <start name="server_1" caps="120" ram="32M"> <binary name="test-lwip_httpsrv"/> - <resource name="RAM" quantum="32M"/> <route> <service name="Nic"> <child name="nic_bridge"/> </service> <any-service> <parent/> <any-child/> </any-service> @@ -99,9 +95,8 @@ install_config { </config> </start> - <start name="server_2" caps="120"> + <start name="server_2" caps="120" ram="32M"> <binary name="test-lwip_httpsrv"/> - <resource name="RAM" quantum="32M"/> <route> <service name="Nic"> <child name="nic_bridge"/> </service> <any-service> <parent/> <any-child/> </any-service> @@ -117,9 +112,8 @@ install_config { </config> </start> - <start name="client_1" caps="120"> + <start name="client_1" caps="120" ram="32M"> <binary name="test-http_clnt"/> - <resource name="RAM" quantum="32M"/> <route> <service name="Nic"> <child name="nic_bridge"/> </service> <any-service> <parent/> <any-child/> </any-service> @@ -133,9 +127,8 @@ install_config { </config> </start> - <start name="client_2" caps="120"> + <start name="client_2" caps="120" ram="32M"> <binary name="test-http_clnt"/> - <resource name="RAM" quantum="32M"/> <route> <service name="Nic"> <child name="nic_bridge"/> </service> <any-service> <parent/> <any-child/> </any-service> @@ -149,9 +142,8 @@ install_config { </config> </start> - <start name="client_3" caps="120"> + <start name="client_3" caps="120" ram="32M"> <binary name="test-http_clnt"/> - <resource name="RAM" quantum="32M"/> <route> <service name="Nic"> <child name="nic_bridge"/> </service> <any-service> <parent/> <any-child/> </any-service> diff --git a/repos/libports/run/nic_router.inc b/repos/libports/run/nic_router.inc index ef25da29e3..cb66ff18c5 100644 --- a/repos/libports/run/nic_router.inc +++ b/repos/libports/run/nic_router.inc @@ -21,9 +21,8 @@ proc client_config { name prot ip_addr gateway netmask nic srv_port srv_ip } { global nr_of_clients incr nr_of_clients append result { - <start name="} $name {" priority="-1"> + <start name="} $name {" priority="-1" ram="8M"> <binary name="} [client_bin $prot] {" /> - <resource name="RAM" quantum="8M"/> <route> <service name="Nic"> <child name="} $nic {"/> </service> <any-service> <parent/> <any-child/> </any-service> @@ -51,9 +50,8 @@ proc client_config { name prot ip_addr gateway netmask nic srv_port srv_ip } { proc server_config { name prot ip_addr gateway netmask nic port } { append result { - <start name="} $name {" priority="-1"> + <start name="} $name {" priority="-1" ram="8M"> <binary name="} [server_bin $prot] {" /> - <resource name="RAM" quantum="8M"/> <route> <service name="Nic"> <child name="} $nic {"/> </service> <any-service> <parent/> <any-child/> </any-service> diff --git a/repos/libports/run/nic_router.run b/repos/libports/run/nic_router.run index 9436db9ba0..62a76d9cb0 100644 --- a/repos/libports/run/nic_router.run +++ b/repos/libports/run/nic_router.run @@ -184,9 +184,8 @@ proc test_7_config { } { [server_config t7_d2_s2_tcp http 10.13.78.240 10.13.78.1 255.255.255.0 nic_router 3456 ]" append config { - <start name="t7_d1_nic_router" caps="200" priority="-1"> + <start name="t7_d1_nic_router" caps="200" ram="10M" priority="-1"> <binary name="nic_router"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -271,21 +270,18 @@ append config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="200"/> + <default caps="200" ram="1M"/> <start name="timer" priority="0"> - <resource name="RAM" quantum="1M"/> <resource name="CPU" quantum="5"/> <provides><service name="Timer"/></provides> </start> <start name="nic_loopback" priority="-1"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Nic"/> </provides> </start> - <start name="nic_router" caps="400" priority="-1"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="400" ram="10M" priority="-1"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -341,8 +337,7 @@ append config { </route> </start> - <start name="nic_bridge" caps="200" priority="-1"> - <resource name="RAM" quantum="10M"/> + <start name="nic_bridge" caps="200" ram="10M" priority="-1"> <provides><service name="Nic"/></provides> <config> <policy label_prefix="nic_router" ip_addr="10.0.2.55" /> @@ -359,7 +354,6 @@ append config { </start> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> </start> diff --git a/repos/libports/run/nic_router_dyn_config.run b/repos/libports/run/nic_router_dyn_config.run index ca74448bbd..a3db95a58a 100644 --- a/repos/libports/run/nic_router_dyn_config.run +++ b/repos/libports/run/nic_router_dyn_config.run @@ -195,21 +195,18 @@ append config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer" priority="0"> - <resource name="RAM" quantum="1M"/> <resource name="CPU" quantum="5"/> <provides><service name="Timer"/></provides> </start> <start name="nic_loopback" priority="-1"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Nic"/> </provides> </start> - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/> </provides> <config verbose="yes"> <rom name="nic_router.config"> @@ -373,8 +370,7 @@ append config { </config> </start> - <start name="nic_router" caps="200" priority="-1"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" priority="-1" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -387,8 +383,7 @@ append config { </route> </start> - <start name="nic_bridge" caps="200" priority="-1"> - <resource name="RAM" quantum="10M"/> + <start name="nic_bridge" caps="200" priority="-1" ram="10M"> <provides><service name="Nic"/></provides> <config> <policy label_prefix="nic_router" ip_addr="10.0.2.55" /> @@ -404,8 +399,7 @@ append config { </route> </start> - <start name="report_rom"> - <resource name="RAM" quantum="1M"/> + <start name="report_rom" ram="1M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> </start> diff --git a/repos/libports/run/nic_router_ipv4_fragm.run b/repos/libports/run/nic_router_ipv4_fragm.run index e69d8fbe20..25c1070213 100644 --- a/repos/libports/run/nic_router_ipv4_fragm.run +++ b/repos/libports/run/nic_router_ipv4_fragm.run @@ -63,15 +63,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1000" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1000" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -80,14 +78,12 @@ install_config { </route> </start> - <start name="report_rom"> - <resource name="RAM" quantum="32M"/> + <start name="report_rom" ram="32M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -119,8 +115,7 @@ install_config { </config> </start> - <start name="test-lwip-udp-server"> - <resource name="RAM" quantum="8M"/> + <start name="test-lwip-udp-server" ram="8M"> <route> <service name="Nic"> <child name="nic_router"/> </service> <any-service> <parent/> <any-child/> </any-service> diff --git a/repos/libports/run/oss.run b/repos/libports/run/oss.run index e1fb6160af..0cd4571d58 100644 --- a/repos/libports/run/oss.run +++ b/repos/libports/run/oss.run @@ -33,15 +33,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="200"/> + <default caps="200" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="report_rom"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config> <policy label="pci_decode -> system" report="acpi -> acpi"/> @@ -49,16 +47,14 @@ install_config { </config> </start> - <start name="acpi" caps="350"> - <resource name="RAM" quantum="4M"/> + <start name="acpi" caps="350" ram="4M"> <route> <service name="Report"> <child name="report_rom"/> </service> <any-service> <parent/> </any-service> </route> </start> - <start name="pci_decode" caps="350"> - <resource name="RAM" quantum="2M"/> + <start name="pci_decode" caps="350" ram="2M"> <route> <service name="Report"> <child name="report_rom"/> </service> <service name="ROM" label="system"> <child name="report_rom"/> </service> @@ -67,7 +63,6 @@ install_config { </start> <start name="platform" caps="100" managing_system="yes"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Platform"/> </provides> @@ -81,9 +76,8 @@ install_config { </config> </start> - <start name="audio"> + <start name="audio" ram="8M"> <binary name="pci_audio"/> - <resource name="RAM" quantum="8M"/> <provides> <service name="Audio_out"/> <service name="Audio_in"/> @@ -97,8 +91,7 @@ install_config { </config> </start> - <start name="test-oss"> - <resource name="RAM" quantum="10M"/> + <start name="test-oss" ram="10M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/pcg32.run b/repos/libports/run/pcg32.run index 34b94ab9ee..d9030284a7 100644 --- a/repos/libports/run/pcg32.run +++ b/repos/libports/run/pcg32.run @@ -18,8 +18,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="200"/> - <start name="test-pcg32"> - <resource name="RAM" quantum="4M"/> + <start name="test-pcg32" ram="4M"> <config> <vfs> <dir name="dev"> <log/> </dir> diff --git a/repos/libports/run/qt5.run b/repos/libports/run/qt5.run index 07127ae942..dd68571517 100644 --- a/repos/libports/run/qt5.run +++ b/repos/libports/run/qt5.run @@ -15,8 +15,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt5_start_nodes] { - <start name="qt_launchpad" caps="600"> - <resource name="RAM" quantum="80M"/> + <start name="qt_launchpad" caps="600" ram="80M"> <config> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> diff --git a/repos/libports/run/qt5_calculatorform.run b/repos/libports/run/qt5_calculatorform.run index 4583155340..30801e5e67 100644 --- a/repos/libports/run/qt5_calculatorform.run +++ b/repos/libports/run/qt5_calculatorform.run @@ -13,8 +13,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt5_start_nodes] { - <start name="calculatorform" caps="200"> - <resource name="RAM" quantum="80M"/> + <start name="calculatorform" caps="200" ram="80M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc index 5898dbc8e9..2c1348db5c 100644 --- a/repos/libports/run/qt5_common.inc +++ b/repos/libports/run/qt5_common.inc @@ -126,15 +126,13 @@ proc qt5_start_nodes { } { append start_nodes { - <start name="timer"> - <resource name="RAM" quantum="1M"/> + <start name="timer" ram="1M"> <provides><service name="Timer"/></provides> </start> <!-- toggle key mappings depending on the numlock state --> - <start name="numlock_remap_rom"> + <start name="numlock_remap_rom" ram="1M"> <binary name="rom_filter"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="ROM"/> </provides> <config> <input name="numlock_enabled" rom="numlock" node="numlock"> @@ -166,8 +164,7 @@ proc qt5_start_nodes { } { </route> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -181,8 +178,7 @@ proc qt5_start_nodes { } { </route> </start> - <start name="nitpicker" caps="200"> - <resource name="RAM" quantum="2M"/> + <start name="nitpicker" caps="200" ram="2M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -207,8 +203,7 @@ proc qt5_start_nodes { } { </config> </start> - <start name="pointer"> - <resource name="RAM" quantum="2M"/> + <start name="pointer" ram="2M"> <provides> <service name="Report"/> </provides> <config shapes="yes"/> <route> @@ -219,9 +214,8 @@ proc qt5_start_nodes { } { </route> </start> - <start name="wm_report_rom"> + <start name="wm_report_rom" ram="4M"> <binary name="report_rom"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="Report"/> <service name="ROM"/> @@ -248,8 +242,7 @@ proc qt5_start_nodes { } { </config> </start> - <start name="global_keys_handler"> - <resource name="RAM" quantum="1M"/> + <start name="global_keys_handler" ram="1M"> <config> <bool name="capslock" initial="no"/> <bool name="numlock" initial="no"/> @@ -268,8 +261,7 @@ proc qt5_start_nodes { } { </route> </start> - <start name="wm" caps="250"> - <resource name="RAM" quantum="8M"/> + <start name="wm" caps="250" ram="8M"> <provides> <service name="Gui"/> <service name="Report"/> <service name="ROM"/> </provides> @@ -289,9 +281,9 @@ proc qt5_start_nodes { } { </route> </start> - <start name="layouter" caps="150"> + <start name="layouter" caps="150" ram="4M"> <binary name="window_layouter"/> - <resource name="RAM" quantum="4M"/>} [qt5_layouter_config] { + } [qt5_layouter_config] { <route> <service name="ROM" label="window_list"> <child name="wm_report_rom"/> </service> <service name="ROM" label="focus_request"> <child name="wm_report_rom"/> </service> @@ -306,9 +298,9 @@ proc qt5_start_nodes { } { </route> </start> - <start name="decorator" caps="300"> + <start name="decorator" caps="300" ram="32M"> <binary name="} [qt5_decorator_binary] {"/> - <resource name="RAM" quantum="32M"/>} [qt5_decorator_config] { + } [qt5_decorator_config] { <route> <service name="ROM" label="window_layout"> <child name="wm_report_rom"/> </service> <service name="ROM" label="pointer"> <child name="wm_report_rom"/> </service> diff --git a/repos/libports/run/qt5_core.run b/repos/libports/run/qt5_core.run index 70dafcca23..ff335e160f 100644 --- a/repos/libports/run/qt5_core.run +++ b/repos/libports/run/qt5_core.run @@ -27,15 +27,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="test-qt_core"> - <resource name="RAM" quantum="10M" /> + <start name="test-qt_core" ram="10M"> <config> <vfs> <dir name="dev"> <log/> </dir> diff --git a/repos/libports/run/qt5_core_cmake.run b/repos/libports/run/qt5_core_cmake.run index 1471406473..6f5487609f 100644 --- a/repos/libports/run/qt5_core_cmake.run +++ b/repos/libports/run/qt5_core_cmake.run @@ -27,15 +27,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="test-qt_core_cmake"> - <resource name="RAM" quantum="10M" /> + <start name="test-qt_core_cmake" ram="10M"> <config> <vfs> <dir name="dev"> <log/> </dir> diff --git a/repos/libports/run/qt5_openglwindow.run b/repos/libports/run/qt5_openglwindow.run index 70a5ada821..790ce41109 100644 --- a/repos/libports/run/qt5_openglwindow.run +++ b/repos/libports/run/qt5_openglwindow.run @@ -13,8 +13,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt5_start_nodes] { - <start name="openglwindow" caps="250"> - <resource name="RAM" quantum="80M"/> + <start name="openglwindow" caps="250" ram="80M"> <route> <service name="Gui"> <child name="wm"/> </service> <service name="Report" label="shape"> diff --git a/repos/libports/run/qt5_quicktest.run b/repos/libports/run/qt5_quicktest.run index 24f2ef0922..910b5f1d6e 100644 --- a/repos/libports/run/qt5_quicktest.run +++ b/repos/libports/run/qt5_quicktest.run @@ -14,8 +14,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt5_start_nodes] { - <start name="test-qt_quick" caps="300"> - <resource name="RAM" quantum="80M"/> + <start name="test-qt_quick" caps="300" ram="80M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/qt5_samegame.run b/repos/libports/run/qt5_samegame.run index 27a68825c3..48108b5b83 100644 --- a/repos/libports/run/qt5_samegame.run +++ b/repos/libports/run/qt5_samegame.run @@ -15,8 +15,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt5_start_nodes] { - <start name="samegame" caps="400"> - <resource name="RAM" quantum="128M"/> + <start name="samegame" caps="400" ram="128M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/qt5_testqstring.run b/repos/libports/run/qt5_testqstring.run index c23802e376..20321cf320 100644 --- a/repos/libports/run/qt5_testqstring.run +++ b/repos/libports/run/qt5_testqstring.run @@ -13,8 +13,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt5_start_nodes] { - <start name="tutorial1" caps="200"> - <resource name="RAM" quantum="80M"/> + <start name="tutorial1" caps="200" ram="80M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/qt5_tetrix.run b/repos/libports/run/qt5_tetrix.run index c48fad9834..c4b8fb9c47 100644 --- a/repos/libports/run/qt5_tetrix.run +++ b/repos/libports/run/qt5_tetrix.run @@ -13,8 +13,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt5_start_nodes] { - <start name="tetrix" caps="200"> - <resource name="RAM" quantum="80M"/> + <start name="tetrix" caps="200" ram="80M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run index b7b471ae6a..1662080498 100644 --- a/repos/libports/run/qt5_textedit.run +++ b/repos/libports/run/qt5_textedit.run @@ -14,8 +14,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt5_start_nodes] { - <start name="ram_fs"> - <resource name="RAM" quantum="10M"/> + <start name="ram_fs" ram="10M"> <binary name="vfs"/> <provides><service name="File_system"/></provides> <config> @@ -25,8 +24,7 @@ install_config { <policy label_prefix="textedit2" root="/" writeable="yes" /> </config> </start> - <start name="textedit" caps="350"> - <resource name="RAM" quantum="70M"/> + <start name="textedit" caps="350" ram="70M"> <config> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> @@ -49,9 +47,8 @@ install_config { <any-service> <parent /> <any-child/> </any-service> </route> </start> - <start name="textedit2" caps="350"> + <start name="textedit2" caps="350" ram="70M"> <binary name="textedit" /> - <resource name="RAM" quantum="70M"/> <config> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> diff --git a/repos/libports/run/qt5_tooltips.run b/repos/libports/run/qt5_tooltips.run index 07cee9749c..07c67f91aa 100644 --- a/repos/libports/run/qt5_tooltips.run +++ b/repos/libports/run/qt5_tooltips.run @@ -13,8 +13,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt5_start_nodes] { - <start name="tooltips" caps="200"> - <resource name="RAM" quantum="80M"/> + <start name="tooltips" caps="200" ram="80M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/qt5_virtualkeyboard.run b/repos/libports/run/qt5_virtualkeyboard.run index bb86dbc53d..cebc9c4960 100644 --- a/repos/libports/run/qt5_virtualkeyboard.run +++ b/repos/libports/run/qt5_virtualkeyboard.run @@ -17,8 +17,7 @@ install_config { <any-service> <parent/> <child name="wm"/> <any-child/> </any-service> </default-route> } [qt5_start_nodes] { - <start name="basic" caps="500"> - <resource name="RAM" quantum="100M"/> + <start name="basic" caps="500" ram="100M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/qt6.run b/repos/libports/run/qt6.run index 017aa4defd..234bc0bb5b 100644 --- a/repos/libports/run/qt6.run +++ b/repos/libports/run/qt6.run @@ -15,8 +15,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt6_start_nodes] { - <start name="qt_launchpad" caps="600"> - <resource name="RAM" quantum="80M"/> + <start name="qt_launchpad" caps="600" ram="80M"> <config> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> diff --git a/repos/libports/run/qt6_calculatorform.run b/repos/libports/run/qt6_calculatorform.run index 98ff83c4fd..6aad44a0ba 100644 --- a/repos/libports/run/qt6_calculatorform.run +++ b/repos/libports/run/qt6_calculatorform.run @@ -13,8 +13,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt6_start_nodes] { - <start name="calculatorform" caps="200"> - <resource name="RAM" quantum="80M"/> + <start name="calculatorform" caps="200" ram="80M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/qt6_common.inc b/repos/libports/run/qt6_common.inc index 5e0a3f2da7..9cbb6d43e6 100644 --- a/repos/libports/run/qt6_common.inc +++ b/repos/libports/run/qt6_common.inc @@ -126,15 +126,13 @@ proc qt6_start_nodes { } { append start_nodes { - <start name="timer"> - <resource name="RAM" quantum="1M"/> + <start name="timer" ram="1M"> <provides><service name="Timer"/></provides> </start> <!-- toggle key mappings depending on the numlock state --> - <start name="numlock_remap_rom"> + <start name="numlock_remap_rom" ram="1M"> <binary name="rom_filter"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="ROM"/> </provides> <config> <input name="numlock_enabled" rom="numlock" node="numlock"> @@ -166,8 +164,7 @@ proc qt6_start_nodes { } { </route> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -181,8 +178,7 @@ proc qt6_start_nodes { } { </route> </start> - <start name="nitpicker" caps="200"> - <resource name="RAM" quantum="2M"/> + <start name="nitpicker" caps="200" ram="2M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -207,8 +203,7 @@ proc qt6_start_nodes { } { </config> </start> - <start name="pointer"> - <resource name="RAM" quantum="2M"/> + <start name="pointer" ram="2M"> <provides> <service name="Report"/> </provides> <config shapes="yes"/> <route> @@ -219,9 +214,8 @@ proc qt6_start_nodes { } { </route> </start> - <start name="wm_report_rom"> + <start name="wm_report_rom" ram="4M"> <binary name="report_rom"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="Report"/> <service name="ROM"/> @@ -248,8 +242,7 @@ proc qt6_start_nodes { } { </config> </start> - <start name="global_keys_handler"> - <resource name="RAM" quantum="1M"/> + <start name="global_keys_handler" ram="1M"> <config> <bool name="capslock" initial="no"/> <bool name="numlock" initial="no"/> @@ -268,8 +261,7 @@ proc qt6_start_nodes { } { </route> </start> - <start name="wm" caps="250"> - <resource name="RAM" quantum="8M"/> + <start name="wm" caps="250" ram="8M"> <provides> <service name="Gui"/> <service name="Report"/> <service name="ROM"/> </provides> @@ -289,9 +281,9 @@ proc qt6_start_nodes { } { </route> </start> - <start name="layouter" caps="150"> + <start name="layouter" caps="150" ram="4M"> <binary name="window_layouter"/> - <resource name="RAM" quantum="4M"/>} [qt6_layouter_config] { + } [qt6_layouter_config] { <route> <service name="ROM" label="window_list"> <child name="wm_report_rom"/> </service> <service name="ROM" label="focus_request"> <child name="wm_report_rom"/> </service> @@ -306,9 +298,9 @@ proc qt6_start_nodes { } { </route> </start> - <start name="decorator" caps="300"> + <start name="decorator" caps="300" ram="32M"> <binary name="} [qt6_decorator_binary] {"/> - <resource name="RAM" quantum="32M"/>} [qt6_decorator_config] { + } [qt6_decorator_config] { <route> <service name="ROM" label="window_layout"> <child name="wm_report_rom"/> </service> <service name="ROM" label="pointer"> <child name="wm_report_rom"/> </service> diff --git a/repos/libports/run/qt6_core.run b/repos/libports/run/qt6_core.run index 06d9feb98c..396bdf9423 100644 --- a/repos/libports/run/qt6_core.run +++ b/repos/libports/run/qt6_core.run @@ -27,15 +27,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="test-qt_core"> - <resource name="RAM" quantum="10M" /> + <start name="test-qt_core" ram="10M"> <config> <vfs> <dir name="dev"> <log/> </dir> diff --git a/repos/libports/run/qt6_core_cmake.run b/repos/libports/run/qt6_core_cmake.run index 95f1a980ba..5bb2654acf 100644 --- a/repos/libports/run/qt6_core_cmake.run +++ b/repos/libports/run/qt6_core_cmake.run @@ -27,15 +27,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="test-qt_core_cmake"> - <resource name="RAM" quantum="10M" /> + <start name="test-qt_core_cmake" ram="10M"> <config> <vfs> <dir name="dev"> <log/> </dir> diff --git a/repos/libports/run/qt6_i18n_cmake.run b/repos/libports/run/qt6_i18n_cmake.run index 99b79788c1..6519f5638a 100644 --- a/repos/libports/run/qt6_i18n_cmake.run +++ b/repos/libports/run/qt6_i18n_cmake.run @@ -13,8 +13,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt6_start_nodes] { - <start name="i18n" caps="1000"> - <resource name="RAM" quantum="80M"/> + <start name="i18n" caps="1000" ram="80M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/qt6_i18n_qmake.run b/repos/libports/run/qt6_i18n_qmake.run index a352f668ab..f1f695d14e 100644 --- a/repos/libports/run/qt6_i18n_qmake.run +++ b/repos/libports/run/qt6_i18n_qmake.run @@ -13,8 +13,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt6_start_nodes] { - <start name="i18n" caps="1000"> - <resource name="RAM" quantum="80M"/> + <start name="i18n" caps="1000" ram="80M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/qt6_openglwindow.run b/repos/libports/run/qt6_openglwindow.run index 878e4d6df2..08bce60220 100644 --- a/repos/libports/run/qt6_openglwindow.run +++ b/repos/libports/run/qt6_openglwindow.run @@ -13,8 +13,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt6_start_nodes] { - <start name="openglwindow" caps="250"> - <resource name="RAM" quantum="80M"/> + <start name="openglwindow" caps="250" ram="80M"> <route> <service name="Gui"> <child name="wm"/> </service> <service name="Report" label="shape"> diff --git a/repos/libports/run/qt6_quicktest.run b/repos/libports/run/qt6_quicktest.run index abd036e477..8bf005b4af 100644 --- a/repos/libports/run/qt6_quicktest.run +++ b/repos/libports/run/qt6_quicktest.run @@ -14,8 +14,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt6_start_nodes] { - <start name="test-qt_quick" caps="300"> - <resource name="RAM" quantum="80M"/> + <start name="test-qt_quick" caps="300" ram="80M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/qt6_samegame.run b/repos/libports/run/qt6_samegame.run index a93678f944..a6c7cdaf2c 100644 --- a/repos/libports/run/qt6_samegame.run +++ b/repos/libports/run/qt6_samegame.run @@ -15,8 +15,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt6_start_nodes] { - <start name="samegame" caps="400"> - <resource name="RAM" quantum="128M"/> + <start name="samegame" caps="400" ram="128M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/qt6_testqstring.run b/repos/libports/run/qt6_testqstring.run index a69ded64ce..5d2435d570 100644 --- a/repos/libports/run/qt6_testqstring.run +++ b/repos/libports/run/qt6_testqstring.run @@ -13,8 +13,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt6_start_nodes] { - <start name="tutorial1" caps="200"> - <resource name="RAM" quantum="80M"/> + <start name="tutorial1" caps="200" ram="80M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/qt6_tetrix.run b/repos/libports/run/qt6_tetrix.run index 53081e3338..9d795d8fe4 100644 --- a/repos/libports/run/qt6_tetrix.run +++ b/repos/libports/run/qt6_tetrix.run @@ -13,8 +13,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt6_start_nodes] { - <start name="tetrix" caps="200"> - <resource name="RAM" quantum="80M"/> + <start name="tetrix" caps="200" ram="80M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/qt6_textedit.run b/repos/libports/run/qt6_textedit.run index b187021345..7b7bb426df 100644 --- a/repos/libports/run/qt6_textedit.run +++ b/repos/libports/run/qt6_textedit.run @@ -14,8 +14,7 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> } [qt6_start_nodes] { - <start name="ram_fs"> - <resource name="RAM" quantum="10M"/> + <start name="ram_fs" ram="10M"> <binary name="vfs"/> <provides><service name="File_system"/></provides> <config> @@ -25,8 +24,7 @@ install_config { <policy label_prefix="textedit2" root="/" writeable="yes" /> </config> </start> - <start name="textedit" caps="350"> - <resource name="RAM" quantum="70M"/> + <start name="textedit" caps="350" ram="70M"> <config> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> @@ -49,9 +47,8 @@ install_config { <any-service> <parent /> <any-child/> </any-service> </route> </start> - <start name="textedit2" caps="350"> + <start name="textedit2" caps="350" ram="70M"> <binary name="textedit" /> - <resource name="RAM" quantum="70M"/> <config> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> diff --git a/repos/libports/run/smartcard.run b/repos/libports/run/smartcard.run index 191ea4481b..bc7da73361 100644 --- a/repos/libports/run/smartcard.run +++ b/repos/libports/run/smartcard.run @@ -47,15 +47,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config> <default-policy report="usb -> usb -> devices"/> @@ -65,9 +63,8 @@ install_config { </route> </start> - <start name="usb" caps="1500" managing_system="yes"> + <start name="usb" caps="1500" ram="32M" managing_system="yes"> <binary name="init"/> - <resource name="RAM" quantum="32M"/> <provides> <service name="Usb"/> </provides> <route> <service name="ROM" label="config"> @@ -78,8 +75,7 @@ install_config { </route> </start> - <start name="test-smartcard" caps="150"> - <resource name="RAM" quantum="5M"/> + <start name="test-smartcard" caps="150" ram="5M"> <config> <vfs> <dir name="dev"> diff --git a/repos/libports/run/sntp_client.run b/repos/libports/run/sntp_client.run index 29965e44a4..ff0b8b0771 100644 --- a/repos/libports/run/sntp_client.run +++ b/repos/libports/run/sntp_client.run @@ -30,10 +30,9 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"> <policy label_suffix="set_rtc" report="sntp_client -> set_rtc"/> @@ -41,12 +40,10 @@ install_config { </start> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1200" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1200" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -56,8 +53,7 @@ install_config { </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -91,8 +87,7 @@ install_config { </config> </start> - <start name="sntp_client"> - <resource name="RAM" quantum="8M"/> + <start name="sntp_client" ram="8M"> <config verbose="no" dst_addr="pool.ntp.org" period_min="1"/> <route> <service name="Nic"> <child name="nic_router"/> </service> diff --git a/repos/libports/run/system_rtc.run b/repos/libports/run/system_rtc.run index b855313483..3531217540 100644 --- a/repos/libports/run/system_rtc.run +++ b/repos/libports/run/system_rtc.run @@ -31,15 +31,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> - <start name="system_rtc" caps="400" priority="-1"> - <resource name="RAM" quantum="6M"/> + <start name="system_rtc" caps="400" ram="6M" priority="-1"> <binary name="init"/> <provides> <service name="Rtc"/> <service name="Report"/> </provides> <route> @@ -57,7 +55,6 @@ install_config { </start> <start name="test-system_rtc" priority="-1"> - <resource name="RAM" quantum="1M"/> <config/> <route> <service name="Report"> <child name="system_rtc"/> </service> @@ -67,8 +64,7 @@ install_config { </route> </start> - <start name="test-libc_rtc" caps="150"> - <resource name="RAM" quantum="4M"/> + <start name="test-libc_rtc" caps="150" ram="4M"> <config> <vfs> <dir name="dev"> <log/> <rtc/> </dir> </vfs> <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/> diff --git a/repos/libports/src/app/acpi_event/README b/repos/libports/src/app/acpi_event/README index 5dfe90d49d..6c796ec425 100644 --- a/repos/libports/src/app/acpi_event/README +++ b/repos/libports/src/app/acpi_event/README @@ -36,8 +36,7 @@ Example configuration For a complete scenario please look into repos/libports/run/acpica.run. -!<start name="report_rom"> -! <resource name="RAM" quantum="2M"/> +!<start name="report_rom" ram="2M"> ! <provides> <service name="ROM"/> <service name="Report"/> </provides> ! <config> ! <policy label="acpi_event -> acpi_lid" report="acpica -> acpi_lid"/> @@ -49,16 +48,14 @@ For a complete scenario please look into repos/libports/run/acpica.run. ! </config> !</start> ! -!<start name="acpica"> -! <resource name="RAM" quantum="8M"/> +!<start name="acpica" ram="8M"> ! <config report="yes"/> ! <route> ! <service name="Report"> <child name="acpi_state"/> </service> ! </route> !</start> ! -!<start name="acpi_event"> -! <resource name="RAM" quantum="1M"/> +!<start name="acpi_event" ram="1M"> ! <config> ! <map acpi="lid" value="CLOSED" to_key="KEY_SLEEP"/> ! <map acpi="fixed" value="0" to_key="KEY_POWER"/> diff --git a/repos/libports/src/test/libc_fifo_pipe/main.cc b/repos/libports/src/test/libc_fifo_pipe/main.cc index a2ce8ded58..7a9f6a6731 100644 --- a/repos/libports/src/test/libc_fifo_pipe/main.cc +++ b/repos/libports/src/test/libc_fifo_pipe/main.cc @@ -173,8 +173,10 @@ class Test_fifo_pipe::Test }); } else { auto const name { node.attribute_value("name", Genode::String<128> { }) }; - xml.node("start", [&xml, &node, &name, iteration] ( ) { + auto const ram { node.attribute_value("ram", Genode::String<128> { }) }; + xml.node("start", [&xml, &node, &name, &ram, iteration] ( ) { xml.attribute("name", name); + xml.attribute("ram", ram); xml.attribute("version", iteration); node.with_raw_content([&xml] (char const *addr, size_t const size) { diff --git a/repos/os/recipes/pkg/cpu_balancer_config/runtime b/repos/os/recipes/pkg/cpu_balancer_config/runtime index 6e53432524..ac9172cadc 100644 --- a/repos/os/recipes/pkg/cpu_balancer_config/runtime +++ b/repos/os/recipes/pkg/cpu_balancer_config/runtime @@ -30,8 +30,7 @@ <service name="Timer"/> </parent-provides> - <start name="fs_report" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="fs_report" caps="100" ram="1M"> <provides> <service name="Report"/> </provides> <config> <vfs> <fs/> </vfs> </config> <route> @@ -40,8 +39,7 @@ </route> </start> - <start name="fs_rom" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="fs_rom" caps="100" ram="1M"> <provides> <service name="ROM"/> </provides> <config/> <route> @@ -50,8 +48,7 @@ </route> </start> - <start name="cpu_balancer" caps="200"> - <resource name="RAM" quantum="2M"/> + <start name="cpu_balancer" caps="200" ram="2M"> <provides> <service name="PD"/> diff --git a/repos/os/recipes/pkg/test-black_hole/runtime b/repos/os/recipes/pkg/test-black_hole/runtime index 308a155cf1..43bf9436c3 100644 --- a/repos/os/recipes/pkg/test-black_hole/runtime +++ b/repos/os/recipes/pkg/test-black_hole/runtime @@ -25,8 +25,7 @@ <service name="Timer"/> </parent-provides> - <start name="black_hole" caps="100"> - <resource name="RAM" quantum="1280K"/> + <start name="black_hole" caps="100" ram="1280K"> <provides> <service name="Usb"/> <service name="Gpu"/> @@ -58,8 +57,7 @@ </route> </start> - <start name="test-black_hole" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="test-black_hole" caps="200" ram="10M"> <route> <service name="Usb"> <child name="black_hole"/> </service> <service name="Gpu"> <child name="black_hole"/> </service> diff --git a/repos/os/recipes/pkg/test-clipboard/runtime b/repos/os/recipes/pkg/test-clipboard/runtime index 31397cd697..f19e465d4a 100644 --- a/repos/os/recipes/pkg/test-clipboard/runtime +++ b/repos/os/recipes/pkg/test-clipboard/runtime @@ -30,16 +30,14 @@ <default caps="100"/> - <start name="report_rom"> - <resource name="RAM" quantum="1M"/> + <start name="report_rom" ram="1M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"> <policy label="clipboard -> focus" report="test-clipboard -> focus"/> </config> </start> - <start name="clipboard"> - <resource name="RAM" quantum="4M"/> + <start name="clipboard" ram="4M"> <provides> <service name="ROM"/> <service name="Report"/> @@ -61,8 +59,7 @@ </route> </start> - <start name="test-clipboard"> - <resource name="RAM" quantum="4M"/> + <start name="test-clipboard" ram="4M"> <route> <!-- for the simulation of nitpicker's focus reports --> <service name="Report" label="focus"> <child name="report_rom"/> </service> diff --git a/repos/os/recipes/pkg/test-dynamic_config/runtime b/repos/os/recipes/pkg/test-dynamic_config/runtime index c621b48b57..a2e7e5fc74 100644 --- a/repos/os/recipes/pkg/test-dynamic_config/runtime +++ b/repos/os/recipes/pkg/test-dynamic_config/runtime @@ -27,13 +27,11 @@ <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="test-dynamic_config_server"> - <resource name="RAM" quantum="1M"/> <provides> <service name="ROM"/> </provides> </start> <start name="test-dynamic_config" caps="500"> - <resource name="RAM" quantum="1M"/> <route> <service name="ROM" label="config"> <child name="test-dynamic_config_server" label="config.dynamic"/> diff --git a/repos/os/recipes/pkg/test-fs_packet/runtime b/repos/os/recipes/pkg/test-fs_packet/runtime index d44c34dc51..9b1e579134 100644 --- a/repos/os/recipes/pkg/test-fs_packet/runtime +++ b/repos/os/recipes/pkg/test-fs_packet/runtime @@ -28,31 +28,26 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="vfs"> - <resource name="RAM" quantum="4M"/> + <start name="vfs" ram="4M"> <provides> <service name="File_system"/> </provides> <config> <vfs> <zero name="test"/> </vfs> <default-policy root="/" writeable="yes"/> </config> </start> - <start name="long-test"> + <start name="long-test" ram="2M"> <binary name="test-fs_packet"/> - <resource name="RAM" quantum="2M"/> - <config count="1024"/> + <config count="1024"/> </start> - <start name="short-test" caps="200"> + <start name="short-test" caps="200" ram="4M"> <binary name="sequence"/> - <resource name="RAM" quantum="4M"/> <config> <start name="a"> <binary name="test-fs_packet"/> - <resource name="RAM" quantum="2M"/> <config count="64"/> </start> <start name="b"> <binary name="test-fs_packet"/> - <resource name="RAM" quantum="2M"/> <config count="64"/> </start> </config> diff --git a/repos/os/recipes/pkg/test-fs_report/runtime b/repos/os/recipes/pkg/test-fs_report/runtime index 4e956364fa..67c1bc191b 100644 --- a/repos/os/recipes/pkg/test-fs_report/runtime +++ b/repos/os/recipes/pkg/test-fs_report/runtime @@ -31,8 +31,7 @@ <default caps="100"/> - <start name="ram_fs"> - <resource name="RAM" quantum="4M"/> + <start name="ram_fs" ram="4M"> <binary name="vfs"/> <provides> <service name="File_system"/> </provides> <config> @@ -55,18 +54,15 @@ All reports sent by 'test-fs_report' are prefixed with the label of the component. Hence, they are written to the 'test-fs_report/' subdirectory. --> - <start name="fs_report"> - <resource name="RAM" quantum="4M"/> + <start name="fs_report" ram="4M"> <provides> <service name="Report"/> </provides> <config> <vfs> <fs/> </vfs> </config> </start> - <start name="fs_rom"> - <resource name="RAM" quantum="4M"/> + <start name="fs_rom" ram="4M"> <provides> <service name="ROM"/> </provides> <config/> </start> - <start name="test-fs_report"> - <resource name="RAM" quantum="4M"/> + <start name="test-fs_report" ram="4M"> <config> <vfs> <fs/> </vfs> </config> <route> <service name="ROM" label="devices"> <child name="fs_rom"/> </service> diff --git a/repos/os/recipes/pkg/test-fs_rom_update/runtime b/repos/os/recipes/pkg/test-fs_rom_update/runtime index b489f267f5..062b93b89b 100644 --- a/repos/os/recipes/pkg/test-fs_rom_update/runtime +++ b/repos/os/recipes/pkg/test-fs_rom_update/runtime @@ -31,8 +31,7 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="ram_fs"> - <resource name="RAM" quantum="10M"/> + <start name="ram_fs" ram="10M"> <binary name="vfs"/> <provides><service name="File_system"/></provides> <config> @@ -41,8 +40,7 @@ <policy label_prefix="fs_rom" root="/" writeable="no"/> </config> </start> - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="dynamic_rom"> @@ -65,8 +63,7 @@ </rom> </config> </start> - <start name="rom_to_file"> - <resource name="RAM" quantum="2M"/> + <start name="rom_to_file" ram="2M"> <config rom="dynamic_rom"> <vfs> <fs/> </vfs> </config> @@ -75,12 +72,10 @@ <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="fs_rom"> - <resource name="RAM" quantum="2M"/> + <start name="fs_rom" ram="2M"> <provides><service name="ROM"/></provides> </start> - <start name="rom_logger"> - <resource name="RAM" quantum="1M"/> + <start name="rom_logger" ram="1M"> <config rom="dynamic_rom"/> <route> <service name="ROM" label="dynamic_rom"> <child name="fs_rom"/> </service> diff --git a/repos/os/recipes/pkg/test-fs_rom_update_fs/runtime b/repos/os/recipes/pkg/test-fs_rom_update_fs/runtime index 0eae38575d..1615122fa2 100644 --- a/repos/os/recipes/pkg/test-fs_rom_update_fs/runtime +++ b/repos/os/recipes/pkg/test-fs_rom_update_fs/runtime @@ -31,9 +31,8 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="vfs_1"> + <start name="vfs_1" ram="10M"> <binary name="vfs"/> - <resource name="RAM" quantum="10M"/> <provides><service name="File_system"/></provides> <config> <vfs> <ram/> </vfs> @@ -41,9 +40,8 @@ <policy label_prefix="vfs_2" root="/" writeable="no"/> </config> </start> - <start name="vfs_2"> + <start name="vfs_2" ram="10M"> <binary name="vfs"/> - <resource name="RAM" quantum="10M"/> <provides><service name="File_system"/></provides> <config> <vfs> <fs/> </vfs> @@ -55,8 +53,7 @@ <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="dynamic_rom"> @@ -79,8 +76,7 @@ </rom> </config> </start> - <start name="rom_to_file"> - <resource name="RAM" quantum="2M"/> + <start name="rom_to_file" ram="2M"> <config rom="dynamic_rom"> <vfs> <fs/> </vfs> </config> @@ -91,16 +87,14 @@ </route> </start> - <start name="fs_rom"> - <resource name="RAM" quantum="2M"/> + <start name="fs_rom" ram="2M"> <provides><service name="ROM"/></provides> <route> <service name="File_system"> <child name="vfs_2"/> </service> <any-service> <parent/> </any-service> </route> </start> - <start name="rom_logger"> - <resource name="RAM" quantum="1M"/> + <start name="rom_logger" ram="1M"> <config rom="dynamic_rom"/> <route> <service name="ROM" label="dynamic_rom"> <child name="fs_rom"/> </service> diff --git a/repos/os/recipes/pkg/test-fs_rom_update_ram/runtime b/repos/os/recipes/pkg/test-fs_rom_update_ram/runtime index 2e67433e35..701bbeb19d 100644 --- a/repos/os/recipes/pkg/test-fs_rom_update_ram/runtime +++ b/repos/os/recipes/pkg/test-fs_rom_update_ram/runtime @@ -31,8 +31,7 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="vfs"> - <resource name="RAM" quantum="10M"/> + <start name="vfs" ram="10M"> <provides><service name="File_system"/></provides> <config> <vfs> <ram/> </vfs> @@ -40,8 +39,7 @@ <policy label_prefix="fs_rom" root="/" writeable="no"/> </config> </start> - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="dynamic_rom"> @@ -64,8 +62,7 @@ </rom> </config> </start> - <start name="rom_to_file"> - <resource name="RAM" quantum="2M"/> + <start name="rom_to_file" ram="2M"> <config rom="dynamic_rom"> <vfs> <fs/> </vfs> </config> @@ -76,16 +73,14 @@ </route> </start> - <start name="fs_rom"> - <resource name="RAM" quantum="2M"/> + <start name="fs_rom" ram="2M"> <provides><service name="ROM"/></provides> <route> <service name="File_system"> <child name="vfs"/> </service> <any-service> <parent/> </any-service> </route> </start> - <start name="rom_logger"> - <resource name="RAM" quantum="1M"/> + <start name="rom_logger" ram="1M"> <config rom="dynamic_rom"/> <route> <service name="ROM" label="dynamic_rom"> <child name="fs_rom"/> </service> diff --git a/repos/os/recipes/pkg/test-init/runtime b/repos/os/recipes/pkg/test-init/runtime index 31b298bb84..9b185bd4b7 100644 --- a/repos/os/recipes/pkg/test-init/runtime +++ b/repos/os/recipes/pkg/test-init/runtime @@ -32,8 +32,7 @@ <default caps="100"/> - <start name="report_rom" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" priority="-1" ram="2M"> <provides> <service name="ROM"/> <service name="Report"/> </provides> <config verbose="no"> <policy label="init -> config" report="test-init -> init.config"/> @@ -41,8 +40,7 @@ </config> </start> - <start name="test-init" priority="-1"> - <resource name="RAM" quantum="4M"/> + <start name="test-init" priority="-1" ram="4M"> <provides> <service name="LOG"/> </provides> <route> <service name="Report"> <child name="report_rom"/> </service> @@ -52,9 +50,8 @@ </route> </start> - <start name="init" caps="2000" priority="-1"> + <start name="init" caps="2000" priority="-1" ram="16M"> <binary name="init"/> - <resource name="RAM" quantum="16M"/> <route> <service name="ROM" label="config"> <child name="report_rom"/> </service> <service name="Report"> <child name="report_rom"/> </service> diff --git a/repos/os/recipes/pkg/test-init_loop/runtime b/repos/os/recipes/pkg/test-init_loop/runtime index 47b37df06c..1a26fd0ca8 100644 --- a/repos/os/recipes/pkg/test-init_loop/runtime +++ b/repos/os/recipes/pkg/test-init_loop/runtime @@ -27,8 +27,7 @@ <default caps="100"/> - <start name="report_rom"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M"> <provides> <service name="ROM"/> <service name="Report"/> </provides> <config verbose="no"> <policy label="init -> config" report="test-init_loop -> init.config"/> @@ -37,8 +36,7 @@ <route> <any-service> <parent/> </any-service> </route> </start> - <start name="test-init_loop"> - <resource name="RAM" quantum="4M"/> + <start name="test-init_loop" ram="4M"> <provides> <service name="LOG"/> </provides> <config/> <route> @@ -48,9 +46,8 @@ </route> </start> - <start name="init" caps="2000"> + <start name="init" caps="2000" ram="8M"> <binary name="init"/> - <resource name="RAM" quantum="8M"/> <route> <service name="ROM" label="config"> <child name="report_rom"/> </service> <service name="Report"> <child name="report_rom"/> </service> diff --git a/repos/os/recipes/pkg/test-lx_block/runtime b/repos/os/recipes/pkg/test-lx_block/runtime index e10cb0c4dc..529aa6ebf8 100644 --- a/repos/os/recipes/pkg/test-lx_block/runtime +++ b/repos/os/recipes/pkg/test-lx_block/runtime @@ -30,14 +30,12 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="lx_block" ld="no"> - <resource name="RAM" quantum="2M"/> + <start name="lx_block" ld="no" ram="2M"> <provides> <service name="Block"/> </provides> <config file="lx_block.img" block_size="4K" writeable="yes"/> </start> - <start name="block_tester"> + <start name="block_tester" ram="5M"> <binary name="block_tester"/> - <resource name="RAM" quantum="5M"/> <config verbose="no" log="yes" stop_on_error="no"> <tests> <sequential length="256K" size="4K" io_buffer="128K" batch="4"/> diff --git a/repos/os/recipes/pkg/test-nic_loopback/runtime b/repos/os/recipes/pkg/test-nic_loopback/runtime index cd12921555..7084637e9d 100644 --- a/repos/os/recipes/pkg/test-nic_loopback/runtime +++ b/repos/os/recipes/pkg/test-nic_loopback/runtime @@ -25,12 +25,9 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="nic_loopback"> - <resource name="RAM" quantum="2M"/> + <start name="nic_loopback" ram="2M"> <provides><service name="Nic"/></provides> </start> - <start name="test-nic_loopback"> - <resource name="RAM" quantum="2M"/> - </start> + <start name="test-nic_loopback" ram="2M"/> </config> </runtime> diff --git a/repos/os/recipes/pkg/test-nic_perf/runtime b/repos/os/recipes/pkg/test-nic_perf/runtime index 964359aeed..0d1c3a9c20 100644 --- a/repos/os/recipes/pkg/test-nic_perf/runtime +++ b/repos/os/recipes/pkg/test-nic_perf/runtime @@ -26,9 +26,8 @@ </default-route> <default caps="500"/> - <start name="nic_perf_tx"> + <start name="nic_perf_tx" ram="10M"> <binary name="nic_perf"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Uplink"/> <service name="Nic"/> @@ -45,9 +44,8 @@ </route> </start> - <start name="nic_perf_rx"> + <start name="nic_perf_rx" ram="10M"> <binary name="nic_perf"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Uplink"/> <service name="Nic"/> diff --git a/repos/os/recipes/pkg/test-nic_perf_router/runtime b/repos/os/recipes/pkg/test-nic_perf_router/runtime index e9f8f770c1..c1fe934107 100644 --- a/repos/os/recipes/pkg/test-nic_perf_router/runtime +++ b/repos/os/recipes/pkg/test-nic_perf_router/runtime @@ -27,9 +27,8 @@ </default-route> <default caps="500"/> - <start name="nic_perf_tx"> + <start name="nic_perf_tx" ram="10M"> <binary name="nic_perf"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Uplink"/> <service name="Nic"/> @@ -45,8 +44,7 @@ </route> </start> - <start name="nic_router"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -70,9 +68,8 @@ </config> </start> - <start name="nic_perf_rx"> + <start name="nic_perf_rx" ram="10M"> <binary name="nic_perf"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Uplink"/> <service name="Nic"/> diff --git a/repos/os/recipes/pkg/test-part_block_ahdi/runtime b/repos/os/recipes/pkg/test-part_block_ahdi/runtime index 2f19e9ed80..4ad6fec27f 100644 --- a/repos/os/recipes/pkg/test-part_block_ahdi/runtime +++ b/repos/os/recipes/pkg/test-part_block_ahdi/runtime @@ -34,8 +34,7 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="vfs_block"> - <resource name="RAM" quantum="32M"/> + <start name="vfs_block" ram="32M"> <provides><service name="Block"/></provides> <config> <vfs> @@ -44,8 +43,7 @@ <default-policy file="/ata.ahdi.raw" block_size="512"/> </config> </start> - <start name="part_block"> - <resource name="RAM" quantum="10M"/> + <start name="part_block" ram="10M"> <provides><service name="Block"/></provides> <route> <any-service><child name="vfs_block"/> <parent/><any-child/></any-service> @@ -55,17 +53,15 @@ <policy label_prefix="test-part1" partition="1"/> </config> </start> - <start name="report_rom"> + <start name="report_rom" ram="5M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> - <resource name="RAM" quantum="5M"/> <config verbose="yes"/> </start> - <start name="test-part1"> + <start name="test-part1" ram="5M"> <binary name="block_tester"/> - <resource name="RAM" quantum="5M"/> <config verbose="no" log="yes" stop_on_error="no"> <tests> <sequential length="256K" size="1K" io_buffer="128K" batch="4"/> diff --git a/repos/os/recipes/pkg/test-part_block_disk/runtime b/repos/os/recipes/pkg/test-part_block_disk/runtime index e4456a9119..87c974b149 100644 --- a/repos/os/recipes/pkg/test-part_block_disk/runtime +++ b/repos/os/recipes/pkg/test-part_block_disk/runtime @@ -34,8 +34,7 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="vfs_block"> - <resource name="RAM" quantum="32M"/> + <start name="vfs_block" ram="32M"> <provides><service name="Block"/></provides> <config> <vfs> @@ -44,8 +43,7 @@ <default-policy file="/ata.gpt.raw" block_size="512"/> </config> </start> - <start name="part_block"> - <resource name="RAM" quantum="10M"/> + <start name="part_block" ram="10M"> <provides><service name="Block"/></provides> <route> <any-service><child name="vfs_block"/> <parent/><any-child/></any-service> @@ -55,17 +53,15 @@ <policy label_prefix="test-part0" partition="0"/> </config> </start> - <start name="report_rom"> + <start name="report_rom" ram="5M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> - <resource name="RAM" quantum="5M"/> <config verbose="yes"/> </start> - <start name="test-part0"> + <start name="test-part0" ram="5M"> <binary name="block_tester"/> - <resource name="RAM" quantum="5M"/> <config verbose="no" log="yes" stop_on_error="no"> <tests> <sequential length="1M" size="1K" io_buffer="128K" batch="4"/> diff --git a/repos/os/recipes/pkg/test-part_block_gpt/runtime b/repos/os/recipes/pkg/test-part_block_gpt/runtime index f838f1cd43..811b79b165 100644 --- a/repos/os/recipes/pkg/test-part_block_gpt/runtime +++ b/repos/os/recipes/pkg/test-part_block_gpt/runtime @@ -35,8 +35,7 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="vfs_block"> - <resource name="RAM" quantum="32M"/> + <start name="vfs_block" ram="32M"> <provides><service name="Block"/></provides> <config> <vfs> @@ -45,8 +44,7 @@ <default-policy file="/ata.gpt.raw" block_size="512"/> </config> </start> - <start name="part_block"> - <resource name="RAM" quantum="10M"/> + <start name="part_block" ram="10M"> <provides><service name="Block"/></provides> <route> <any-service><child name="vfs_block"/> <parent/><any-child/></any-service> @@ -57,17 +55,15 @@ <policy label_prefix="test-part2" partition="1"/> </config> </start> - <start name="report_rom"> + <start name="report_rom" ram="5M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> - <resource name="RAM" quantum="5M"/> <config verbose="yes"/> </start> - <start name="test-part1"> + <start name="test-part1" ram="5M"> <binary name="block_tester"/> - <resource name="RAM" quantum="5M"/> <config verbose="no" log="yes" stop_on_error="no"> <tests> <sequential length="32K" size="1K" io_buffer="128K" batch="4"/> @@ -77,9 +73,8 @@ <any-service> <child name="part_block"/> <parent/> <any-child/> </any-service> </route> </start> - <start name="test-part2"> + <start name="test-part2" ram="5M"> <binary name="block_tester"/> - <resource name="RAM" quantum="5M"/> <config verbose="no" log="yes" stop_on_error="no"> <tests> <sequential length="256K" size="1K" io_buffer="128K" batch="4"/> diff --git a/repos/os/recipes/pkg/test-part_block_mbr/runtime b/repos/os/recipes/pkg/test-part_block_mbr/runtime index b9073257ff..a299000508 100644 --- a/repos/os/recipes/pkg/test-part_block_mbr/runtime +++ b/repos/os/recipes/pkg/test-part_block_mbr/runtime @@ -36,8 +36,7 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="vfs_block"> - <resource name="RAM" quantum="32M"/> + <start name="vfs_block" ram="32M"> <provides><service name="Block"/></provides> <config> <vfs> @@ -46,8 +45,7 @@ <default-policy file="/ata.mbr.raw" block_size="512"/> </config> </start> - <start name="part_block"> - <resource name="RAM" quantum="10M"/> + <start name="part_block" ram="10M"> <provides><service name="Block"/></provides> <route> <any-service><child name="vfs_block"/> <parent/><any-child/></any-service> @@ -59,17 +57,15 @@ <policy label_prefix="test-part3" partition="9"/> </config> </start> - <start name="report_rom"> + <start name="report_rom" ram="5M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> - <resource name="RAM" quantum="5M"/> <config verbose="yes"/> </start> - <start name="test-part1"> + <start name="test-part1" ram="5M"> <binary name="block_tester"/> - <resource name="RAM" quantum="5M"/> <config verbose="no" log="yes" stop_on_error="no"> <tests> <sequential length="32K" size="1K" io_buffer="128K" batch="4"/> @@ -79,9 +75,8 @@ <any-service> <child name="part_block"/> <parent/> <any-child/> </any-service> </route> </start> - <start name="test-part2"> + <start name="test-part2" ram="5M"> <binary name="block_tester"/> - <resource name="RAM" quantum="5M"/> <config verbose="no" log="yes" stop_on_error="no"> <tests> <sequential length="256K" size="1K" io_buffer="128K" batch="4"/> @@ -91,9 +86,8 @@ <any-service> <child name="part_block"/> <parent/> <any-child/> </any-service> </route> </start> - <start name="test-part3"> + <start name="test-part3" ram="5M"> <binary name="block_tester"/> - <resource name="RAM" quantum="5M"/> <config verbose="no" log="yes" stop_on_error="no"> <tests> <sequential length="128K" size="1K" io_buffer="128K" batch="4"/> diff --git a/repos/os/recipes/pkg/test-ram_fs_chunk/runtime b/repos/os/recipes/pkg/test-ram_fs_chunk/runtime index 23fe87da7c..b93f4e600a 100644 --- a/repos/os/recipes/pkg/test-ram_fs_chunk/runtime +++ b/repos/os/recipes/pkg/test-ram_fs_chunk/runtime @@ -62,8 +62,6 @@ <any-service> <parent/> </any-service> </default-route> <default caps="100"/> - <start name="test-ram_fs_chunk"> - <resource name="RAM" quantum="1M"/> - </start> + <start name="test-ram_fs_chunk" ram="1M"/> </config> </runtime> diff --git a/repos/os/recipes/pkg/test-read_only_rom/runtime b/repos/os/recipes/pkg/test-read_only_rom/runtime index 84ca416886..3d617039b6 100644 --- a/repos/os/recipes/pkg/test-read_only_rom/runtime +++ b/repos/os/recipes/pkg/test-read_only_rom/runtime @@ -24,8 +24,7 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="vfs"> - <resource name="RAM" quantum="2M"/> + <start name="vfs" ram="2M"> <provides><service name="File_system"/></provides> <config> <vfs> @@ -34,12 +33,10 @@ <default-policy root="/"/> </config> </start> - <start name="cached_fs_rom"> - <resource name="RAM" quantum="10M"/> + <start name="cached_fs_rom" ram="10M"> <provides> <service name="ROM"/> </provides> </start> - <start name="test-immutable_rom"> - <resource name="RAM" quantum="2M"/> + <start name="test-immutable_rom" ram="2M"> <route> <service name="ROM" label="test"> <child name="cached_fs_rom"/> diff --git a/repos/os/recipes/pkg/test-report_rom/runtime b/repos/os/recipes/pkg/test-report_rom/runtime index e3d980e501..47d7c838dd 100644 --- a/repos/os/recipes/pkg/test-report_rom/runtime +++ b/repos/os/recipes/pkg/test-report_rom/runtime @@ -53,15 +53,13 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="report_rom"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M"> <provides> <service name="ROM"/> <service name="Report"/> </provides> <config> <policy label_prefix="test-report_rom ->" label_suffix="brightness" report="test-report_rom -> brightness"/> </config> </start> - <start name="test-report_rom"> - <resource name="RAM" quantum="2M"/> + <start name="test-report_rom" ram="2M"> <route> <service name="ROM" label="brightness"> <child name="report_rom"/> diff --git a/repos/os/recipes/pkg/test-resource_request/runtime b/repos/os/recipes/pkg/test-resource_request/runtime index 7e57aff893..e96d374b6d 100644 --- a/repos/os/recipes/pkg/test-resource_request/runtime +++ b/repos/os/recipes/pkg/test-resource_request/runtime @@ -24,24 +24,21 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="report_rom"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M"> <provides> <service name="ROM"/> <service name="Report"/> </provides> <config verbose="no"> <policy label="init -> config" report="init_monitor -> init.config"/> <policy label="init_monitor -> state" report="init -> state"/> </config> </start> - <start name="init" caps="4000"> - <resource name="RAM" quantum="10M"/> + <start name="init" caps="4000" ram="10M"> <route> <service name="ROM" label="config"> <child name="report_rom"/> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="init_monitor"> + <start name="init_monitor" ram="2M"> <binary name="test-resource_request"/> - <resource name="RAM" quantum="2M"/> <config role="monitor"/> <route> <service name="ROM" label="state"> <child name="report_rom"/> </service> diff --git a/repos/os/recipes/pkg/test-rom_filter/runtime b/repos/os/recipes/pkg/test-rom_filter/runtime index 99d862b468..0f3810cc81 100644 --- a/repos/os/recipes/pkg/test-rom_filter/runtime +++ b/repos/os/recipes/pkg/test-rom_filter/runtime @@ -41,8 +41,7 @@ <default caps="100"/> - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="xray"> @@ -71,8 +70,7 @@ </config> </start> - <start name="rom_filter"> - <resource name="RAM" quantum="4M"/> + <start name="rom_filter" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="no"> @@ -116,8 +114,7 @@ </route> </start> - <start name="rom_logger"> - <resource name="RAM" quantum="1M"/> + <start name="rom_logger" ram="1M"> <config rom="generated"/> <route> <service name="ROM" label="generated"> <child name="rom_filter"/> </service> diff --git a/repos/os/recipes/pkg/test-rtc/runtime b/repos/os/recipes/pkg/test-rtc/runtime index bfffef5b51..20552242f0 100644 --- a/repos/os/recipes/pkg/test-rtc/runtime +++ b/repos/os/recipes/pkg/test-rtc/runtime @@ -27,13 +27,10 @@ <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="pc_rtc" priority="-1"> - <resource name="RAM" quantum="1M"/> <provides><service name="Rtc"/></provides> </start> - <start name="test-rtc" priority="-1"> - <resource name="RAM" quantum="1M"/> - </start> + <start name="test-rtc" priority="-1"/> </config> </runtime> diff --git a/repos/os/recipes/pkg/test-signal/runtime b/repos/os/recipes/pkg/test-signal/runtime index fc093af251..1cf7fded2b 100644 --- a/repos/os/recipes/pkg/test-signal/runtime +++ b/repos/os/recipes/pkg/test-signal/runtime @@ -27,8 +27,6 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="test-signal" caps="500"> - <resource name="RAM" quantum="10M"/> - </start> + <start name="test-signal" caps="500" ram="10M"/> </config> </runtime> diff --git a/repos/os/recipes/pkg/test-slab/runtime b/repos/os/recipes/pkg/test-slab/runtime index a3c9816307..44be48454a 100644 --- a/repos/os/recipes/pkg/test-slab/runtime +++ b/repos/os/recipes/pkg/test-slab/runtime @@ -25,8 +25,6 @@ <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <start name="test-slab" caps="200"> - <resource name="RAM" quantum="64M"/> - </start> + <start name="test-slab" caps="200" ram="64M"/> </config> </runtime> diff --git a/repos/os/recipes/pkg/test-terminal_crosslink/runtime b/repos/os/recipes/pkg/test-terminal_crosslink/runtime index 8ed638716f..c1cfb9e54d 100644 --- a/repos/os/recipes/pkg/test-terminal_crosslink/runtime +++ b/repos/os/recipes/pkg/test-terminal_crosslink/runtime @@ -27,13 +27,10 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="200"/> - <start name="terminal_crosslink"> - <resource name="RAM" quantum="2M"/> + <start name="terminal_crosslink" ram="2M"> <provides> <service name="Terminal"/> </provides> <config buffer="4K"/> </start> - <start name="test-terminal_crosslink"> - <resource name="RAM" quantum="1M"/> - </start> + <start name="test-terminal_crosslink" ram="1M"/> </config> </runtime> diff --git a/repos/os/recipes/pkg/test-trace/runtime b/repos/os/recipes/pkg/test-trace/runtime index e292efe31d..22a6e35cd5 100644 --- a/repos/os/recipes/pkg/test-trace/runtime +++ b/repos/os/recipes/pkg/test-trace/runtime @@ -32,33 +32,28 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="200"/> - <start name="sequence"> - <resource name="RAM" quantum="15M"/> + <start name="sequence" ram="15M"> <config> <start name="test-trace"> - <resource name="RAM" quantum="10M"/> <config> <trace_policy label="sequence -> test-trace" thread="test-thread" module="null"/> </config> </start> <start name="test-trace"> - <resource name="RAM" quantum="10M"/> <config> <trace_policy label="top" thread="ep" module="null"/> </config> </start> <start name="test-trace"> - <resource name="RAM" quantum="10M"/> <config> <trace_policy label="top" thread="ep" module="null"/> </config> </start> </config> </start> - <start name="top"> - <resource name="RAM" quantum="2M"/> + <start name="top" ram="2M"> <config period_ms="500"/> </start> </config> diff --git a/repos/os/recipes/pkg/test-trace_buffer/runtime b/repos/os/recipes/pkg/test-trace_buffer/runtime index 007c8af504..0b85dc1ddb 100644 --- a/repos/os/recipes/pkg/test-trace_buffer/runtime +++ b/repos/os/recipes/pkg/test-trace_buffer/runtime @@ -25,8 +25,6 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="200"/> - <start name="test-trace_buffer"> - <resource name="RAM" quantum="2M"/> - </start> + <start name="test-trace_buffer" ram="2M"/> </config> </runtime> diff --git a/repos/os/recipes/pkg/test-trace_logger/runtime b/repos/os/recipes/pkg/test-trace_logger/runtime index c09782a4ef..1388912192 100644 --- a/repos/os/recipes/pkg/test-trace_logger/runtime +++ b/repos/os/recipes/pkg/test-trace_logger/runtime @@ -45,8 +45,7 @@ </default-route> <default caps="100"/> - <start name="trace_logger"> - <resource name="RAM" quantum="80M"/> + <start name="trace_logger" ram="80M"> <config verbose="yes" priority="no" sc_time="no" session_ram="10M" session_arg_buffer="64K" period_sec="3" default_policy="null" default_buffer="1K"> <policy label_prefix="cpu_burner" thread="ep"/> @@ -61,8 +60,7 @@ </route> </start> - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="cpu_burner1.config"> @@ -88,13 +86,10 @@ </config> </start> - <start name="test-trace_logger"> - <resource name="RAM" quantum="1M"/> - </start> + <start name="test-trace_logger" ram="1M"/> - <start name="cpu_burner.1"> + <start name="cpu_burner.1" ram="1280K"> <binary name="cpu_burner"/> - <resource name="RAM" quantum="1280K"/> <route> <service name="ROM" label="config"> <child name="dynamic_rom" label="cpu_burner1.config"/> </service> @@ -102,9 +97,8 @@ </route> </start> - <start name="cpu_burner.2"> + <start name="cpu_burner.2" ram="1280K"> <binary name="cpu_burner"/> - <resource name="RAM" quantum="1280K"/> <route> <service name="ROM" label="config"> <child name="dynamic_rom" label="cpu_burner2.config"/> </service> diff --git a/repos/os/recipes/pkg/test-utf8/runtime b/repos/os/recipes/pkg/test-utf8/runtime index e256e9b5a4..695fbf13eb 100644 --- a/repos/os/recipes/pkg/test-utf8/runtime +++ b/repos/os/recipes/pkg/test-utf8/runtime @@ -22,8 +22,6 @@ <any-service> <any-child/> <parent/> </any-service> </default-route> <default caps="100"/> - <start name="test-utf8"> - <resource name="RAM" quantum="1M"/> - </start> + <start name="test-utf8" ram="1M"/> </config> </runtime> diff --git a/repos/os/recipes/pkg/test-vfs_block/runtime b/repos/os/recipes/pkg/test-vfs_block/runtime index 0b072b66c5..9b1f7927d7 100644 --- a/repos/os/recipes/pkg/test-vfs_block/runtime +++ b/repos/os/recipes/pkg/test-vfs_block/runtime @@ -35,8 +35,7 @@ <default caps="100"/> - <start name="vfs_block" caps="150"> - <resource name="RAM" quantum="38M"/> + <start name="vfs_block" caps="150" ram="38M"> <provides> <service name="Block"/> </provides> <config> <vfs> @@ -52,8 +51,7 @@ </route> </start> - <start name="block_tester" caps="200"> - <resource name="RAM" quantum="8M"/> + <start name="block_tester" caps="200" ram="8M"> <config verbose="no" report="no" log="yes" stop_on_error="no"> <tests> <sequential length="30M" size="4K" batch="32"/> diff --git a/repos/os/recipes/pkg/test-vfs_stress_fs/runtime b/repos/os/recipes/pkg/test-vfs_stress_fs/runtime index c796894ede..6853244fe8 100644 --- a/repos/os/recipes/pkg/test-vfs_stress_fs/runtime +++ b/repos/os/recipes/pkg/test-vfs_stress_fs/runtime @@ -28,12 +28,10 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="vfs_stress"> - <resource name="RAM" quantum="8M"/> + <start name="vfs_stress" ram="8M"> <config depth="16"> <vfs> <fs/> </vfs> </config> </start> - <start name="ram_fs" caps="120"> - <resource name="RAM" quantum="80M"/> + <start name="ram_fs" caps="120" ram="80M"> <binary name="vfs"/> <provides><service name="File_system"/></provides> <config> diff --git a/repos/os/recipes/pkg/test-vfs_stress_ram/runtime b/repos/os/recipes/pkg/test-vfs_stress_ram/runtime index b1822219c8..0ebcedde99 100644 --- a/repos/os/recipes/pkg/test-vfs_stress_ram/runtime +++ b/repos/os/recipes/pkg/test-vfs_stress_ram/runtime @@ -27,8 +27,7 @@ <any-service> <parent/> <any-child/> </any-service> </default-route> <default caps="100"/> - <start name="vfs_stress"> - <resource name="RAM" quantum="80M"/> + <start name="vfs_stress" ram="80M"> <config depth="16"> <vfs> <ram/> </vfs> </config> </start> </config> diff --git a/repos/os/recipes/pkg/test-weak_ptr/runtime b/repos/os/recipes/pkg/test-weak_ptr/runtime index 345fa54b7d..ebd9d5ced2 100644 --- a/repos/os/recipes/pkg/test-weak_ptr/runtime +++ b/repos/os/recipes/pkg/test-weak_ptr/runtime @@ -27,8 +27,6 @@ <any-service> <any-child/> <parent/> </any-service> </default-route> <default caps="100"/> - <start name="test-weak_ptr"> - <resource name="RAM" quantum="10M"/> - </start> + <start name="test-weak_ptr" ram="10M"/> </config> </runtime> diff --git a/repos/os/recipes/raw/drivers_interactive-linux/drivers.config b/repos/os/recipes/raw/drivers_interactive-linux/drivers.config index 7dd82b9ef2..0303152d5e 100644 --- a/repos/os/recipes/raw/drivers_interactive-linux/drivers.config +++ b/repos/os/recipes/raw/drivers_interactive-linux/drivers.config @@ -9,16 +9,14 @@ <service name="Event"/> </parent-provides> - <start name="fb_sdl" caps="100" ld="no"> - <resource name="RAM" quantum="32M"/> + <start name="fb_sdl" caps="100" ram="32M" ld="no"> <route> <service name="Event"> <child name="event_filter" label="sdl"/> </service> <any-service> <parent/> </any-service> </route> </start> - <start name="event_filter" caps="80"> - <resource name="RAM" quantum="1280K"/> + <start name="event_filter" caps="80" ram="1280K"> <provides> <service name="Event"/> </provides> <route> <service name="ROM" label="config"> <parent label="event_filter.config"/> </service> diff --git a/repos/os/recipes/raw/drivers_interactive-pbxa9/drivers.config b/repos/os/recipes/raw/drivers_interactive-pbxa9/drivers.config index 8f0ebc50db..c0f6484cb0 100644 --- a/repos/os/recipes/raw/drivers_interactive-pbxa9/drivers.config +++ b/repos/os/recipes/raw/drivers_interactive-pbxa9/drivers.config @@ -13,8 +13,7 @@ <default caps="100"/> - <start name="platform" managing_system="yes"> - <resource name="RAM" quantum="2M"/> + <start name="platform" managing_system="yes" ram="2M"> <provides> <service name="Platform"/> </provides> <route> <any-service> <parent/> </any-service> </route> <config> @@ -29,9 +28,8 @@ </config> </start> - <start name="fb"> + <start name="fb" ram="4M"> <binary name="pl11x_fb"/> - <resource name="RAM" quantum="4M"/> <route> <service name="Platform"> <child name="platform"/> @@ -45,9 +43,8 @@ </route> </start> - <start name="ps2"> + <start name="ps2" ram="1M"> <binary name="pl050_input"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Input"/> </provides> <route> <service name="Platform"> <child name="platform"/> </service> @@ -60,8 +57,7 @@ </route> </start> - <start name="event_filter" caps="90"> - <resource name="RAM" quantum="1280K"/> + <start name="event_filter" caps="90" ram="1280K"> <provides> <service name="Event"/> </provides> <route> <service name="ROM" label="config"> diff --git a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config index d2f7463ea9..2f0a376ea2 100644 --- a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config +++ b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config @@ -16,8 +16,7 @@ <default caps="60"/> - <start name="acpi" caps="250"> - <resource name="RAM" quantum="4M"/> + <start name="acpi" caps="250" ram="4M"> <route> <service name="IO_MEM"> <parent/> </service> <service name="LOG"> <parent/> </service> @@ -29,8 +28,7 @@ </route> </start> - <start name="report_rom" caps="70"> - <resource name="RAM" quantum="1M"/> + <start name="report_rom" caps="70" ram="1M"> <provides> <service name="ROM" /> <service name="Report" /> @@ -48,8 +46,7 @@ </route> </start> - <start name="pci_decode" caps="100"> - <resource name="RAM" quantum="2M"/> + <start name="pci_decode" caps="100" ram="2M"> <route> <service name="Report"> <child name="report_rom"/> </service> <service name="ROM" label="system"> <child name="report_rom"/> </service> @@ -62,8 +59,7 @@ </route> </start> - <start name="platform" caps="200" managing_system="yes"> - <resource name="RAM" quantum="3M"/> + <start name="platform" caps="200" ram="3M" managing_system="yes"> <provides> <service name="Platform"/> </provides> @@ -87,9 +83,8 @@ </config> </start> - <start name="fb" caps="120"> + <start name="fb" caps="120" ram="20M"> <binary name="vesa_fb"/> - <resource name="RAM" quantum="20M"/> <route> <service name="ROM" label="config"> <parent label="fb.config"/> </service> <service name="Platform"> <child name="platform"/> </service> @@ -104,8 +99,7 @@ </route> </start> - <start name="ps2" caps="80"> - <resource name="RAM" quantum="1280K"/> + <start name="ps2" caps="80" ram="1280K"> <config/> <route> <service name="Platform"> <child name="platform"/> </service> @@ -118,9 +112,8 @@ </route> </start> - <start name="usb" caps="200"> + <start name="usb" caps="200" ram="16M"> <binary name="pc_usb_host"/> - <resource name="RAM" quantum="16M"/> <provides> <service name="Usb"/> </provides> <config> <report devices="yes"/> @@ -138,8 +131,7 @@ </route> </start> - <start name="usb_hid" caps="180"> - <resource name="RAM" quantum="10M"/> + <start name="usb_hid" caps="180" ram="10M"> <route> <service name="ROM" label="report"> <child name="report_rom"/> </service> <service name="ROM"> <parent/> </service> @@ -153,8 +145,7 @@ </route> </start> - <start name="event_filter" caps="90"> - <resource name="RAM" quantum="1280K"/> + <start name="event_filter" caps="90" ram="1280K"> <provides> <service name="Event"/> </provides> <route> <service name="ROM" label="config"> <parent label="event_filter.config"/> </service> diff --git a/repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/drivers.config b/repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/drivers.config index 0f43fc05c0..830b42c321 100644 --- a/repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/drivers.config +++ b/repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/drivers.config @@ -13,14 +13,12 @@ <default caps="100"/> - <start name="virtdev_rom"> - <resource name="RAM" quantum="640K"/> + <start name="virtdev_rom" ram="640K"> <provides> <service name="ROM"/> </provides> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="platform" managing_system="yes"> - <resource name="RAM" quantum="2M"/> + <start name="platform" managing_system="yes" ram="2M"> <provides> <service name="Platform"/> </provides> <route> <service name="ROM" label="devices"> @@ -41,8 +39,7 @@ </config> </start> - <start name="event_filter" caps="90"> - <resource name="RAM" quantum="1280K"/> + <start name="event_filter" caps="90" ram="1280K"> <provides> <service name="Event"/> </provides> <route> <service name="ROM" label="config"> @@ -57,9 +54,8 @@ </route> </start> - <start name="virtio_keyboard" caps="70"> + <start name="virtio_keyboard" caps="70" ram="1M"> <binary name="virtio_mmio_input"/> - <resource name="RAM" quantum="1M"/> <config match_product="keyboard"/> <route> <service name="Platform"> <child name="platform"/> </service> @@ -71,9 +67,8 @@ </route> </start> - <start name="virtio_mouse" caps="80"> + <start name="virtio_mouse" caps="80" ram="1M"> <binary name="virtio_mmio_input"/> - <resource name="RAM" quantum="1M"/> <config match_product="mouse"/> <route> <service name="Platform"> <child name="platform"/> </service> @@ -85,9 +80,8 @@ </route> </start> - <start name="virtio_fb" caps="120"> + <start name="virtio_fb" caps="120" ram="50M"> <binary name="virtio_mmio_fb"/> - <resource name="RAM" quantum="50M"/> <route> <service name="Platform"> <child name="platform"/> </service> <any-service> <parent/> </any-service> diff --git a/repos/os/recipes/raw/drivers_nic-linux/drivers.config b/repos/os/recipes/raw/drivers_nic-linux/drivers.config index 3796211bc2..16786a32b5 100644 --- a/repos/os/recipes/raw/drivers_nic-linux/drivers.config +++ b/repos/os/recipes/raw/drivers_nic-linux/drivers.config @@ -13,9 +13,8 @@ <default caps="100"/> - <start name="nic" ld="no"> + <start name="nic" ld="no" ram="4M"> <binary name="linux_nic"/> - <resource name="RAM" quantum="4M"/> <route> <any-service> <parent/> </any-service> </route> </start> </config> diff --git a/repos/os/recipes/raw/drivers_nic-pbxa9/drivers.config b/repos/os/recipes/raw/drivers_nic-pbxa9/drivers.config index c3c69df9b5..5f5b74b58e 100644 --- a/repos/os/recipes/raw/drivers_nic-pbxa9/drivers.config +++ b/repos/os/recipes/raw/drivers_nic-pbxa9/drivers.config @@ -13,8 +13,7 @@ <default caps="100"/> - <start name="platform" managing_system="yes"> - <resource name="RAM" quantum="2M"/> + <start name="platform" managing_system="yes" ram="2M"> <provides> <service name="Platform"/> </provides> <route> <any-service> <parent/> </any-service> </route> <config> @@ -24,9 +23,8 @@ </config> </start> - <start name="nic"> + <start name="nic" ram="4M"> <binary name="lan9118_nic"/> - <resource name="RAM" quantum="4M"/> <route> <service name="Platform"> <child name="platform"/> diff --git a/repos/os/recipes/raw/drivers_nic-virt_qemu_arm/drivers.config b/repos/os/recipes/raw/drivers_nic-virt_qemu_arm/drivers.config index 134381a173..642ffaf23a 100644 --- a/repos/os/recipes/raw/drivers_nic-virt_qemu_arm/drivers.config +++ b/repos/os/recipes/raw/drivers_nic-virt_qemu_arm/drivers.config @@ -13,14 +13,12 @@ <default caps="100"/> - <start name="virtdev_rom"> - <resource name="RAM" quantum="640K"/> + <start name="virtdev_rom" ram="640K"> <provides> <service name="ROM"/> </provides> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="platform" managing_system="yes"> - <resource name="RAM" quantum="2M"/> + <start name="platform" managing_system="yes" ram="2M"> <provides> <service name="Platform"/> </provides> <route> <service name="ROM" label="devices"> @@ -35,8 +33,7 @@ </config> </start> - <start name="virtio_mmio_nic"> - <resource name="RAM" quantum="5M"/> + <start name="virtio_mmio_nic" ram="5M"> <route> <service name="Platform"> <child name="platform"/> diff --git a/repos/os/recipes/raw/test-init/test-init.config b/repos/os/recipes/raw/test-init/test-init.config index 1fcfc155b3..11a9b26cc4 100644 --- a/repos/os/recipes/raw/test-init/test-init.config +++ b/repos/os/recipes/raw/test-init/test-init.config @@ -15,9 +15,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="application"> + <start name="application" ram="1G"> <binary name="dummy"/> - <resource name="RAM" quantum="1G"/> <config> <log string="started"/> </config> @@ -53,9 +52,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="exiting"> + <start name="exiting" ram="2M"> <binary name="dummy"/> - <resource name="RAM" quantum="2M"/> <config> <log string="started"/> <exit/> @@ -86,18 +84,16 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="exiting"> + <start name="exiting" ram="2M"> <binary name="dummy"/> - <resource name="RAM" quantum="2M"/> <config> <log string="started"/> <exit/> </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="unrelated"> + <start name="unrelated" ram="2M"> <binary name="dummy"/> - <resource name="RAM" quantum="2M"/> <config/> <route> <any-service> <parent/> </any-service> </route> </start> @@ -131,16 +127,14 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="server"> + <start name="server" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config> <log_service/> </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="indirect_server"> + <start name="indirect_server" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config> <log_service/> </config> <route> @@ -148,9 +142,8 @@ <any-service> <parent/> </any-service> </route> </start> - <start name="client"> + <start name="client" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <config> <log string="client started"/> <create_log_connections count="1"/> @@ -193,23 +186,20 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="server"> + <start name="server" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config> <log_service/> </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="indirect_server"> + <start name="indirect_server" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config> <log_service/> </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="client"> + <start name="client" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <config> <log string="client started"/> <create_log_connections count="1"/> @@ -246,16 +236,14 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="server"> + <start name="server" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config> <log_service/> </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="indirect_server"> + <start name="indirect_server" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config> <log_service/> </config> <route> <any-service> <parent/> </any-service> </route> @@ -290,14 +278,12 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="log"> + <start name="log" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <config> <log string="no service yet"/> </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="dummy"> - <resource name="RAM" quantum="1M"/> + <start name="dummy" ram="1M"> <config> <log string="started"/> </config> <route> <service name="LOG"> <child name="log"/> </service> @@ -328,15 +314,13 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="log"> + <start name="log" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config version="providing service"> <log_service/> </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="dummy"> - <resource name="RAM" quantum="1M"/> + <start name="dummy" ram="1M"> <config> <log string="started"/> </config> <route> <service name="LOG"> <child name="log"/> </service> @@ -362,14 +346,12 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="log"> + <start name="log" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <config version="became unavailable"/> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="dummy"> - <resource name="RAM" quantum="1M"/> + <start name="dummy" ram="1M"> <config> <log string="started"/> </config> <route> <service name="LOG"> <child name="log"/> </service> @@ -396,9 +378,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="application"> + <start name="application" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <config version="Version A"/> <route> <any-service> <parent/> </any-service> </route> </start> @@ -412,9 +393,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="application"> + <start name="application" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <config version="Version B"/> <route> <any-service> <parent/> </any-service> </route> </start> @@ -435,9 +415,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="application" version="X"> + <start name="application" version="X" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <config version="Version B"/> <route> <any-service> <parent/> </any-service> </route> </start> @@ -460,9 +439,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="test"> + <start name="test" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <config version="binary-name test"/> <route> <any-service> <parent/> </any-service> @@ -486,9 +464,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="test"> + <start name="test" ram="1M"> <binary name="renamed_dummy"/> - <resource name="RAM" quantum="1M"/> <config version="binary re-routed to same route"/> <route> <service name="ROM" unscoped_label="renamed_dummy"> @@ -512,9 +489,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="test"> + <start name="test" ram="1M"> <binary name="another_dummy"/> - <resource name="RAM" quantum="1M"/> <config version="binary re-routed to other route"/> <route> <service name="ROM" unscoped_label="renamed_dummy"> @@ -539,15 +515,13 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="regular"> + <start name="regular" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <config> <log string="regular component started"/> </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="greedy"> + <start name="greedy" ram="1G"> <binary name="dummy"/> - <resource name="RAM" quantum="1G"/> <config> <log string="greedy component started"/> </config> <route> <any-service> <parent/> </any-service> </route> </start> @@ -575,9 +549,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="test"> + <start name="test" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <config version="initial" /> <route> <any-service> <parent/> </any-service> </route> </start> @@ -603,9 +576,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="test"> + <start name="test" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="upgraded" /> <route> <any-service> <parent/> </any-service> </route> </start> @@ -631,15 +603,13 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="test"> + <start name="test" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config/> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="greedy"> + <start name="greedy" ram="1G"> <binary name="dummy"/> - <resource name="RAM" quantum="1G"/> <config version="started"/> <route> <any-service> <parent/> </any-service> </route> </start> @@ -660,15 +630,13 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="test"> + <start name="test" ram="8M"> <binary name="dummy"/> - <resource name="RAM" quantum="8M"/> <config version="upgrade impossible"/> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="greedy"> + <start name="greedy" ram="1G"> <binary name="dummy"/> - <resource name="RAM" quantum="1G"/> <config version="started"/> <route> <any-service> <parent/> </any-service> </route> </start> @@ -693,9 +661,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="test"> + <start name="test" ram="8M"> <binary name="dummy"/> - <resource name="RAM" quantum="8M"/> <config version="upgraded to 8 MiB"/> <route> <any-service> <parent/> </any-service> </route> </start> @@ -721,9 +688,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="test"> + <start name="test" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="downgraded to 4 MiB"/> <route> <any-service> <parent/> </any-service> </route> </start> @@ -748,9 +714,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="test"> + <start name="test" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="consume 2 MiB"> <handle_yield_requests/> <consume_ram amount="2M"/> @@ -771,9 +736,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="test"> + <start name="test" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="consume 2 MiB"> <handle_yield_requests/> <consume_ram amount="2M"/> @@ -800,9 +764,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="test"> + <start name="test" ram="2M"> <binary name="dummy"/> - <resource name="RAM" quantum="2M"/> <config version="consume 2 MiB"> <handle_yield_requests/> <consume_ram amount="2M"/> @@ -829,9 +792,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="test"> + <start name="test" ram="2M"> <binary name="dummy"/> - <resource name="RAM" quantum="2M"/> <config version="request more quota than avail"> <consume_ram amount="4M"/> </config> @@ -859,9 +821,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="test"> + <start name="test" ram="6M"> <binary name="dummy"/> - <resource name="RAM" quantum="6M"/> <config version="request more quota than avail"> <consume_ram amount="4M"/> </config> @@ -898,9 +859,8 @@ <service name="PD"/> <service name="LOG"/> </parent-provides> - <start name="test" caps="100"> + <start name="test" caps="100" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <config version="initial" /> <route> <any-service> <parent/> </any-service> </route> </start> @@ -925,9 +885,8 @@ <service name="PD"/> <service name="LOG"/> </parent-provides> - <start name="test" caps="400"> + <start name="test" caps="400" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <config version="upgraded" /> <route> <any-service> <parent/> </any-service> </route> </start> @@ -952,15 +911,13 @@ <service name="PD"/> <service name="LOG"/> </parent-provides> - <start name="test" caps="400"> + <start name="test" caps="400" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config/> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="greedy" caps="1000000"> + <start name="greedy" caps="1000000" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="started"/> <route> <any-service> <parent/> </any-service> </route> </start> @@ -980,15 +937,13 @@ <service name="PD"/> <service name="LOG"/> </parent-provides> - <start name="test" caps="800"> + <start name="test" caps="800" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="upgrade impossible"/> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="greedy" caps="1000000"> + <start name="greedy" caps="1000000" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="started"/> <route> <any-service> <parent/> </any-service> </route> </start> @@ -1013,9 +968,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="test" caps="800"> + <start name="test" caps="800" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="upgraded to 800 caps"/> <route> <any-service> <parent/> </any-service> </route> </start> @@ -1040,9 +994,8 @@ <service name="PD"/> <service name="LOG"/> </parent-provides> - <start name="test" caps="200"> + <start name="test" caps="200" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="downgraded to 200 caps"/> <route> <any-service> <parent/> </any-service> </route> </start> @@ -1067,9 +1020,8 @@ <service name="PD"/> <service name="LOG"/> </parent-provides> - <start name="test" caps="200"> + <start name="test" caps="200" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="consume 100 caps"> <handle_yield_requests/> <consume_caps amount="100"/> @@ -1090,9 +1042,8 @@ <service name="PD"/> <service name="LOG"/> </parent-provides> - <start name="test" caps="200"> + <start name="test" caps="200" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="consume 100 caps"> <handle_yield_requests/> <consume_caps amount="100"/> @@ -1118,9 +1069,8 @@ <service name="PD"/> <service name="LOG"/> </parent-provides> - <start name="test" caps="100"> + <start name="test" caps="100" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="consume 100 caps"> <handle_yield_requests/> <consume_caps amount="100"/> @@ -1146,9 +1096,8 @@ <service name="PD"/> <service name="LOG"/> </parent-provides> - <start name="test" caps="100"> + <start name="test" caps="100" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="request more quota than avail"> <consume_caps amount="100"/> </config> @@ -1175,9 +1124,8 @@ <service name="PD"/> <service name="LOG"/> </parent-provides> - <start name="test" caps="200"> + <start name="test" caps="200" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="request more quota than avail"> <consume_caps amount="100"/> </config> @@ -1215,9 +1163,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="service_init" caps="200"> + <start name="service_init" caps="200" ram="10M"> <binary name="init"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="LOG"/> </provides> <config> <parent-provides> @@ -1234,9 +1181,8 @@ </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="test"> + <start name="test" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="initial"> <create_log_connections count="1" ram_upgrade="3M"/> <destroy_log_connections/> @@ -1285,9 +1231,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="service_init" caps="200"> + <start name="service_init" caps="200" ram="10M"> <binary name="init"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="LOG"/> </provides> <config> <parent-provides> @@ -1304,9 +1249,8 @@ </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="test"> + <start name="test" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="initial"> <create_log_connections count="1" ram_upgrade="3M"/> <destroy_log_connections/> @@ -1335,9 +1279,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="service_init" caps="200"> + <start name="service_init" caps="200" ram="10M"> <binary name="init"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="LOG"/> </provides> <config> <parent-provides> @@ -1350,9 +1293,8 @@ <service name="LOG"> <default-policy> <child name="server"/> </default-policy> </service> - <start name="server"> + <start name="server" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config> <log_service verbose="yes"/> </config> <route> <any-service> <parent/> </any-service> </route> @@ -1360,9 +1302,8 @@ </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="test"> + <start name="test" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="initial"> <create_log_connections count="1" ram_upgrade="3M"/> <destroy_log_connections/> @@ -1405,9 +1346,8 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="service_init" caps="200"> + <start name="service_init" caps="200" ram="10M"> <binary name="init"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="LOG"/> </provides> <config> <parent-provides> @@ -1417,9 +1357,8 @@ <service name="LOG"/> </parent-provides> <default caps="60"/> - <start name="server"> + <start name="server" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config> <log_service verbose="yes"/> </config> <route> <any-service> <parent/> </any-service> </route> @@ -1427,9 +1366,8 @@ </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="test"> + <start name="test" ram="4M"> <binary name="dummy"/> - <resource name="RAM" quantum="4M"/> <config version="initial"> <create_log_connections count="1" ram_upgrade="3M"/> <destroy_log_connections/> @@ -1454,19 +1392,17 @@ <service name="PD"/> <service name="LOG"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="server"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config> <log_service/> </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="client"> + <start name="client" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <config> <log string="client started"/> <create_log_connections count="1"/> @@ -1498,10 +1434,9 @@ <service name="PD"/> <service name="LOG"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="client"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <config> <log string="client started"/> <create_log_connections count="1"/> @@ -1534,10 +1469,9 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="flaky"> + <start name="flaky" ram="2M"> <binary name="dummy"/> <heartbeat/> - <resource name="RAM" quantum="2M"/> <config> <log string="started"/> <!-- respond to heartbeats --> @@ -1564,10 +1498,9 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="flaky"> + <start name="flaky" ram="2M"> <binary name="dummy"/> <heartbeat/> - <resource name="RAM" quantum="2M"/> <config version="freeze"> <log string="getting stuck..."/> <sleep_forever/> <!-- heartbeat stops --> @@ -1595,15 +1528,13 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="server"> + <start name="server" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config> <log_service/> </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="dummy" version="1"> - <resource name="RAM" quantum="1M"/> + <start name="dummy" version="1" ram="1M"> <config> <log string="started version 1"/> </config> <route> <service name="LOG"> @@ -1622,15 +1553,13 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="server"> + <start name="server" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config> <log_service/> </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="dummy" version="2"> - <resource name="RAM" quantum="1M"/> + <start name="dummy" version="2" ram="1M"> <config> <log string="started version 2"/> </config> <route> <service name="LOG"> @@ -1652,10 +1581,9 @@ <service name="LOG"/> </parent-provides> <default caps="100"/> - <start name="affinity"> + <start name="affinity" ram="2M"> <affinity xpos="0"/> <binary name="dummy"/> - <resource name="RAM" quantum="2M"/> <config/> <route> <any-service> <parent/> </any-service> </route> </start> @@ -1681,16 +1609,14 @@ </parent-provides> <default caps="100"/> <report requested="yes" provided="yes" delay_ms="100"/> - <start name="server"> + <start name="server" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config> <log_service delay_close_ms="750"/> </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="client"> + <start name="client" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <config> <log string="client started"/> <create_log_connections count="1"/> @@ -1725,9 +1651,8 @@ </parent-provides> <default caps="100"/> <report requested="yes" provided="yes" delay_ms="100"/> - <start name="server"> + <start name="server" ram="1M"> <binary name="dummy"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config> <log_service delay_close_ms="500"/> </config> <route> <any-service> <parent/> </any-service> </route> diff --git a/repos/os/run/ahci_block.run b/repos/os/run/ahci_block.run index be331b6525..491c4d0264 100644 --- a/repos/os/run/ahci_block.run +++ b/repos/os/run/ahci_block.run @@ -34,15 +34,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="report_rom"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config> <policy label="pci_decode -> system" report="acpi -> acpi"/> @@ -50,8 +48,7 @@ install_config { </config> </start> - <start name="acpi" caps="350"> - <resource name="RAM" quantum="4M"/> + <start name="acpi" caps="350" ram="4M"> <route> <service name="Report"> <child name="report_rom"/> </service> <service name="IO_MEM"> <parent/> </service> @@ -63,8 +60,7 @@ install_config { </route> </start> - <start name="pci_decode" caps="350"> - <resource name="RAM" quantum="2M"/> + <start name="pci_decode" caps="350" ram="2M"> <route> <service name="Report"> <child name="report_rom"/> </service> <service name="ROM" label="system"> <child name="report_rom"/> </service> @@ -78,7 +74,6 @@ install_config { </start> <start name="platform" caps="100" managing_system="yes"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Platform"/> </provides> @@ -102,13 +97,11 @@ install_config { <start name="ahci_report_rom"> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> </start> - <start name="ahci"> - <resource name="RAM" quantum="10M" /> + <start name="ahci" ram="10M"> <provides><service name="Block" /></provides> <config atapi="yes"> <report ports="yes"/> @@ -121,9 +114,8 @@ install_config { </route> </start> - <start name="test-ahci"> + <start name="test-ahci" ram="50M"> <binary name="block_tester" /> - <resource name="RAM" quantum="50M" /> <config verbose="no" report="no" log="yes" stop_on_error="no"> <tests> <sequential length="8M" size="1M" io_buffer="8M" batch="4"/> @@ -136,9 +128,8 @@ install_config { </route> </start> - <start name="test-ahci-atapi"> + <start name="test-ahci-atapi" ram="50M"> <binary name="block_tester" /> - <resource name="RAM" quantum="50M" /> <config verbose="no" report="no" log="yes" stop_on_error="no"> <tests> <sequential length="1M" size="1M" io_buffer="8M" batch="4"/> diff --git a/repos/os/run/block_request_stream.run b/repos/os/run/block_request_stream.run index 5048659888..bc4cebe40c 100644 --- a/repos/os/run/block_request_stream.run +++ b/repos/os/run/block_request_stream.run @@ -19,21 +19,19 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> + <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> <start name="test-block_request_stream"> - <resource name="RAM" quantum="1M"/> <provides><service name="Block"/></provides> <config/> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="block_tester"> - <resource name="RAM" quantum="32M"/> + <start name="block_tester" ram="32M"> <config verbose="yes" report="no" log="yes" stop_on_error="no"> <tests> <sequential copy="no" length="16M" size="4K"/> diff --git a/repos/os/run/block_tester.run b/repos/os/run/block_tester.run index e7e2fe27a4..ff5574d813 100644 --- a/repos/os/run/block_tester.run +++ b/repos/os/run/block_tester.run @@ -47,35 +47,31 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> + <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> <start name="block_report_rom"> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> </start> - <start name="lx_block0" ld="no"> + <start name="lx_block0" ld="no" ram="2G"> <binary name="lx_block"/> - <resource name="RAM" quantum="2G"/> <provides><service name="Block"/></provides> <config file="block0.raw" block_size="512" writeable="yes"/> </start> - <start name="lx_block1" ld="no"> + <start name="lx_block1" ld="no" ram="2G"> <binary name="lx_block"/> - <resource name="RAM" quantum="2G"/> <provides><service name="Block"/></provides> <config file="block1.raw" block_size="512" writeable="yes"/> </start> - <start name="part_block0"> + <start name="part_block0" ram="10M"> <binary name="part_block"/> - <resource name="RAM" quantum="10M" /> <provides><service name="Block" /></provides> <route> <service name="Report"><child name="block_report_rom"/></service> @@ -89,9 +85,8 @@ install_config { </config> </start> - <start name="part_block1"> + <start name="part_block1" ram="10M"> <binary name="part_block"/> - <resource name="RAM" quantum="10M" /> <provides><service name="Block" /></provides> <route> <service name="Report"><child name="block_report_rom"/></service> @@ -105,9 +100,8 @@ install_config { </config> </start> - <start name="test-part0"> + <start name="test-part0" ram="32M"> <binary name="block_tester" /> - <resource name="RAM" quantum="32M" /> <config verbose="no" log="yes" stop_on_error="no"> <tests> <sequential length="2M" size="256K" io_buffer="8M" batch="4"/> @@ -119,9 +113,8 @@ install_config { </route> </start> - <start name="block_tester0"> + <start name="block_tester0" ram="32M"> <binary name="block_tester" /> - <resource name="RAM" quantum="32M"/> <config verbose="yes" report="no" log="yes" stop_on_error="no"> <tests> <!-- synchronous="no" 4K/8K currently leads to deadlocking ahci --> @@ -189,9 +182,8 @@ install_config { </route> </start> - <start name="test-part1"> + <start name="test-part1" ram="32M"> <binary name="block_tester" /> - <resource name="RAM" quantum="32M" /> <config verbose="no" log="yes" stop_on_error="no"> <tests> <sequential length="2M" size="256K" io_buffer="8M" batch="4"/> @@ -203,9 +195,8 @@ install_config { </route> </start> - <start name="block_tester1"> + <start name="block_tester1" ram="32M"> <binary name="block_tester" /> - <resource name="RAM" quantum="32M"/> <config verbose="yes" report="no" log="yes" stop_on_error="no"> <tests> <!-- synchronous="no" 4K/8K currently leads to deadlocking ahci --> diff --git a/repos/os/run/bomb.run b/repos/os/run/bomb.run index 6c9b1b8d33..72f9ff5ad1 100644 --- a/repos/os/run/bomb.run +++ b/repos/os/run/bomb.run @@ -46,15 +46,13 @@ install_config { </default-route> <resource name="RAM" preserve="2M"/> <resource name="CAP" preserve="100"/> - <start name="timer" caps="100"> + <start name="timer" caps="100" ram="1M"> <resource name="CPU" quantum="10"/> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="bomb-master" priority="-1" caps="100000"> + <start name="bomb-master" priority="-1" caps="100000" ram="2G"> <binary name="bomb"/> <resource name="CPU" quantum="90"/> - <resource name="RAM" quantum="2G"/> <config rounds="} $rounds {" generations="} $generations {" children="} $children {" sleep="} $sleep {" demand="} $demand {"/> </start> diff --git a/repos/os/run/cache.run b/repos/os/run/cache.run index 66d5730d7f..770b89d63a 100644 --- a/repos/os/run/cache.run +++ b/repos/os/run/cache.run @@ -16,9 +16,7 @@ install_config { </default-route> <default caps="100"/> - <start name="test-cache"> - <resource name="RAM" quantum="64M"/> - </start> + <start name="test-cache" ram="64M"/> </config> } build_boot_image [build_artifacts] diff --git a/repos/os/run/cpu_balancer.run b/repos/os/run/cpu_balancer.run index fdc63aeb95..70ccc6d71e 100644 --- a/repos/os/run/cpu_balancer.run +++ b/repos/os/run/cpu_balancer.run @@ -26,9 +26,8 @@ proc report_rom_start_node { } { return { } } return { - <start name="report_rom"> + <start name="report_rom" ram="1M"> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> <route> @@ -61,10 +60,9 @@ install_config { <service name="PD"> <parent/> </service> <service name="ROM"> <parent/> </service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> <route> <any-service> <parent/> </any-service> @@ -73,8 +71,7 @@ install_config { } [report_rom_start_node] { - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/> </provides> <config verbose="yes"> <rom name="cpu_balancer.config"> @@ -119,8 +116,7 @@ install_config { </route> </start> - <start name="cpu_balancer" caps="120"> - <resource name="RAM" quantum="2M"/> + <start name="cpu_balancer" caps="120" ram="2M"> <provides> <service name="PD"/> <service name="CPU"/> @@ -135,10 +131,9 @@ install_config { </route> </start> - <start name="cpu_burner" priority="-1" caps="120"> + <start name="cpu_burner" priority="-1" caps="120" ram="3M"> <binary name="shim"/> <affinity xpos="1" ypos="0" width="2" height="1"/> - <resource name="RAM" quantum="3M"/> <config percent="95"/> <route> @@ -158,8 +153,7 @@ install_config { </route> </start> <!-- - <start name="top"> - <resource name="RAM" quantum="2M"/> + <start name="top" ram="2M"> <route> <service name="Timer"> <child name="timer"/> </service> <service name="CPU"> <child name="cpu_balancer"/> </service> diff --git a/repos/os/run/cpu_bench.run b/repos/os/run/cpu_bench.run index 23c8d295a2..7bf3c04ec4 100644 --- a/repos/os/run/cpu_bench.run +++ b/repos/os/run/cpu_bench.run @@ -26,9 +26,7 @@ install_config { <any-service> <parent/> </any-service> </default-route> <default caps="100"/> - <start name="cpu_bench"> - <resource name="RAM" quantum="10M"/> - </start> + <start name="cpu_bench" ram="10M"/> </config> } diff --git a/repos/os/run/demo.run b/repos/os/run/demo.run index 4c7514fd87..621c5952b5 100644 --- a/repos/os/run/demo.run +++ b/repos/os/run/demo.run @@ -35,15 +35,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1096K"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -55,7 +53,6 @@ install_config { </start> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="no"> <policy label="status_bar -> focus" report="nitpicker -> focus"/> @@ -68,7 +65,6 @@ install_config { <start name="nitpicker_config"> <binary name="rom_filter"/> - <resource name="RAM" quantum="1096K"/> <provides> <service name="ROM"/> </provides> <config> <input name="xray_enabled" rom="xray" node="xray"> @@ -127,7 +123,6 @@ install_config { </start> <start name="global_keys_handler"> - <resource name="RAM" quantum="1096K"/> <config> <bool name="xray" initial="no"/> @@ -148,8 +143,7 @@ install_config { </route> </start> - <start name="nitpicker" caps="120"> - <resource name="RAM" quantum="1216K"/> + <start name="nitpicker" caps="120" ram="1216K"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -165,12 +159,10 @@ install_config { </start> <start name="pointer"> - <resource name="RAM" quantum="1096K"/> <config/> </start> <start name="nit_focus"> - <resource name="RAM" quantum="1M"/> <config> <default-policy focus="yes"/> </config> <route> <service name="ROM" label="clicked"> <child name="report_rom"/> </service> @@ -180,16 +172,13 @@ install_config { </start> <start name="status_bar"> - <resource name="RAM" quantum="1096K"/> <route> <service name="ROM" label="focus"> <child name="report_rom"/> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="scout" caps="10000"> - <resource name="RAM" quantum="80M" /> - </start> + <start name="scout" caps="10000" ram="80M"/> </config>} # diff --git a/repos/os/run/dns.run b/repos/os/run/dns.run index 80d0f4246b..6451be50bc 100644 --- a/repos/os/run/dns.run +++ b/repos/os/run/dns.run @@ -20,12 +20,10 @@ append config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="dns_test"> - <resource name="RAM" quantum="1M"/> - <config> - </config> + <config/> </start> </config>} diff --git a/repos/os/run/event_filter.run b/repos/os/run/event_filter.run index 7c1874727d..c5d71006df 100644 --- a/repos/os/run/event_filter.run +++ b/repos/os/run/event_filter.run @@ -65,15 +65,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="report_rom" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M" priority="-1"> <provides> <service name="ROM"/> <service name="Report"/> </provides> <config> <policy label_prefix="event_filter -> config" @@ -87,8 +85,7 @@ install_config { </config> </start> - <start name="event_filter" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="event_filter" ram="2M" priority="-1"> <provides> <service name="Event"/> </provides> <route> <service name="ROM" label="config"> <child name="report_rom"/> </service> @@ -101,8 +98,7 @@ install_config { </route> </start> - <start name="test-event_filter" priority="-1"> - <resource name="RAM" quantum="4M"/> + <start name="test-event_filter" ram="4M" priority="-1"> <provides> <service name="Event"/> </provides> <config> diff --git a/repos/os/run/fb_bench.run b/repos/os/run/fb_bench.run index 38f52bb00f..54fbdbbf5e 100644 --- a/repos/os/run/fb_bench.run +++ b/repos/os/run/fb_bench.run @@ -40,13 +40,11 @@ install_config { </default-route> <default caps="100"/> - <start name="timer"> - <resource name="RAM" quantum="1M"/> + <start name="timer" ram="1M"> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="120M"/> + <start name="drivers" caps="1500" ram="120M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -57,8 +55,7 @@ install_config { </route> </start> - <start name="nitpicker"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" ram="4M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -70,8 +67,7 @@ install_config { <route> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="gui_fb"> - <resource name="RAM" quantum="5M"/> + <start name="gui_fb" ram="5M"> <provides> <service name="Framebuffer"/> <service name="Input"/> </provides> <config/> <route> @@ -80,13 +76,12 @@ install_config { </route> </start> - <start name="test-fb_bench"> + <start name="test-fb_bench" ram="72M"> <!-- - We need this big amount of RAM because the VESA driver reports a - large buffer on some hardware and the test mirrors this buffer in - RAM. --> - <resource name="RAM" quantum="72M"/> <config/> </start> </config>} diff --git a/repos/os/run/framebuffer.run b/repos/os/run/framebuffer.run index d729d8e324..9a8e3d242f 100644 --- a/repos/os/run/framebuffer.run +++ b/repos/os/run/framebuffer.run @@ -21,15 +21,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -41,13 +39,11 @@ install_config { </start> <start name="event_dump"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Event"/> </provides> <config/> </start> - <start name="test-framebuffer"> - <resource name="RAM" quantum="10M"/> + <start name="test-framebuffer" ram="10M"> <provides> <service name="Capture"/> </provides> <config/> </start> diff --git a/repos/os/run/init_smp.run b/repos/os/run/init_smp.run index d158d10629..bea0b09eb0 100644 --- a/repos/os/run/init_smp.run +++ b/repos/os/run/init_smp.run @@ -33,9 +33,8 @@ proc per_cpu_start_node { i } { global init_ram rounds generations children sleep demand return [join [list { - <start name="init_} $i {" caps="1100"> + <start name="init_} $i {" caps="1100" ram="} ${init_ram}M {"> <affinity xpos="} $i {" width="1"/> - <resource name="RAM" quantum="} ${init_ram}M {"/> <binary name="init"/> <config verbose="yes"> <parent-provides> @@ -54,10 +53,9 @@ proc per_cpu_start_node { i } { <resource name="RAM" preserve="2M"/> <resource name="CAP" preserve="100"/> - <start name="bomb-master" priority="-1" caps="100000"> + <start name="bomb-master" priority="-1" caps="100000" ram="2G"> <binary name="bomb"/> <resource name="CPU" quantum="90"/> - <resource name="RAM" quantum="2G"/> <config rounds="} $rounds {" generations="} $generations {" children="} $children {" sleep="} $sleep {" demand="} $demand {"/> </start> @@ -93,9 +91,8 @@ install_config { <resource name="RAM" preserve="2M"/> <resource name="CAP" preserve="100"/> - <start name="timer"> + <start name="timer" ram="1M"> <resource name="CPU" quantum="10"/> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> diff --git a/repos/os/run/internet_checksum.run b/repos/os/run/internet_checksum.run index 2187b3de27..cf726460b7 100644 --- a/repos/os/run/internet_checksum.run +++ b/repos/os/run/internet_checksum.run @@ -45,15 +45,13 @@ install_config { <service name="PD"/> </parent-provides> - <start name="lx_fs" ld="no" caps="100"> - <resource name="RAM" quantum="4M"/> + <start name="lx_fs" ld="no" caps="100" ram="4M"> <provides> <service name="File_system"/> </provides> <config> <policy label="test-internet_checksum -> " root="/} $lx_fs_root {" writeable="yes"/> </config> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="test-internet_checksum" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="test-internet_checksum" caps="100" ram="1M"> <config seed="} $seed {"> <vfs> <fs/> </vfs> </config> <route> <service name="File_system"> <child name="lx_fs"/> </service> diff --git a/repos/os/run/log_core.run b/repos/os/run/log_core.run index 9818ecb1bc..b782419035 100644 --- a/repos/os/run/log_core.run +++ b/repos/os/run/log_core.run @@ -29,9 +29,8 @@ proc kernel_start_node { } { return { } } return { - <start name="log_kernel"> + <start name="log_kernel" ram="10M"> <binary name="log_core"/> - <resource name="RAM" quantum="10M"/> <config period_ms="2000"/> <route> <service name="ROM" unscoped_label="log_core"> <parent/> </service> @@ -59,17 +58,15 @@ install_config { <any-service> <parent/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> <resource name="CPU" quantum="10"/> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="file_terminal"> + <start name="file_terminal" ram="3M"> <binary name="file_terminal"/> - <resource name="RAM" quantum="3M"/> <provides> <service name="Terminal"/> </provides> <config> <default-policy filename="log" /> @@ -80,7 +77,6 @@ install_config { </start> <start name="terminal_log"> - <resource name="RAM" quantum="1M"/> <provides> <service name="LOG"/> </provides> <config/> <route> @@ -89,8 +85,7 @@ install_config { </route> </start> - <start name="log_core"> - <resource name="RAM" quantum="10M"/> + <start name="log_core" ram="10M"> <config period_ms="2000"/> <route> <service name="ROM" unscoped_label="log_core"> <parent/> </service> diff --git a/repos/os/run/lx_fs_import.run b/repos/os/run/lx_fs_import.run index 81ce056d78..7f00743094 100644 --- a/repos/os/run/lx_fs_import.run +++ b/repos/os/run/lx_fs_import.run @@ -35,16 +35,12 @@ install_config { <resource name="RAM" preserve="200M"/> <resource name="CAP" preserve="1000"/> - <default caps="50"/> - - <start name="timer" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="timer" caps="100" ram="1M"> <provides> <service name="Timer"/> </provides> </start> - <start name="import_lx_fs" caps="220" ld="no"> + <start name="import_lx_fs" caps="220" ram="8M" ld="no"> <binary name="lx_fs"/> - <resource name="RAM" quantum="8M"/> <provides> <service name="File_system"/> </provides> @@ -56,9 +52,8 @@ install_config { </route> </start> - <start name="import_showcase" caps="100"> + <start name="import_showcase" caps="100" ram="4M"> <binary name="vfs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> diff --git a/repos/os/run/mixer.run b/repos/os/run/mixer.run index 00c5a1dd2c..c79a82d912 100644 --- a/repos/os/run/mixer.run +++ b/repos/os/run/mixer.run @@ -34,15 +34,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="report_rom"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config> <policy label="pci_decode -> system" report="acpi -> acpi"/> @@ -51,8 +49,7 @@ install_config { </config> </start> - <start name="acpi" caps="350"> - <resource name="RAM" quantum="4M"/> + <start name="acpi" caps="350" ram="4M"> <route> <service name="Report"> <child name="report_rom"/> </service> <service name="IO_MEM"> <parent/> </service> @@ -64,8 +61,7 @@ install_config { </route> </start> - <start name="pci_decode" caps="350"> - <resource name="RAM" quantum="2M"/> + <start name="pci_decode" caps="350" ram="2M"> <route> <service name="Report"> <child name="report_rom"/> </service> <service name="ROM" label="system"> <child name="report_rom"/> </service> @@ -79,7 +75,6 @@ install_config { </start> <start name="platform" caps="100" managing_system="yes"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Platform"/> </provides> @@ -99,9 +94,8 @@ install_config { </config> </start> - <start name="audio" caps="150"> + <start name="audio" caps="150" ram="10M"> <binary name="pci_audio"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Audio_in"/> <service name="Audio_out"/> @@ -111,8 +105,7 @@ install_config { </config> </start> - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="mixer.config"> @@ -162,8 +155,7 @@ install_config { </config> </start> - <start name="mixer"> - <resource name="RAM" quantum="2M"/> + <start name="mixer" ram="2M"> <provides><service name="Audio_out"/></provides> <route> <service name="Audio_out"> <child name="audio"/> </service> @@ -174,9 +166,8 @@ install_config { </route> </start> - <start name="client1"> + <start name="client1" ram="4M"> <binary name="test-audio_out"/> - <resource name="RAM" quantum="4M"/> <config> <filename>client1.f32</filename> </config> @@ -186,9 +177,8 @@ install_config { </route> </start> - <start name="client2"> + <start name="client2" ram="4M"> <binary name="test-audio_out"/> - <resource name="RAM" quantum="4M"/> <config> <filename>client2.f32</filename> </config> diff --git a/repos/os/run/monitor.run b/repos/os/run/monitor.run index 1f5911d7f2..736a8f2530 100644 --- a/repos/os/run/monitor.run +++ b/repos/os/run/monitor.run @@ -32,21 +32,18 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> <start name="terminal_crosslink" caps="100"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Terminal"/> </provides> <config buffer="9K"/> </start> - <start name="monitor" caps="1000"> - <resource name="RAM" quantum="100M"/> + <start name="monitor" caps="1000" ram="100M"> <config> <parent-provides> <service name="LOG"/> @@ -64,9 +61,8 @@ install_config { <policy label="test-monitor" stop="no" wx="yes" /> </monitor> - <start name="test-monitor"> + <start name="test-monitor" ram="32M"> <affinity xpos="1" width="1"/> - <resource name="RAM" quantum="32M"/> <route> <service name="PD"> <local/> </service> <service name="CPU"> <local/> </service> diff --git a/repos/os/run/monitor_gdb.inc b/repos/os/run/monitor_gdb.inc index 94c7b75331..6b20421e50 100644 --- a/repos/os/run/monitor_gdb.inc +++ b/repos/os/run/monitor_gdb.inc @@ -53,10 +53,9 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> } @@ -64,9 +63,8 @@ append config { if { [have_include power_on/qemu] } { append_if [have_board pc] config { - <start name="terminal"> + <start name="terminal" ram="2M"> <binary name="pc_uart"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Terminal"/> <service name="Uart"/> @@ -78,9 +76,8 @@ if { [have_include power_on/qemu] } { } append_if [have_board rpi3] config { - <start name="terminal"> + <start name="terminal" ram="2M"> <binary name="rpi3_uart"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Terminal"/> <service name="Uart"/> @@ -94,8 +91,7 @@ if { [have_include power_on/qemu] } { } else { append config { - <start name="drivers" caps="1000" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1000" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -104,8 +100,7 @@ if { [have_include power_on/qemu] } { <any-service> <parent/> </any-service> </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -136,9 +131,8 @@ if { [have_include power_on/qemu] } { </config> </start> - <start name="terminal" caps="200"> + <start name="terminal" caps="200" ram="8M"> <binary name="tcp_terminal"/> - <resource name="RAM" quantum="8M"/> <provides> <service name="Terminal"/> </provides> <config> <policy label_prefix="monitor" port="5555"/> @@ -159,8 +153,7 @@ if { [have_include power_on/qemu] } { append config { - <start name="monitor" caps="1000"> - <resource name="RAM" quantum="100M"/> + <start name="monitor" caps="1000" ram="100M"> <config> <parent-provides> <service name="LOG"/> @@ -174,8 +167,7 @@ append config { <policy label="test-monitor_gdb" wait="yes" wx="yes"/> </monitor> - <start name="test-monitor_gdb" caps="300"> - <resource name="RAM" quantum="10M"/> + <start name="test-monitor_gdb" caps="300" ram="10M"> <config> <vfs> <dir name="dev"> <log/> </dir> </vfs> <libc stdout="/dev/log" stderr="/dev/log"/> @@ -186,8 +178,7 @@ append config { <any-service> <parent/> </any-service> </route> </start> - <start name="test-log"> - <resource name="RAM" quantum="2M"/> + <start name="test-log" ram="2M"> <route> <service name="PD"> <local/> </service> <service name="CPU"> <local/> </service> diff --git a/repos/os/run/nic_dump.run b/repos/os/run/nic_dump.run index ea1ae5685c..2d0dc9149d 100644 --- a/repos/os/run/nic_dump.run +++ b/repos/os/run/nic_dump.run @@ -37,15 +37,13 @@ append config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1200" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1200" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -56,8 +54,7 @@ append config { <provides> <service name="Nic"/> </provides> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -83,8 +80,7 @@ append config { </config> </start> - <start name="nic_dump" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_dump" caps="200" ram="10M"> <provides><service name="Nic"/></provides> <config uplink="uplink" downlink="downlink" @@ -103,8 +99,7 @@ append config { </route> </start> - <start name="ping"> - <resource name="RAM" quantum="8M"/> + <start name="ping" ram="8M"> <config interface="10.0.3.2/24" gateway="10.0.3.1" dst_ip="} [dst_ip] {" diff --git a/repos/os/run/nic_router_dhcp.inc b/repos/os/run/nic_router_dhcp.inc index 317ef8112a..e8fed8f501 100644 --- a/repos/os/run/nic_router_dhcp.inc +++ b/repos/os/run/nic_router_dhcp.inc @@ -37,15 +37,13 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="200"/> + <default caps="200" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/> </provides> <config verbose="yes"> <rom name="nic_router_1.config"> @@ -164,9 +162,8 @@ append config { </config> </start> - <start name="nic_router_1"> + <start name="nic_router_1" ram="10M"> <binary name="nic_router"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -179,9 +176,8 @@ append config { </route> </start> - <start name="nic_router_2"> + <start name="nic_router_2" ram="10M"> <binary name="nic_router"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -223,9 +219,8 @@ append config { </route> </start> - <start name="test_client"> + <start name="test_client" ram="10M"> <binary name="test-nic_router_dhcp-client"/> - <resource name="RAM" quantum="10M"/> <config verbose="no"/> <route> <service name="Nic"> <child name="nic_router_2"/> </service> @@ -236,7 +231,6 @@ append config { append_if [nic_router_2_managed] config { <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="no"> <policy label="test_manager -> router_state" @@ -249,7 +243,6 @@ append_if [nic_router_2_managed] config { <start name="test_manager"> <binary name="test-nic_router_dhcp-manager"/> - <resource name="RAM" quantum="1M"/> <route> <service name="ROM" label="router_state"> <child name="report_rom"/> diff --git a/repos/os/run/nic_router_disable_arp.run b/repos/os/run/nic_router_disable_arp.run index 8f026c6315..b12471d37f 100644 --- a/repos/os/run/nic_router_disable_arp.run +++ b/repos/os/run/nic_router_disable_arp.run @@ -25,15 +25,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="200"/> + <default caps="200" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1100" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1100" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -43,8 +41,7 @@ install_config { </route> </start> - <start name="nic_router"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -65,8 +62,7 @@ install_config { </config> </start> - <start name="ping"> - <resource name="RAM" quantum="8M"/> + <start name="ping" ram="8M"> <config interface="10.0.3.2/24" gateway="10.0.3.1" dst_ip="10.0.2.2" diff --git a/repos/os/run/nic_router_flood.run b/repos/os/run/nic_router_flood.run index 899f00b427..b61a0f1df5 100644 --- a/repos/os/run/nic_router_flood.run +++ b/repos/os/run/nic_router_flood.run @@ -37,9 +37,8 @@ install_config { <service name="LOG"/> </parent-provides> - <start name="timer" caps="100" priority="0"> + <start name="timer" caps="100" ram="1M" priority="0"> <resource name="CPU" quantum="10"/> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> <route> <service name="PD"> <parent/> </service> @@ -52,10 +51,9 @@ install_config { </route> </start> - <start name="drivers" caps="1200" managing_system="yes" priority="0"> + <start name="drivers" caps="1200" ram="32M" managing_system="yes" priority="0"> <binary name="init"/> <resource name="CPU" quantum="10"/> - <resource name="RAM" quantum="32M"/> <route> <service name="Timer"> <child name="timer"/> </service> <service name="Uplink"> <child name="nic_router"/> </service> @@ -71,9 +69,8 @@ install_config { </route> </start> - <start name="nic_router" caps="200" priority="-1"> + <start name="nic_router" caps="200" ram="10M" priority="-1"> <resource name="CPU" quantum="10"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -112,9 +109,8 @@ install_config { </route> </start> - <start name="report_rom" caps="100" priority="-1"> + <start name="report_rom" caps="100" ram="1M" priority="-1"> <resource name="CPU" quantum="10"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> <route> @@ -125,9 +121,8 @@ install_config { </route> </start> - <start name="dynamic_rom" caps="100" priority="-1"> + <start name="dynamic_rom" caps="100" ram="4M" priority="-1"> <resource name="CPU" quantum="10"/> - <resource name="RAM" quantum="4M"/> <provides><service name="ROM"/> </provides> <config> <rom name="net_clients.config"> @@ -150,9 +145,8 @@ install_config { <service name="Timer"/> </parent-provides> - <start name="tcp_flood" caps="100"> + <start name="tcp_flood" caps="100" ram="8M"> <binary name="test-net_flood"/> - <resource name="RAM" quantum="8M"/> <config dst_ip="} [bad_dst_ip] {" protocol="tcp" verbose="no"/> <route> <service name="Nic"> <parent/> </service> @@ -164,9 +158,8 @@ install_config { </route> </start> - <start name="udp_flood" caps="100"> + <start name="udp_flood" caps="100" ram="8M"> <binary name="test-net_flood"/> - <resource name="RAM" quantum="8M"/> <config dst_ip="} [bad_dst_ip] {" protocol="udp" verbose="no"/> <route> <service name="Nic"> <parent/> </service> @@ -178,9 +171,8 @@ install_config { </route> </start> - <start name="icmp_flood" caps="100"> + <start name="icmp_flood" caps="100" ram="8M"> <binary name="test-net_flood"/> - <resource name="RAM" quantum="8M"/> <config dst_ip="} [bad_dst_ip] {" protocol="icmp" verbose="no"/> <route> <service name="Nic"> <parent/> </service> @@ -192,8 +184,7 @@ install_config { </route> </start> - <start name="ping" caps="100"> - <resource name="RAM" quantum="8M"/> + <start name="ping" caps="100" ram="8M"> <config dst_ip="} [good_dst_ip] {" period_sec="2" count="999"/> <route> <service name="Nic"> <parent/> </service> @@ -220,10 +211,9 @@ install_config { </route> </start> - <start name="net_clients" caps="1000" priority="-2"> + <start name="net_clients" caps="1000" ram="200M" priority="-2"> <binary name="init"/> <resource name="CPU" quantum="0"/> - <resource name="RAM" quantum="200M"/> <route> <service name="ROM" label="config"> <child name="dynamic_rom" label="net_clients.config"/> </service> <service name="Nic"> <child name="nic_router"/> </service> diff --git a/repos/os/run/nic_stress.inc b/repos/os/run/nic_stress.inc index ec7fccf2e4..3aa22c294a 100644 --- a/repos/os/run/nic_stress.inc +++ b/repos/os/run/nic_stress.inc @@ -72,17 +72,15 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start>} append_if [string equal $type "nic_router"] config { - <start name="nic_router" caps="1000"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="1000" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -98,8 +96,7 @@ append_if [string equal $type "nic_router"] config { append_if [string equal $type "nic_bridge"] config { - <start name="nic_router" caps="1000"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="1000" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -110,8 +107,7 @@ append_if [string equal $type "nic_bridge"] config { </config> </start> - <start name="nic_bridge" caps="1000"> - <resource name="RAM" quantum="50M"/> + <start name="nic_bridge" caps="1000" ram="50M"> <provides><service name="Nic"/></provides> <config mac="02:02:02:02:42:00"> <policy label_prefix="nic_stress_2"/> @@ -127,9 +123,8 @@ append_if [string equal $type "nic_bridge"] config { append config { - <start name="nic_stress_1" caps="1000"> + <start name="nic_stress_1" caps="1000" ram="50M"> <binary name="test-nic_stress"/> - <resource name="RAM" quantum="50M"/> <config exit_support="} [exit_support] {"> <construct_destruct nr_of_rounds="} [nr_of_rounds 1] {" nr_of_sessions="} [nr_of_sessions 1] {"/> @@ -140,9 +135,8 @@ append config { </route> </start> - <start name="nic_stress_2" caps="1000"> + <start name="nic_stress_2" caps="1000" ram="100M"> <binary name="test-nic_stress"/> - <resource name="RAM" quantum="100M"/> <config exit_support="} [exit_support] {"> <construct_destruct nr_of_rounds="} [nr_of_rounds 2] {" nr_of_sessions="} [nr_of_rounds 2] {"/> diff --git a/repos/os/run/nic_uplink.run b/repos/os/run/nic_uplink.run index 05d7fdf188..0884c56b36 100644 --- a/repos/os/run/nic_uplink.run +++ b/repos/os/run/nic_uplink.run @@ -36,8 +36,7 @@ append config { <service name="LOG"/> </parent-provides> - <start name="timer" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="timer" caps="100" ram="1M"> <provides><service name="Timer"/></provides> <route> <service name="PD"> <parent/> </service> @@ -50,8 +49,7 @@ append config { </route> </start> - <start name="drivers" caps="1200" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1200" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -68,8 +66,7 @@ append config { </route> </start> - <start name="nic_uplink" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="nic_uplink" caps="100" ram="1M"> <provides> <service name="Uplink"/> <service name="Nic"/> @@ -84,9 +81,8 @@ append config { </route> </start> - <start name="ping_1" caps="100"> + <start name="ping_1" caps="100" ram="8M"> <binary name="ping"/> - <resource name="RAM" quantum="8M"/> <config dst_ip="} [dst_ip] {" period_sec="1" count="3"/> <route> <service name="Nic"> <child name="nic_uplink"/> </service> @@ -98,9 +94,8 @@ append config { </route> </start> - <start name="ping_2" caps="100"> + <start name="ping_2" caps="100" ram="8M"> <binary name="ping"/> - <resource name="RAM" quantum="8M"/> <config dst_ip="} [dst_ip] {" period_sec="1" count="3"/> <route> <service name="Nic"> <child name="nic_uplink"/> </service> diff --git a/repos/os/run/nvme.run b/repos/os/run/nvme.run index 64920c510f..d6ecef05ed 100644 --- a/repos/os/run/nvme.run +++ b/repos/os/run/nvme.run @@ -85,15 +85,13 @@ append config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="report_rom"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config> <policy label="pci_decode -> system" report="acpi -> acpi"/> @@ -101,8 +99,7 @@ append config { </config> </start> - <start name="acpi" caps="350"> - <resource name="RAM" quantum="4M"/> + <start name="acpi" caps="350" ram="4M"> <route> <service name="Report"> <child name="report_rom"/> </service> <service name="IO_MEM"> <parent/> </service> @@ -114,8 +111,7 @@ append config { </route> </start> - <start name="pci_decode" caps="350"> - <resource name="RAM" quantum="2M"/> + <start name="pci_decode" caps="350" ram="2M"> <route> <service name="Report"> <child name="report_rom"/> </service> <service name="ROM" label="system"> <child name="report_rom"/> </service> @@ -128,8 +124,7 @@ append config { </route> </start> - <start name="platform" caps="100" managing_system="yes"> - <resource name="RAM" quantum="2M"/> + <start name="platform" caps="100" ram="2M" managing_system="yes"> <provides> <service name="Platform"/> </provides> @@ -151,8 +146,7 @@ append config { </config> </start> - <start name="nvme" caps="120"> - <resource name="RAM" quantum="24M"/> + <start name="nvme" caps="120" ram="24M"> <provides> <service name="Block"/> </provides> <config max_hmb_size="16M" verbose_regs="yes" verbose_identify="yes"> <policy label_prefix="block_tester" writeable="} [writeable] {"/> @@ -167,8 +161,7 @@ append config { </route> </start> - <start name="block_tester" caps="200"> - <resource name="RAM" quantum="64M"/> + <start name="block_tester" caps="200" ram="64M"> <config verbose="no" report="no" log="yes" stop_on_error="no"> <tests>} diff --git a/repos/os/run/ping.run b/repos/os/run/ping.run index a119c3358f..16da7dd79d 100644 --- a/repos/os/run/ping.run +++ b/repos/os/run/ping.run @@ -98,15 +98,13 @@ append config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1200" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1200" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -116,7 +114,6 @@ append config { </start> <start name="report_rom" caps="200"> - <resource name="RAM" quantum="1M"/> <provides> <service name="ROM" /> <service name="Report" /> @@ -124,8 +121,7 @@ append config { <config verbose="yes"/> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -156,9 +152,8 @@ append config { append_if $second_ping_via_udp config { - <start name="ping_2"> + <start name="ping_2" ram="8M"> <binary name="ping"/> - <resource name="RAM" quantum="8M"/> <config period_sec="1" verbose="no" count="1" @@ -173,9 +168,8 @@ append_if $second_ping_via_udp config { append config { - <start name="ping_1"> + <start name="ping_1" ram="8M"> <binary name="ping"/> - <resource name="RAM" quantum="8M"/> <config dst_ip="} [dst_ip] {" period_sec="1" report="yes" diff --git a/repos/os/run/ping_nic_router.run b/repos/os/run/ping_nic_router.run index cfad0e4b00..566bfa380a 100644 --- a/repos/os/run/ping_nic_router.run +++ b/repos/os/run/ping_nic_router.run @@ -37,15 +37,13 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1200" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1200" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -55,8 +53,7 @@ append config { </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -92,9 +89,8 @@ append config { </config> </start> - <start name="ping_2_nic_router" caps="200"> + <start name="ping_2_nic_router" caps="200" ram="10M"> <binary name="nic_router"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -128,9 +124,8 @@ append config { </route> </start> - <start name="ping_11"> + <start name="ping_11" ram="8M"> <binary name="ping"/> - <resource name="RAM" quantum="8M"/> <config interface="10.0.3.2/24" gateway="10.0.3.1" dst_ip="} [good_dst_ip] {" @@ -142,9 +137,8 @@ append config { </route> </start> - <start name="ping_12"> + <start name="ping_12" ram="8M"> <binary name="ping"/> - <resource name="RAM" quantum="8M"/> <config interface="10.0.3.3/24" gateway="10.0.3.1" dst_ip="} [good_dst_ip] {" @@ -156,9 +150,8 @@ append config { </route> </start> - <start name="ping_2_nic_bridge" caps="200"> + <start name="ping_2_nic_bridge" caps="200" ram="10M"> <binary name="nic_bridge"/> - <resource name="RAM" quantum="10M"/> <provides><service name="Nic"/></provides> <config mac="12:12:12:12:12:00"> <policy label_prefix="ping_21"/> @@ -170,9 +163,8 @@ append config { </route> </start> - <start name="ping_21"> + <start name="ping_21" ram="8M"> <binary name="ping"/> - <resource name="RAM" quantum="8M"/> <config dst_ip="} [good_dst_ip] {" period_sec="1" verbose="no"/> @@ -182,9 +174,8 @@ append config { </route> </start> - <start name="ping_22"> + <start name="ping_22" ram="8M"> <binary name="ping"/> - <resource name="RAM" quantum="8M"/> <config interface="10.0.5.3/24" gateway="10.0.5.1" dst_ip="} [bad_dst_ip] {" @@ -197,9 +188,8 @@ append config { </start>} append_if $on_hardware config { - <start name="ping_23"> + <start name="ping_23" ram="8M"> <binary name="ping"/> - <resource name="RAM" quantum="8M"/> <config period_sec="1" verbose="no" count="1" diff --git a/repos/os/run/platform.run b/repos/os/run/platform.run index 123798aa64..16592222ea 100644 --- a/repos/os/run/platform.run +++ b/repos/os/run/platform.run @@ -30,16 +30,14 @@ install_config { <default-route> <any-service> <parent/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> - <start name="timer"> - <resource name="RAM" quantum="10M"/> + <start name="timer" ram="10M"> <provides><service name="Timer"/></provides> </start> - <start name="report_fs"> + <start name="report_fs" ram="2M"> <binary name="vfs"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -57,7 +55,6 @@ install_config { </start> <start name="fs_report"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> </provides> <config> <vfs> <fs/> </vfs> </config> <route> @@ -66,9 +63,8 @@ install_config { </route> </start> - <start name="report_fs_rom"> + <start name="report_fs_rom" ram="3M"> <binary name="fs_rom"/> - <resource name="RAM" quantum="3M"/> <provides> <service name="ROM"/> </provides> <route> <service name="File_system"> <child name="report_fs"/> </service> @@ -76,8 +72,7 @@ install_config { </route> </start> - <start name="report_rom"> - <resource name="RAM" quantum="3M"/> + <start name="report_rom" ram="3M"> <provides> <service name="ROM"/> <service name="Report"/> @@ -89,7 +84,6 @@ install_config { </start> <start name="platform" managing_system="yes"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Platform"/> </provides> <route> <service name="ROM" label="config"> <child name="report_fs_rom"/> </service> @@ -100,7 +94,6 @@ install_config { </start> <start name="test-platform"> - <resource name="RAM" quantum="1M"/> <route> <service name="Report" label="config"> <child name="fs_report" label="config"/> </service> diff --git a/repos/os/run/pointer.run b/repos/os/run/pointer.run index d796d5f3ff..5fafc3f00d 100644 --- a/repos/os/run/pointer.run +++ b/repos/os/run/pointer.run @@ -25,10 +25,9 @@ install_config { <service name="LOG"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> <route> <service name="ROM"> <parent/> </service> @@ -38,8 +37,7 @@ install_config { </route> </start> - <start name="fb_sdl" ld="no"> - <resource name="RAM" quantum="32M"/> + <start name="fb_sdl" ld="no" ram="32M"> <config buffered="yes" width="1280" height="720" depth="16"/> <route> <service name="ROM"> <parent/> </service> @@ -54,7 +52,6 @@ install_config { <start name="report_rom_nitpicker"> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config> <policy label="pointer -> hover" report="nitpicker -> hover"/> @@ -69,8 +66,7 @@ install_config { </route> </start> - <start name="nitpicker"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" ram="4M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -95,9 +91,8 @@ install_config { </route> </start> - <start name="shape-arrow"> + <start name="shape-arrow" ram="2M"> <binary name="test-pointer"/> - <resource name="RAM" quantum="2M"/> <config shape="arrow"/> <route> <service name="PD"> <parent/> </service> @@ -110,9 +105,8 @@ install_config { </route> </start> - <start name="shape-blade"> + <start name="shape-blade" ram="2M"> <binary name="test-pointer"/> - <resource name="RAM" quantum="2M"/> <config shape="blade"/> <route> <service name="PD"> <parent/> </service> @@ -125,9 +119,8 @@ install_config { </route> </start> - <start name="shape-bladex"> + <start name="shape-bladex" ram="2M"> <binary name="test-pointer"/> - <resource name="RAM" quantum="2M"/> <config shape="bladex"/> <route> <service name="PD"> <parent/> </service> @@ -142,7 +135,6 @@ install_config { <start name="shape-smiley-config"> <binary name="dynamic_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="ROM"/> </provides> <config> <rom name="smiley.config"> @@ -165,9 +157,8 @@ install_config { </route> </start> - <start name="shape-smiley"> + <start name="shape-smiley" ram="2M"> <binary name="test-pointer"/> - <resource name="RAM" quantum="2M"/> <route> <service name="ROM" label="config"> <child name="shape-smiley-config" label="smiley.config"/> </service> @@ -182,7 +173,6 @@ install_config { </start> <start name="pointer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> </provides> <config shapes="yes" verbose="no"/> <route> @@ -196,9 +186,8 @@ install_config { </route> </start> - <start name="test-no-match"> + <start name="test-no-match" ram="2M"> <binary name="testnit"/> - <resource name="RAM" quantum="2M"/> <route> <service name="LOG"> <parent/> </service> <service name="PD"> <parent/> </service> @@ -209,9 +198,8 @@ install_config { </route> </start> - <start name="test-label-smiley"> + <start name="test-label-smiley" ram="2M"> <binary name="testnit"/> - <resource name="RAM" quantum="2M"/> <route> <service name="LOG"> <parent/> </service> <service name="PD"> <parent/> </service> @@ -222,9 +210,8 @@ install_config { </route> </start> - <start name="test-label-arrow"> + <start name="test-label-arrow" ram="2M"> <binary name="testnit"/> - <resource name="RAM" quantum="2M"/> <route> <service name="LOG"> <parent/> </service> <service name="PD"> <parent/> </service> @@ -235,9 +222,8 @@ install_config { </route> </start> - <start name="test-label-blade"> + <start name="test-label-blade" ram="2M"> <binary name="testnit"/> - <resource name="RAM" quantum="2M"/> <route> <service name="PD"> <parent/> </service> <service name="LOG"> <parent/> </service> @@ -248,9 +234,8 @@ install_config { </route> </start> - <start name="test-label-bladex"> + <start name="test-label-bladex" ram="2M"> <binary name="testnit"/> - <resource name="RAM" quantum="2M"/> <route> <service name="PD"> <parent/> </service> <service name="LOG"> <parent/> </service> diff --git a/repos/os/run/rom_to_file.run b/repos/os/run/rom_to_file.run index d8c9aa33fe..d80b70dce2 100644 --- a/repos/os/run/rom_to_file.run +++ b/repos/os/run/rom_to_file.run @@ -16,13 +16,11 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="dynamic_rom"> - <resource name="RAM" quantum="4M"/> + <start name="dynamic_rom" ram="4M"> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="test"> @@ -33,15 +31,13 @@ install_config { </rom> </config> </start> - <start name="lx_fs" ld="no"> - <resource name="RAM" quantum="4M"/> + <start name="lx_fs" ld="no" ram="4M"> <provides> <service name="File_system" /> </provides> <config> <policy label_prefix="rom_to_file" root="/fs_test" writeable="yes" /> </config> </start> - <start name="rom_to_file"> - <resource name="RAM" quantum="4M"/> + <start name="rom_to_file" ram="4M"> <config rom="test"> <vfs> <fs/> </vfs> </config> diff --git a/repos/os/run/rtc.run b/repos/os/run/rtc.run index c2ecab056f..62e9638996 100644 --- a/repos/os/run/rtc.run +++ b/repos/os/run/rtc.run @@ -43,8 +43,7 @@ proc additional_start_nodes_for_update_test { } { return { } } return { - <start name="report_rom"> - <resource name="RAM" quantum="1M"/> + <start name="report_rom" ram="1M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"> <policy label_suffix="set_rtc" report="test-rtc -> set_rtc"/> @@ -82,21 +81,18 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> <start } [rtc_driver_start_attributes] { priority="-1"> - <resource name="RAM" quantum="1M"/> <provides><service name="Rtc"/></provides> } [rtc_driver_config_and_route] { </start> <start name="test-rtc" priority="-1"> - <resource name="RAM" quantum="1M"/> } [test_rtc_config] { </start> diff --git a/repos/os/run/sd_card.run b/repos/os/run/sd_card.run index 5926adf44d..c33964e2fd 100644 --- a/repos/os/run/sd_card.run +++ b/repos/os/run/sd_card.run @@ -22,10 +22,9 @@ install_config { <service name="CPU"/> <service name="LOG"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="platform" managing_system="yes"> - <resource name="RAM" quantum="1M"/> <provides><service name="Platform"/></provides> <config> <policy label="pl180_sd_card -> "> @@ -38,13 +37,11 @@ install_config { </start> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> <route> <any-service> <parent/> </any-service> </route> </start> <start name="pl180_sd_card"> - <resource name="RAM" quantum="1M"/> <provides><service name="Block"/></provides> <route> <service name="ROM"> <parent/> </service> @@ -56,8 +53,7 @@ install_config { </route> </start> - <start name="block_tester"> - <resource name="RAM" quantum="64M" /> + <start name="block_tester" ram="64M"> <config verbose="no" report="no" log="yes" stop_on_error="no"> <tests> <sequential length="16M" size="1M" io_buffer="8M" batch="4"/> diff --git a/repos/os/run/sd_card_bench.run b/repos/os/run/sd_card_bench.run index 5ecc175979..e38addc466 100644 --- a/repos/os/run/sd_card_bench.run +++ b/repos/os/run/sd_card_bench.run @@ -43,10 +43,9 @@ install_config { <service name="CPU"/> <service name="LOG"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="platform" managing_system="yes"> - <resource name="RAM" quantum="1M"/> <provides><service name="Platform"/></provides> <config> <policy label="sd_card -> "> <device name="mmc0"/> </policy> @@ -55,14 +54,12 @@ install_config { </start> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> <route> <any-service> <parent/> </any-service> </route> </start> - <start name="sd_card"> + <start name="sd_card" ram="16M"> <binary name="} [sd_card] {"/> - <resource name="RAM" quantum="16M"/> <provides><service name="Block"/></provides> <config benchmark="yes" buffer_size_kib="} [buffer_size_kib] {"/> <route> diff --git a/repos/os/run/smbios_decoder.run b/repos/os/run/smbios_decoder.run index 1305ef2895..1075d18183 100644 --- a/repos/os/run/smbios_decoder.run +++ b/repos/os/run/smbios_decoder.run @@ -25,17 +25,15 @@ install_config { <service name="Report"> <child name="report_rom"/> </service> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="200"/> + <default caps="200" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> <route> <any-service> <parent/> </any-service> </route> </start> <start name="acpi_report_rom"> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> @@ -45,8 +43,7 @@ install_config { </config> </start> - <start name="acpi" caps="350"> - <resource name="RAM" quantum="4M"/> + <start name="acpi" caps="350" ram="4M"> <route> <service name="Report"> <child name="acpi_report_rom"/> </service> <any-service> <parent/> </any-service> @@ -54,7 +51,6 @@ install_config { </start> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> @@ -62,8 +58,7 @@ install_config { <config verbose="yes"/> </start> - <start name="smbios_decoder"> - <resource name="RAM" quantum="10M"/> + <start name="smbios_decoder" ram="10M"> <route> <service name="Report"> <child name="report_rom"/> </service> <service name="ROM" label="smbios_table"> <child name="acpi_report_rom"/> </service> diff --git a/repos/os/run/tar_rom.run b/repos/os/run/tar_rom.run index 6d884d63e8..7f39ef614d 100644 --- a/repos/os/run/tar_rom.run +++ b/repos/os/run/tar_rom.run @@ -37,20 +37,17 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="tar_rom"> - <resource name="RAM" quantum="6M"/> + <start name="tar_rom" ram="6M"> <provides><service name="ROM"/></provides> <config> <archive name="archive.tar"/> </config> </start> - <start name="init" caps="1000"> - <resource name="RAM" quantum="3M"/> + <start name="init" caps="1000" ram="3M"> <config verbose="yes"> <parent-provides> <service name="ROM"/> @@ -59,9 +56,8 @@ install_config { <service name="LOG"/> <service name="Timer"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="test-timer"> - <resource name="RAM" quantum="1M"/> <route> <any-service> <parent/> </any-service> </route> </start> </config> diff --git a/repos/os/run/test.run b/repos/os/run/test.run index 47ec205997..74b5c285fd 100644 --- a/repos/os/run/test.run +++ b/repos/os/run/test.run @@ -269,8 +269,7 @@ install_config { <service name="TRACE"/> </parent-provides> - <start name="timer" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="timer" caps="100" ram="1M"> <provides><service name="Timer"/></provides> <route> <service name="PD"> <parent/> </service> @@ -283,8 +282,7 @@ install_config { </route> </start> - <start name="test" priority="-1" caps="} $caps {"> - <resource name="RAM" quantum="} $ram {"/> + <start name="test" priority="-1" caps="} $caps {" ram="} $ram {"> <binary name="} $binary {"/> <route> <service name="ROM"> <parent/> </service> diff --git a/repos/os/run/timeout.run b/repos/os/run/timeout.run index 1a65f852d1..c0c1c485e8 100644 --- a/repos/os/run/timeout.run +++ b/repos/os/run/timeout.run @@ -102,13 +102,11 @@ install_config { <any-service><parent/><any-child/></any-service> </default-route> <default caps="100"/> - <start name="timer"> - <resource name="RAM" quantum="10M"/> + <start name="timer" ram="10M"> <provides><service name="Timer"/></provides> </start> - <start name="test" priority="-1"> + <start name="test" ram="250M" priority="-1"> <binary name="test-timeout"/> - <resource name="RAM" quantum="250M"/> <config precise_time="} [precise_time] {" precise_ref_time="} [precise_ref_time] {" precise_timeouts="} [precise_timeouts] {" diff --git a/repos/os/run/uart.run b/repos/os/run/uart.run index 34ca6ad89f..16d405eb46 100644 --- a/repos/os/run/uart.run +++ b/repos/os/run/uart.run @@ -22,13 +22,11 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> <start name="pbxa9_uart"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Uart"/> <service name="Terminal"/> @@ -40,11 +38,9 @@ install_config { </start> <start name="test-uart1"> <binary name="test-uart"/> - <resource name="RAM" quantum="1M"/> </start> <start name="test-uart2"> <binary name="test-uart"/> - <resource name="RAM" quantum="1M"/> </start> </config> } diff --git a/repos/os/run/usb_block.run b/repos/os/run/usb_block.run index f2ff657f8d..42a54e917f 100644 --- a/repos/os/run/usb_block.run +++ b/repos/os/run/usb_block.run @@ -33,24 +33,21 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"> <default-policy report="usb -> usb -> devices"/> </config> </start> - <start name="usb" caps="1500" managing_system="yes"> + <start name="usb" caps="1500" ram="32M" managing_system="yes"> <binary name="init"/> - <resource name="RAM" quantum="32M"/> <provides> <service name="Usb"/> </provides> <route> <service name="ROM" label="config"> @@ -61,8 +58,7 @@ install_config { </route> </start> - <start name="usb_block"> - <resource name="RAM" quantum="4M"/> + <start name="usb_block" ram="4M"> <provides> <service name="Block"/> </provides> <config report="yes" writeable="no"/> <route> @@ -72,8 +68,7 @@ install_config { </route> </start> - <start name="block_tester"> - <resource name="RAM" quantum="64M" /> + <start name="block_tester" ram="64M"> <config verbose="no" report="no" log="yes" stop_on_error="no"> <tests> <sequential length="8M" size="1M" io_buffer="8M" batch="4"/> diff --git a/repos/os/run/vfs_block.run b/repos/os/run/vfs_block.run index 65c9ca9d6c..dbd87d83a2 100644 --- a/repos/os/run/vfs_block.run +++ b/repos/os/run/vfs_block.run @@ -24,15 +24,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="vfs"> - <resource name="RAM" quantum="38M"/> + <start name="vfs" ram="38M"> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -48,8 +46,7 @@ install_config { </route> </start> - <start name="vfs_block" caps="120"> - <resource name="RAM" quantum="5M"/> + <start name="vfs_block" caps="120" ram="5M"> <provides> <service name="Block"/> </provides> <config> <vfs> @@ -64,8 +61,7 @@ install_config { </route> </start> - <start name="block_tester" caps="200"> - <resource name="RAM" quantum="64M"/> + <start name="block_tester" caps="200" ram="64M"> <config verbose="no" report="no" log="yes" stop_on_error="no"> <tests> <sequential length="32M" size="4K" batch="128"/> diff --git a/repos/os/run/vmm_arm.run b/repos/os/run/vmm_arm.run index 0673c79aa5..cafd09bd30 100644 --- a/repos/os/run/vmm_arm.run +++ b/repos/os/run/vmm_arm.run @@ -70,16 +70,14 @@ install_config { <default-route> <any-service><parent/><any-child/></any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="nic"> + <start name="nic" ram="8M"> <binary name="nic_router" /> - <resource name="RAM" quantum="8M"/> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -92,8 +90,7 @@ install_config { </config> </start> - <start name="vfs_block"> - <resource name="RAM" quantum="2M"/> + <start name="vfs_block" ram="2M"> <provides> <service name="Block"/> </provides> <config> <vfs> <rom name="block.img"/> </vfs> @@ -104,18 +101,15 @@ install_config { </route> </start> - <start name="log_terminal"> - <resource name="RAM" quantum="2M"/> + <start name="log_terminal" ram="2M"> <provides> <service name="Terminal"/> </provides> </start> <start name="terminal_crosslink"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Terminal"/> </provides> </start> - <start name="vmm" caps="200" priority="-1"> - <resource name="RAM" quantum="256M"/> + <start name="vmm" caps="200" ram="256M" priority="-1"> <route> <service name="Terminal" label="earlycon"> <child name="log_terminal"/> </service> <service name="Terminal"> <child name="terminal_crosslink"/> </service> @@ -126,7 +120,6 @@ install_config { <start name="vm"> <binary name="test-terminal_expect_send"/> - <resource name="RAM" quantum="1M"/> <config expect="/ #" send="mount /dev/vda /root; cp -r /etc /root; ls /root/etc; umount /root" verbose="yes"/> <route> <service name="Terminal"> <child name="terminal_crosslink"/> </service> diff --git a/repos/os/run/vmm_x86.run b/repos/os/run/vmm_x86.run index 4c0d4fe6e0..03d0026cdb 100644 --- a/repos/os/run/vmm_x86.run +++ b/repos/os/run/vmm_x86.run @@ -49,14 +49,12 @@ install_config { <service name="VM"> <parent diag="yes"/> </service> <any-service><parent/><any-child/></any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="vmm" caps="2048" priority="-1"> + <start name="vmm" caps="2048" ram="256M" priority="-1"> <binary name="test-vmm_x86"/> - <resource name="RAM" quantum="256M"/> </start> </config> } diff --git a/repos/os/src/app/pointer/README b/repos/os/src/app/pointer/README index ad669e52d2..21cd788abe 100644 --- a/repos/os/src/app/pointer/README +++ b/repos/os/src/app/pointer/README @@ -10,9 +10,8 @@ and requests ROM sessions for Nitpicker's 'hover' and 'xray' reports. The mapping between hovered Nitpicker sessions and applications can be achieved with report session label rewriting: -! <start name="shape-arrow"> +! <start name="shape-arrow" ram="2M"> ! <binary name="test-pointer"/> -! <resource name="RAM" quantum="2M"/> ! <config shape="arrow"/> ! <route> ! <service name="PD"> <parent/> </service> diff --git a/repos/os/src/app/sequence/README b/repos/os/src/app/sequence/README index aaac282485..e79558a6c6 100644 --- a/repos/os/src/app/sequence/README +++ b/repos/os/src/app/sequence/README @@ -6,8 +6,7 @@ propagated from children to the parent. A sample configuration to start a consumer after a producer has exited: -! <start name="sequence" caps="100"> -! <resource name="RAM" quantum="128M"/> +! <start name="sequence" caps="100" ram="128M"> ! <route> ! <any-service> <parent/> <any-child/> </any-service> ! </route> diff --git a/repos/os/src/driver/acpi/README b/repos/os/src/driver/acpi/README index 6d847bb7a4..e24c850efc 100644 --- a/repos/os/src/driver/acpi/README +++ b/repos/os/src/driver/acpi/README @@ -16,12 +16,9 @@ the platform driver README for more details. Usage ----- -!<start name="acpi"> -! <resource name="RAM" quantum="4M"/> -!</start> +!<start name="acpi" ram="4M"/> ! -!<start name="report_rom"> -! <resource name="RAM" quantum="2M"/> +!<start name="report_rom" ram="2M"> ! <provides> ! <service name="ROM" /> ! <service name="Report" /> diff --git a/repos/os/src/driver/ahci/README b/repos/os/src/driver/ahci/README index b5e5614afc..b5ba10c94a 100644 --- a/repos/os/src/driver/ahci/README +++ b/repos/os/src/driver/ahci/README @@ -10,8 +10,7 @@ block session. The server must be configured via a policy, that states which client can access a certain device: -!<start name="ahci"> -! <resource name="RAM" quantum="10M" /> +!<start name="ahci" ram="10M"> ! <provides><service name="Block" /></provides> } ! <route> ! <any-service> <parent /> <any-child /> </any-service> diff --git a/repos/os/src/driver/platform/README b/repos/os/src/driver/platform/README index 25ba995849..f319181966 100644 --- a/repos/os/src/driver/platform/README +++ b/repos/os/src/driver/platform/README @@ -37,8 +37,7 @@ Policy usage A policy may contain several nodes describing several devices. -!<start name="platform" managing_system="yes"> -! <resource name="RAM" quantum="8M"/> +!<start name="platform" managing_system="yes" ram="8M"> ! ... ! <config> ! <policy label_prefix="usb_host" info="yes"> diff --git a/repos/os/src/driver/usb_block/README b/repos/os/src/driver/usb_block/README index 2438655721..426ed9602c 100644 --- a/repos/os/src/driver/usb_block/README +++ b/repos/os/src/driver/usb_block/README @@ -13,8 +13,7 @@ bulk-only interface it finds. The following configuration snippets demonstrates how to use the driver: -!<start name="usb_block"> -! <resource name="RAM" quantum="4M"/> +!<start name="usb_block" ram="4M"> ! <provides> <service name="Block"/> </provides> ! <config label="usb_stick" report="yes" writeable="yes" interface="0" ! alt_setting="0" lun="0" reset_device="no" verbose_scsi="no"/> @@ -29,8 +28,7 @@ attribute. This attribute specifies the label used when opening the Usb session connection. A matching policy has to be configured at the USB host controller driver: -!<start name="usb"> -! <resource name="RAM" quantum="12M"/> +!<start name="usb" ram="12M"> ! <provides><service name="Usb"/></provides> ! <config> ! <raw> diff --git a/repos/os/src/init/config.priority b/repos/os/src/init/config.priority index fe4bc9e1ed..4aacbcee58 100644 --- a/repos/os/src/init/config.priority +++ b/repos/os/src/init/config.priority @@ -34,9 +34,8 @@ nodes: <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <start name="init.1" priority="0"> + <start name="init.1" priority="0" ram="5M"> <binary name="init"/> - <resource name="RAM" quantum="5M"/> <!-- prio_levels 4 divides priority range 65..128 into 113..128 (prio 0) @@ -56,15 +55,13 @@ nodes: <any-service> <parent/> <any-child/> </any-service> </default-route> <!-- priority -1 results in platform priority 112 --> - <start name="init.11" priority="-1"> + <start name="init.11" priority="-1" ram="512K"> <binary name="init"/> - <resource name="RAM" quantum="512K"/> <config/> </start> <!-- priority -2 results in platform priority 96 --> - <start name="init.12" priority="-2"> + <start name="init.12" priority="-2" ram="2M"> <binary name="init"/> - <resource name="RAM" quantum="2M"/> <config> <parent-provides> <service name="ROM"/> @@ -74,9 +71,8 @@ nodes: <default-route> <any-service> <parent/> </any-service> </default-route> - <start name="init.121"> + <start name="init.121" ram="768K"> <binary name="init"/> - <resource name="RAM" quantum="768K"/> <config/> </start> </config> @@ -84,9 +80,8 @@ nodes: </config> </start> <!-- priority -1 results in platform priority 64 --> - <start name="init.2" priority="-1"> + <start name="init.2" priority="-1" ram="6M"> <binary name="init"/> - <resource name="RAM" quantum="6M"/> <config/> </start> </config> diff --git a/repos/os/src/monitor/README b/repos/os/src/monitor/README index 1c25cf247b..4b602e9044 100644 --- a/repos/os/src/monitor/README +++ b/repos/os/src/monitor/README @@ -12,8 +12,7 @@ to the monitor's local PD and CPU services instead of the routing those sessions to the parent. For example, the following start node selects the 'test-log' component to be monitored. -! <start name="first-test-log"> -! <resource name="RAM" quantum="2M"/> +! <start name="first-test-log" ram="2M"> ! <binary name="test-log"/> ! <route> ! <service name="PD"> <local/> </service> diff --git a/repos/os/src/server/part_block/README b/repos/os/src/server/part_block/README index b19fe4d487..939b9831d6 100644 --- a/repos/os/src/server/part_block/README +++ b/repos/os/src/server/part_block/README @@ -58,14 +58,12 @@ Usage ----- Configuration snippet with two clients and an (hypothetical) IDE driver: -!<start name="ata_driver"> -! <resource name="RAM" quantum="1M" /> +!<start name="ata_driver" ram="1M"> ! <provides><service name="Block"/></provides> ! <config ata="yes" /> !</start> ! -!<start name="part_block"> -! <resource name="RAM" quantum="10M" /> +!<start name="part_block" ram="10M"> ! <provides><service name="Block" /></provides> ! ! <!-- route part_block to the ata_driver --> @@ -84,17 +82,15 @@ Configuration snippet with two clients and an (hypothetical) IDE driver: !</start> ! !<!-- part_block clients --> -!<start name="test-part1"> +!<start name="test-part1" ram="10M"> ! <binary name="test-part"/> -! <resource name="RAM" quantum="10M" /> ! <route> ! <any-service> <child name="part_block" /> <parent/> <any-child/> </any-service> ! </route> !</start> ! -!<start name="test-part2"> +!<start name="test-part2" ram="10M"> ! <binary name="test-part"/> -! <resource name="RAM" quantum="10M" /> ! <route> ! <any-service> <child name="part_block" /> <parent/> <any-child/> </any-service> ! </route> diff --git a/repos/os/src/server/vfs_block/README b/repos/os/src/server/vfs_block/README index 0eb8b80cd3..3eb8e2c514 100644 --- a/repos/os/src/server/vfs_block/README +++ b/repos/os/src/server/vfs_block/README @@ -9,8 +9,7 @@ Configuration The following configuration snippet illustrates how to set up the component: -! <start name="vfs_block"> -! <resource name="RAM" quantum="3M"/> +! <start name="vfs_block" ram="3M"> ! <provides> <service name="Block"/> </provides> ! <config> ! @@ -44,8 +43,7 @@ will nonetheless fail. The default value is 'no'. The component can also be configured to provide access to read-only files like ISO images: -! <start name="vfs_block"> -! <resource name="RAM" quantum="2M"/> +! <start name="vfs_block" ram="2M"> ! <provides> <service name="Block"/> </provides> ! <config> ! diff --git a/repos/os/src/test/i2c_mcp9808/README b/repos/os/src/test/i2c_mcp9808/README index 4af84aff2a..0d995e4251 100644 --- a/repos/os/src/test/i2c_mcp9808/README +++ b/repos/os/src/test/i2c_mcp9808/README @@ -3,13 +3,9 @@ on an I2c bus and print it to standard output. Example config of a component using the imx8q_evk_i2c driver: -!<start name="i2c_mcp9808"> -! -! <resource name="RAM" quantum="1M"/> -! +!<start name="i2c_mcp9808" ram="1M"> ! <route> ! <service name="I2c"> <child name="imx8q_evk_i2c" label="MCP_9808"/> </service> ! <any-service> <parent/> </any-service> ! </route> -! !</start> diff --git a/repos/pc/recipes/raw/test_usb_host-pc/drivers.config b/repos/pc/recipes/raw/test_usb_host-pc/drivers.config index c7a03bd91f..ffc5df94e6 100644 --- a/repos/pc/recipes/raw/test_usb_host-pc/drivers.config +++ b/repos/pc/recipes/raw/test_usb_host-pc/drivers.config @@ -15,8 +15,7 @@ <service name="Usb"> <default-policy> <child name="usb"/> </default-policy> </service> - <start name="report_rom" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="report_rom" caps="100" ram="1M"> <provides> <service name="ROM" /> <service name="Report" /> @@ -33,8 +32,7 @@ </route> </start> - <start name="acpi" caps="350"> - <resource name="RAM" quantum="7M"/> + <start name="acpi" caps="350" ram="7M"> <route> <service name="IO_MEM"> <parent/> </service> <service name="LOG"> <parent/> </service> @@ -46,8 +44,7 @@ </route> </start> - <start name="pci_decode" caps="350"> - <resource name="RAM" quantum="2M"/> + <start name="pci_decode" caps="350" ram="2M"> <route> <service name="Report"> <child name="report_rom"/> </service> @@ -62,8 +59,7 @@ </route> </start> - <start name="platform" caps="100" managing_system="yes"> - <resource name="RAM" quantum="2M"/> + <start name="platform" caps="100" ram="2M" managing_system="yes"> <provides> <service name="Platform"/> </provides> <route> <service name="ROM" label="devices"> <child name="report_rom"/> </service> @@ -81,9 +77,8 @@ </config> </start> - <start name="usb" caps="200"> + <start name="usb" caps="200" ram="16M"> <binary name="pc_usb_host"/> - <resource name="RAM" quantum="16M"/> <provides> <service name="Usb"/> </provides> <route> <service name="Platform"> <child name="platform"/> </service> diff --git a/repos/pc/run/intel_fb.run b/repos/pc/run/intel_fb.run index eeb4457638..a9db1687d3 100644 --- a/repos/pc/run/intel_fb.run +++ b/repos/pc/run/intel_fb.run @@ -66,15 +66,13 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="report_rom" caps="100" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" caps="100" ram="2M" priority="-1"> <provides> <service name="ROM" /> <service name="Report" /> @@ -92,8 +90,7 @@ append config { </route> </start> - <start name="acpi" caps="250" priority="-1"> - <resource name="RAM" quantum="6M"/> + <start name="acpi" caps="250" ram="6M" priority="-1"> <route> <service name="IO_MEM"> <parent/> </service> <service name="LOG"> <parent/> </service> @@ -105,8 +102,7 @@ append config { </route> </start> - <start name="pci_decode" caps="350" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="pci_decode" caps="350" ram="2M" priority="-1"> <route> <service name="Report"> <child name="report_rom"/> </service> @@ -121,8 +117,7 @@ append config { </route> </start> - <start name="platform" caps="100" managing_system="yes" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="platform" caps="100" ram="2M" managing_system="yes" priority="-1"> <provides> <service name="Platform"/> </provides> <route> <service name="ROM" label="devices"> <child name="report_rom"/> </service> @@ -151,8 +146,7 @@ append config { </start>} append_if $use_top config { - <start name="top" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="top" ram="2M" priority="-1"> <config period_ms="40000"/> <route> <service name="TRACE"> <parent label=""/> </service> @@ -161,9 +155,8 @@ append_if $use_top config { </start>} append config { - <start name="init_dynamic" caps="10000" priority="-2"> + <start name="init_dynamic" caps="10000" ram="1000M" priority="-2"> <binary name="init"/> - <resource name="RAM" quantum="1000M"/> <route> <service name="Report"> <child name="report_rom"/> </service> <service name="Platform" label="usb"> <child name="platform" label="usb"/> </service> @@ -193,25 +186,22 @@ append config { <report init_ram="yes" child_ram="yes" delay_ms="10000"/>} append config { - <start name="report_rom" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M" priority="-1"> <provides> <service name="Report" /> <service name="ROM" /> </provides> <config verbose="yes"> <policy label="intel_fb_controller -> connectors" report="intel_fb -> connectors"/> </config> </start> - <start name="report_rom_usb" priority="-1"> + <start name="report_rom_usb" ram="2M" priority="-1"> <binary name="report_rom"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Report" /> <service name="ROM" /> </provides> <config verbose="no"> </config> </start> - <start name="config_fs" priority="-1"> + <start name="config_fs" ram="8M" priority="-1"> <binary name="vfs"/> - <resource name="RAM" quantum="8M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -236,9 +226,8 @@ append config { </config> </start> - <start name="config_rom" priority="-1"> + <start name="config_rom" ram="4M" priority="-1"> <binary name="fs_rom"/> - <resource name="RAM" quantum="4M"/> <provides><service name="ROM"/></provides> <route> <service name="File_system"> <child name="config_fs" /> </service> @@ -247,8 +236,7 @@ append config { </start>} append_if $use_gpu config { - <start name="intel_gpu" caps="2000"> - <resource name="RAM" quantum="90M"/> + <start name="intel_gpu" caps="2000" ram="90M"> <provides> <service name="Gpu"/> <service name="Platform"/> @@ -272,9 +260,8 @@ append_if $use_gpu config { </start>} append config { - <start name="intel_fb" caps="1000"> + <start name="intel_fb" caps="1000" ram="128M"> <binary name="pc_intel_fb"/> - <resource name="RAM" quantum="128M"/> <route>} append_if $use_gpu config { @@ -301,9 +288,8 @@ append config { </start>} append_if $use_usb config { - <start name="usb" priority="0" caps="200"> + <start name="usb" priority="0" caps="200" ram="12M"> <binary name="pc_usb_host"/> - <resource name="RAM" quantum="12M"/> <provides> <service name="Usb"/> </provides> <config bios_handoff="no"> <report devices="yes"/> @@ -316,8 +302,7 @@ append_if $use_usb config { </start>} append_if $use_fb_controller config { - <start name="intel_fb_controller" priority="-1"> - <resource name="RAM" quantum="1M"/> + <start name="intel_fb_controller" ram="1M" priority="-1"> <config> <vfs> <fs/> </vfs> </config> @@ -329,63 +314,53 @@ append_if $use_fb_controller config { </start>} append config { - <start name="test-framebuffer-eDP-1" priority="-1"> + <start name="test-framebuffer-eDP-1" ram="10M" priority="-1"> <binary name="test-framebuffer"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Capture"/> </provides> <config/> </start> - <start name="test-framebuffer-HDMI-A-1" priority="-1"> + <start name="test-framebuffer-HDMI-A-1" ram="10M" priority="-1"> <binary name="test-framebuffer"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Capture"/> </provides> <config/> </start> - <start name="test-framebuffer-HDMI-A-2" priority="-1"> + <start name="test-framebuffer-HDMI-A-2" ram="10M" priority="-1"> <binary name="test-framebuffer"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Capture"/> </provides> <config/> </start> - <start name="test-framebuffer-HDMI-A-3" priority="-1"> + <start name="test-framebuffer-HDMI-A-3" ram="10M" priority="-1"> <binary name="test-framebuffer"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Capture"/> </provides> <config/> </start> - <start name="test-framebuffer-DP-1" priority="-1"> + <start name="test-framebuffer-DP-1" ram="10M" priority="-1"> <binary name="test-framebuffer"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Capture"/> </provides> <config/> </start> - <start name="test-framebuffer-DP-2" priority="-1"> + <start name="test-framebuffer-DP-2" ram="10M" priority="-1"> <binary name="test-framebuffer"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Capture"/> </provides> <config/> </start> - <start name="test-framebuffer-DP-3" priority="-1"> + <start name="test-framebuffer-DP-3" ram="10M" priority="-1"> <binary name="test-framebuffer"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Capture"/> </provides> <config/> </start> - <start name="test-framebuffer-DP-4" priority="-1"> + <start name="test-framebuffer-DP-4" ram="10M" priority="-1"> <binary name="test-framebuffer"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Capture"/> </provides> <config/> </start> - <start name="test-framebuffer-VGA-1" priority="-1"> + <start name="test-framebuffer-VGA-1" ram="10M" priority="-1"> <binary name="test-framebuffer"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Capture"/> </provides> <config/> </start> - <start name="test-framebuffer-mirror" priority="-1"> + <start name="test-framebuffer-mirror" ram="10M" priority="-1"> <binary name="test-framebuffer"/> - <resource name="RAM" quantum="10M"/> <provides> <service name="Capture"/> </provides> <config/> </start> diff --git a/repos/pc/run/pc_nic.run b/repos/pc/run/pc_nic.run index 7970abde2e..30c6a4e125 100644 --- a/repos/pc/run/pc_nic.run +++ b/repos/pc/run/pc_nic.run @@ -27,20 +27,18 @@ append config { <service name="RM"/> </parent-provides> - <default caps="100"/> + <default caps="100" ram="1M"/> <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> <start name="timer" priority="0"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> <start name="drivers_reports" caps="100"> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> @@ -51,8 +49,7 @@ append config { </config> </start> - <start name="acpi" caps="350"> - <resource name="RAM" quantum="6M"/> + <start name="acpi" caps="350" ram="6M"> <route> <service name="Report"> <child name="drivers_reports"/> </service> <any-service> <parent/> <any-child/> </any-service> @@ -60,7 +57,6 @@ append config { </start> <start name="pci_decode" caps="350"> - <resource name="RAM" quantum="1M"/> <route> <service name="ROM" label="system"> <child name="drivers_reports"/> </service> <service name="Report"> <child name="drivers_reports"/> </service> @@ -68,8 +64,7 @@ append config { </route> </start> - <start name="platform" caps="400" managing_system="yes"> - <resource name="RAM" quantum="4M"/> + <start name="platform" caps="400" ram="4M" managing_system="yes"> <provides> <service name="Platform"/> </provides> @@ -84,13 +79,11 @@ append config { </route> </start> - <start name="pc_nic" priority="-1" caps="120"> - <resource name="RAM" quantum="16M"/> + <start name="pc_nic" priority="-1" caps="120" ram="16M"> <config ld_verbose="yes"/> </start> - <start name="nic_router" caps="150"> - <resource name="RAM" quantum="8M"/> + <start name="nic_router" caps="150" ram="8M"> <provides> <service name="Nic"/> <service name="Uplink"/> diff --git a/repos/pc/run/pc_wifi.run b/repos/pc/run/pc_wifi.run index 2ada3eaa53..1ec9de9380 100644 --- a/repos/pc/run/pc_wifi.run +++ b/repos/pc/run/pc_wifi.run @@ -60,14 +60,12 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> <start name="report_rom" caps="70"> - <resource name="RAM" quantum="1M"/> <provides> <service name="ROM" /> <service name="Report" /> @@ -84,8 +82,7 @@ append config { </route> </start> - <start name="acpi" caps="250"> - <resource name="RAM" quantum="6M"/> + <start name="acpi" caps="250" ram="6M"> <route> <service name="IO_MEM"> <parent/> </service> <service name="LOG"> <parent/> </service> @@ -97,8 +94,7 @@ append config { </route> </start> - <start name="pci_decode" caps="350"> - <resource name="RAM" quantum="2M"/> + <start name="pci_decode" caps="350" ram="2M"> <route> <service name="Report"> <child name="report_rom"/> </service> @@ -113,8 +109,7 @@ append config { </route> </start> - <start name="platform" caps="100" managing_system="yes"> - <resource name="RAM" quantum="2M"/> + <start name="platform" caps="100" ram="2M" managing_system="yes"> <provides> <service name="Platform"/> </provides> <route> <service name="ROM" label="devices"> <child name="report_rom"/> </service> @@ -135,12 +130,10 @@ append config { </start> <start name="pc_rtc"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Rtc"/> </provides> </start> - <start name="test-lwip_httpsrv"> - <resource name="RAM" quantum="128M"/> + <start name="test-lwip_httpsrv" ram="128M"> <config> <libc stdout="/dev/null" stderr="/dev/log" socket="/socket"/> <vfs> @@ -154,23 +147,20 @@ append config { </route> </start> - <start name="state_report_rom"> + <start name="state_report_rom" ram="2M"> <binary name="report_rom"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="no"/> </start> - <start name="accesspoints_report_rom"> + <start name="accesspoints_report_rom" ram="2M"> <binary name="report_rom"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="no"/> </start> - <start name="config_rom"> + <start name="config_rom" ram="4M"> <binary name="dynamic_rom"/> - <resource name="RAM" quantum="4M"/> <provides><service name="ROM"/></provides> <config verbose="yes"> <rom name="wifi_config"> @@ -194,8 +184,7 @@ append config { </config> </start> - <start name="nic_router" caps="150"> - <resource name="RAM" quantum="8M"/> + <start name="nic_router" caps="150" ram="8M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -222,15 +211,13 @@ append config { </config> </start> - <start name="devices_report_rom"> + <start name="devices_report_rom" ram="1200K"> <binary name="report_rom"/> - <resource name="RAM" quantum="1200K"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> </start> - <start name="wifi" caps="260" priority="-1"> - <resource name="RAM" quantum="32M"/> + <start name="wifi" caps="260" ram="32M" priority="-1"> <config ld_verbose="yes"> <report mac_address="true"/> <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" rng="/dev/urandom"/> diff --git a/repos/pc/src/driver/usb_host/pc/README b/repos/pc/src/driver/usb_host/pc/README index 0f6d7aa443..8e02ebd0e0 100644 --- a/repos/pc/src/driver/usb_host/pc/README +++ b/repos/pc/src/driver/usb_host/pc/README @@ -8,9 +8,8 @@ It can report the configuration it currently has, as well as a report of all USB devices it has currently recognized. Both reports can be enabled separatly via the config node of the driver: -! <start name="usb_host"> +! <start name="usb_host" ram="10M"> ! <binary name="pc_usb_host"/> -! <resource name="RAM" quantum="10M"/> ! <provides><service name="Usb"/></provides> ! <config> ! <report config="yes" devices="yes"/> @@ -62,9 +61,8 @@ assign devices based on their name, a vendor-product-tuple, or by defining the class-value for all USB device interfaces that matches that class. Here are some examples: -! <start name="usb_host"> +! <start name="usb_host" ram="10M"> ! <binary name="pc_usb_host"/> -! <resource name="RAM" quantum="10M"/> ! <provides><service name="Usb"/></provides> ! <config> ! <policy label="usb_hid -> "> <device class="0x3"/> </policy> diff --git a/repos/ports/recipes/pkg/report_dump/runtime b/repos/ports/recipes/pkg/report_dump/runtime index b189415c1c..77ea14911a 100644 --- a/repos/ports/recipes/pkg/report_dump/runtime +++ b/repos/ports/recipes/pkg/report_dump/runtime @@ -23,8 +23,7 @@ <default caps="100"/> - <start name="vfs" caps="150"> - <resource name="RAM" quantum="12M"/> + <start name="vfs" caps="150" ram="12M"> <provides><service name="File_system"/></provides> <config> <vfs> @@ -56,8 +55,7 @@ </route> </start> - <start name="vfs_rom"> - <resource name="RAM" quantum="16M"/> + <start name="vfs_rom" ram="16M"> <binary name="fs_rom"/> <provides> <service name="ROM"/> </provides> <config/> @@ -67,8 +65,7 @@ </route> </start> - <start name="/bin/bash" caps="450"> - <resource name="RAM" quantum="28M" /> + <start name="/bin/bash" caps="450" ram="28M"> <exit propagate="yes"/> <config> <libc stdin="/dev/null" stdout="/dev/null" diff --git a/repos/ports/recipes/pkg/vbox5-nova-capture/runtime b/repos/ports/recipes/pkg/vbox5-nova-capture/runtime index 6bfb2e84ca..bfab277a2c 100644 --- a/repos/ports/recipes/pkg/vbox5-nova-capture/runtime +++ b/repos/ports/recipes/pkg/vbox5-nova-capture/runtime @@ -51,9 +51,8 @@ <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <start name="vbox" caps="1000"> + <start name="vbox" caps="1000" ram="8G"> <binary name="virtualbox5-nova" /> - <resource name="RAM" quantum="8G"/> <exit propagate="yes"/> <config vbox_file="machine.vbox" xhci="yes" vm_name="linux" capslock="ROM"> <vfs> diff --git a/repos/ports/recipes/raw/gdb_x86/gdb.config b/repos/ports/recipes/raw/gdb_x86/gdb.config index 81c66f8ef5..439f655b79 100644 --- a/repos/ports/recipes/raw/gdb_x86/gdb.config +++ b/repos/ports/recipes/raw/gdb_x86/gdb.config @@ -14,9 +14,8 @@ <default caps="100"/> - <start name="depot_ro"> + <start name="depot_ro" ram="2M"> <binary name="chroot"/> - <resource name="RAM" quantum="2M" /> <provides> <service name="File_system"/> </provides> <config> <default-policy path="/depot" writeable="no"/> @@ -29,8 +28,7 @@ </route> </start> - <start name="vfs" caps="150"> - <resource name="RAM" quantum="12M"/> + <start name="vfs" caps="150" ram="12M"> <provides><service name="File_system"/></provides> <config> <vfs> @@ -50,8 +48,7 @@ </route> </start> - <start name="gdb_support"> - <resource name="RAM" quantum="16M"/> + <start name="gdb_support" ram="16M"> <config> <vfs> <dir name="config"> <fs label="config"/> </dir> @@ -72,8 +69,7 @@ </route> </start> - <start name="vfs_rom"> - <resource name="RAM" quantum="16M"/> + <start name="vfs_rom" ram="16M"> <binary name="cached_fs_rom"/> <provides> <service name="ROM"/> </provides> <config/> @@ -83,9 +79,8 @@ </route> </start> - <start name="gdb" caps="1000"> + <start name="gdb" caps="1000" ram="1G"> <binary name="/bin/genode-x86-gdb"/> - <resource name="RAM" quantum="1G" /> <config> <vfs> <dir name="dev"> diff --git a/repos/ports/recipes/raw/socat_tcp/socat_tcp.config b/repos/ports/recipes/raw/socat_tcp/socat_tcp.config index 1f31e498ec..bfead3e26a 100644 --- a/repos/ports/recipes/raw/socat_tcp/socat_tcp.config +++ b/repos/ports/recipes/raw/socat_tcp/socat_tcp.config @@ -14,8 +14,7 @@ <default caps="100"/> - <start name="vfs" caps="150"> - <resource name="RAM" quantum="12M"/> + <start name="vfs" caps="150" ram="12M"> <provides><service name="File_system"/></provides> <config> <vfs> @@ -26,8 +25,7 @@ </config> </start> - <start name="vfs_rom"> - <resource name="RAM" quantum="16M"/> + <start name="vfs_rom" ram="16M"> <binary name="cached_fs_rom"/> <provides> <service name="ROM"/> </provides> <config/> @@ -37,9 +35,8 @@ </route> </start> - <start name="socat" caps="200"> + <start name="socat" caps="200" ram="28M"> <binary name="/bin/socat"/> - <resource name="RAM" quantum="28M" /> <config> <vfs> <dir name="dev"> diff --git a/repos/ports/recipes/raw/system_shell/system_shell.config b/repos/ports/recipes/raw/system_shell/system_shell.config index d053f5b618..5296d1bc7b 100644 --- a/repos/ports/recipes/raw/system_shell/system_shell.config +++ b/repos/ports/recipes/raw/system_shell/system_shell.config @@ -15,8 +15,7 @@ <default caps="100"/> - <start name="terminal" caps="150"> - <resource name="RAM" quantum="48M"/> + <start name="terminal" caps="150" ram="48M"> <provides> <service name="Terminal"/> </provides> <config copy="yes" paste="yes"> <initial width="800" height="600"/> @@ -31,8 +30,7 @@ </route> </start> - <start name="vfs" caps="150"> - <resource name="RAM" quantum="12M"/> + <start name="vfs" caps="150" ram="12M"> <provides><service name="File_system"/></provides> <config> <vfs> @@ -66,8 +64,7 @@ </route> </start> - <start name="vfs_rom"> - <resource name="RAM" quantum="16M"/> + <start name="vfs_rom" ram="16M"> <binary name="cached_fs_rom"/> <provides> <service name="ROM"/> </provides> <config/> @@ -77,8 +74,7 @@ </route> </start> - <start name="/bin/bash" caps="450"> - <resource name="RAM" quantum="28M" /> + <start name="/bin/bash" caps="450" ram="28M"> <exit propagate="yes"/> <config> <libc stdin="/dev/terminal" stdout="/dev/terminal" diff --git a/repos/ports/recipes/raw/vbox5-nova-sculpt/init.config b/repos/ports/recipes/raw/vbox5-nova-sculpt/init.config index 13331a0dd9..2a1bd27999 100644 --- a/repos/ports/recipes/raw/vbox5-nova-sculpt/init.config +++ b/repos/ports/recipes/raw/vbox5-nova-sculpt/init.config @@ -19,9 +19,8 @@ <default caps="100"/> - <start name="vbox" caps="1000"> + <start name="vbox" caps="1000" ram="8G"> <binary name="virtualbox5-nova" /> - <resource name="RAM" quantum="8G"/> <exit propagate="yes"/> <config vbox_file="machine.vbox" xhci="yes" vm_name="linux" capslock="ROM"> <vfs> diff --git a/repos/ports/run/bash.run b/repos/ports/run/bash.run index 075ddf3dd6..cd1065941e 100644 --- a/repos/ports/run/bash.run +++ b/repos/ports/run/bash.run @@ -42,15 +42,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -61,8 +59,7 @@ install_config { </route> </start> - <start name="nitpicker"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" ram="4M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -76,8 +73,7 @@ install_config { </route> </start> - <start name="terminal" caps="110"> - <resource name="RAM" quantum="6M"/> + <start name="terminal" caps="110" ram="6M"> <provides><service name="Terminal"/></provides> <route> <service name="ROM" label="config"> <parent label="terminal.config"/> </service> @@ -86,8 +82,7 @@ install_config { </route> </start> - <start name="vfs" caps="120"> - <resource name="RAM" quantum="30M"/> + <start name="vfs" caps="120" ram="30M"> <provides><service name="File_system"/></provides> <config> <vfs> @@ -110,8 +105,7 @@ install_config { </config> </start> - <start name="vfs_rom"> - <resource name="RAM" quantum="30M"/> + <start name="vfs_rom" ram="30M"> <binary name="fs_rom"/> <provides> <service name="ROM"/> </provides> <config/> @@ -121,8 +115,7 @@ install_config { </route> </start> - <start name="/bin/bash" caps="1000"> - <resource name="RAM" quantum="30M" /> + <start name="/bin/bash" caps="1000" ram="30M"> <config ld_verbose="yes"> <libc stdin="/dev/terminal" stdout="/dev/terminal" stderr="/dev/terminal" rtc="/dev/rtc" pipe="/pipe"/> diff --git a/repos/ports/run/gdb.inc b/repos/ports/run/gdb.inc index 0040a1687c..120e7c0508 100644 --- a/repos/ports/run/gdb.inc +++ b/repos/ports/run/gdb.inc @@ -76,10 +76,9 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> } @@ -87,9 +86,8 @@ append config { if { [have_include power_on/qemu] } { append_if [have_board pc] config { - <start name="uart"> + <start name="uart" ram="2M"> <binary name="pc_uart"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Terminal"/> <service name="Uart"/> @@ -101,9 +99,8 @@ if { [have_include power_on/qemu] } { } append_if [have_board rpi3] config { - <start name="uart"> + <start name="uart" ram="2M"> <binary name="rpi3_uart"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Terminal"/> <service name="Uart"/> @@ -117,8 +114,7 @@ if { [have_include power_on/qemu] } { } else { append config { - <start name="drivers" caps="1000" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1000" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -127,8 +123,7 @@ if { [have_include power_on/qemu] } { <any-service> <parent/> </any-service> </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -164,24 +159,21 @@ if { [have_include power_on/qemu] } { append config { - <start name="terminal_monitor"> + <start name="terminal_monitor" ram="2M"> <binary name="terminal_crosslink"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Terminal"/> </provides> </start> - <start name="terminal_gdb"> + <start name="terminal_gdb" ram="2M"> <binary name="terminal_crosslink"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Terminal"/> </provides> </start> - <start name="monitor" caps="1000"> - <resource name="RAM" quantum="100M"/> + <start name="monitor" caps="1000" ram="100M"> <config> <parent-provides> <service name="LOG"/> @@ -195,8 +187,7 @@ append config { <policy label="test-monitor_gdb" wait="yes" wx="yes"/> </monitor> - <start name="test-monitor_gdb" caps="300"> - <resource name="RAM" quantum="10M"/> + <start name="test-monitor_gdb" caps="300" ram="10M"> <config> <vfs> <dir name="dev"> <log/> </dir> </vfs> <libc stdout="/dev/log" stderr="/dev/log"/> @@ -207,8 +198,7 @@ append config { <any-service> <parent/> </any-service> </route> </start> - <start name="test-log"> - <resource name="RAM" quantum="2M"/> + <start name="test-log" ram="2M"> <route> <service name="PD"> <local/> </service> <service name="CPU"> <local/> </service> @@ -222,8 +212,7 @@ append config { </route> </start> - <start name="vfs"> - <resource name="RAM" quantum="12M"/> + <start name="vfs" ram="12M"> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -237,8 +226,7 @@ append config { </route> </start> - <start name="vfs_rom"> - <resource name="RAM" quantum="60M"/> + <start name="vfs_rom" ram="60M"> <binary name="fs_rom"/> <provides> <service name="ROM"/> </provides> <config/> @@ -248,9 +236,8 @@ append config { </route> </start> - <start name="socat" caps="200"> + <start name="socat" caps="200" ram="30M"> <binary name="/bin/socat"/> - <resource name="RAM" quantum="30M" /> <config> <vfs> <dir name="dev"> @@ -301,9 +288,8 @@ append config { </route> </start> - <start name="gdb" caps="300"> + <start name="gdb" caps="300" ram="42M"> <binary name="/bin/} [gdb_prefix] {gdb"/> - <resource name="RAM" quantum="42M"/> <config ld_verbose="yes"> <vfs> <dir name="dev"> diff --git a/repos/ports/run/genode_org.run b/repos/ports/run/genode_org.run index fca26991a1..4c2a0b1506 100644 --- a/repos/ports/run/genode_org.run +++ b/repos/ports/run/genode_org.run @@ -38,15 +38,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="nic" caps="1000" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="nic" caps="1000" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -56,8 +54,7 @@ install_config { </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -94,8 +91,7 @@ install_config { </config> </start> - <start name="lighttpd" caps="1000"> - <resource name="RAM" quantum="1G" /> + <start name="lighttpd" caps="1000" ram="1G"> <config> <arg value="lighttpd" /> <arg value="-f" /> diff --git a/repos/ports/run/lighttpd.run b/repos/ports/run/lighttpd.run index 481cf2bb67..64d4350afe 100644 --- a/repos/ports/run/lighttpd.run +++ b/repos/ports/run/lighttpd.run @@ -49,15 +49,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="nic" caps="1000" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="nic" caps="1000" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -67,8 +65,7 @@ install_config { </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -105,8 +102,7 @@ install_config { </config> </start> - <start name="lighttpd" caps="200"> - <resource name="RAM" quantum="1G" /> + <start name="lighttpd" caps="200" ram="1G"> <config> <arg value="lighttpd" /> <arg value="-f" /> diff --git a/repos/ports/run/lighttpd_fetchurl.run b/repos/ports/run/lighttpd_fetchurl.run index bd403cbc39..d3647bbd0e 100644 --- a/repos/ports/run/lighttpd_fetchurl.run +++ b/repos/ports/run/lighttpd_fetchurl.run @@ -63,15 +63,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -89,8 +87,7 @@ install_config { </config> </start> - <start name="lighttpd" caps="200"> - <resource name="RAM" quantum="32M" /> + <start name="lighttpd" caps="200" ram="32M"> <config> <arg value="lighttpd" /> <arg value="-f" /> @@ -123,13 +120,11 @@ install_config { </start> <start name="report_rom" caps="100"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> </start> - <start name="fetchurl" caps="500"> - <resource name="RAM" quantum="32M"/> + <start name="fetchurl" caps="500" ram="32M"> <config> <report delay_ms="1000" progress="yes"/> <vfs> diff --git a/repos/ports/run/microcode.run b/repos/ports/run/microcode.run index 3407fdd5f4..8c7d53ab5e 100644 --- a/repos/ports/run/microcode.run +++ b/repos/ports/run/microcode.run @@ -45,9 +45,7 @@ install_config { <any-service> <parent/> </any-service> </default-route> <default caps="50"/> - <start name="test-microcode"> - <resource name="RAM" quantum="10M"/> - </start> + <start name="test-microcode" ram="10M"/> </config> } diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index 16df043016..75bba9b2dd 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -189,18 +189,16 @@ set config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <resource name="CPU" quantum="10"/> <provides> <service name="Timer"/> </provides> </start> } if { $use_wifi_driver } { append config { - <start name="report_rom" caps="100" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" caps="100" ram="2M" priority="-1"> <provides> <service name="ROM" /> <service name="Report" /> @@ -211,20 +209,16 @@ if { $use_wifi_driver } { </config> </start> - <start name="acpi" caps="250" priority="-1"> - <resource name="RAM" quantum="4M"/> - </start> + <start name="acpi" caps="250" ram="4M" priority="-1"/> - <start name="pci_decode" caps="350" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="pci_decode" caps="350" ram="2M" priority="-1"> <route> <service name="ROM" label="system"> <child name="report_rom"/> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="platform" caps="100" managing_system="yes" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="platform" caps="100" ram="2M" managing_system="yes" priority="-1"> <provides> <service name="Platform"/> </provides> <route> <service name="ROM" label="devices"> <child name="report_rom"/> </service> @@ -235,9 +229,8 @@ if { $use_wifi_driver } { </config> </start> - <start name="config_fs" priority="-1"> + <start name="config_fs" ram="4M" priority="-1"> <binary name="vfs"/> - <resource name="RAM" quantum="4M"/> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -254,9 +247,8 @@ append config { </wifi_config> </config> </start> - <start name="config_rom" priority="-1"> + <start name="config_rom" ram="4M" priority="-1"> <binary name="fs_rom"/> - <resource name="RAM" quantum="4M"/> <provides><service name="ROM"/></provides> <route> <service name="File_system"> <child name="config_fs" /> </service> @@ -264,9 +256,8 @@ append config { </wifi_config> </route> </start> - <start name="nic" caps="340" priority="-1"> + <start name="nic" caps="340" ram="32M" priority="-1"> <binary name="wifi"/> - <resource name="RAM" quantum="32M"/> <config> <libc stdout="/dev/null" stderr="/dev/log" rtc="/dev/rtc"/> <vfs> @@ -297,9 +288,8 @@ append config { </wifi_config> append config { - <start name="usb" caps="1500" managing_system="yes" priority="-1"> + <start name="usb" caps="1500" ram="32M" managing_system="yes" priority="-1"> <binary name="init"/> - <resource name="RAM" quantum="32M"/> <provides> <service name="Usb"/> </provides> <route> <service name="ROM" label="config"> @@ -310,9 +300,8 @@ append config { </wifi_config> </route> </start> - <start name="nic" caps="200" priority="-1"> + <start name="nic" caps="200" ram="20M" priority="-1"> <binary name="usb_net"/> - <resource name="RAM" quantum="20M"/> <config mac="02:00:00:00:01:01" /> <route> <service name="Uplink"><child name="nic_router"/></service> @@ -324,8 +313,7 @@ append config { </wifi_config> append config { - <start name="nic" caps="1200" managing_system="yes" priority="-1"> - <resource name="RAM" quantum="32M"/> + <start name="nic" caps="1200" ram="32M" managing_system="yes" priority="-1"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -338,8 +326,7 @@ append config { </wifi_config> append config { - <start name="nic_router" caps="120" priority="-1"> - <resource name="RAM" quantum="5M"/> + <start name="nic_router" caps="120" ram="5M" priority="-1"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -383,8 +370,7 @@ append config { append_if $use_nic_bridge config { - <start name="nic_bridge" priority="-1"> - <resource name="RAM" quantum="5M"/> + <start name="nic_bridge" ram="5M" priority="-1"> <provides><service name="Nic"/></provides> <config mac="} $bridge_mac {"> <default-policy/> @@ -397,9 +383,8 @@ append_if $use_nic_bridge config { append config { - <start name="netserver_genode" caps="320" priority="-2"> - <binary name="netserver"/> - <resource name="RAM" quantum="14M"/> + <start name="netserver_genode" caps="320" ram="14M" priority="-2"> + <binary name="netserver"/> <config> <arg value="netserver"/> <arg value="-D"/> diff --git a/repos/ports/run/socat.run b/repos/ports/run/socat.run index bbe16d722a..c1d09119e4 100644 --- a/repos/ports/run/socat.run +++ b/repos/ports/run/socat.run @@ -47,10 +47,9 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> } @@ -58,9 +57,8 @@ append config { if { [have_include power_on/qemu] } { append_if [have_board pc] config { - <start name="uart"> + <start name="uart" ram="2M"> <binary name="pc_uart"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Terminal"/> <service name="Uart"/> @@ -72,9 +70,8 @@ if { [have_include power_on/qemu] } { } append_if [have_board rpi3] config { - <start name="uart"> + <start name="uart" ram="2M"> <binary name="rpi3_uart"/> - <resource name="RAM" quantum="2M"/> <provides> <service name="Terminal"/> <service name="Uart"/> @@ -88,8 +85,7 @@ if { [have_include power_on/qemu] } { } else { append config { - <start name="drivers" caps="1000" managing_system="yes"> - <resource name="RAM" quantum="32M"/> + <start name="drivers" caps="1000" ram="32M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -98,8 +94,7 @@ if { [have_include power_on/qemu] } { <any-service> <parent/> </any-service> </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -135,15 +130,13 @@ if { [have_include power_on/qemu] } { append config { - <start name="terminal_crosslink"> - <resource name="RAM" quantum="2M"/> + <start name="terminal_crosslink" ram="2M"> <provides> <service name="Terminal"/> </provides> </start> - <start name="vfs" caps="120"> - <resource name="RAM" quantum="30M"/> + <start name="vfs" caps="120" ram="30M"> <provides><service name="File_system"/></provides> <config> <vfs> @@ -154,8 +147,7 @@ append config { </config> </start> - <start name="vfs_rom"> - <resource name="RAM" quantum="30M"/> + <start name="vfs_rom" ram="30M"> <binary name="fs_rom"/> <provides> <service name="ROM"/> </provides> <config/> @@ -165,9 +157,8 @@ append config { </route> </start> - <start name="socat" caps="200"> + <start name="socat" caps="200" ram="30M"> <binary name="/bin/socat"/> - <resource name="RAM" quantum="30M" /> <config> <vfs> <dir name="dev"> @@ -218,8 +209,7 @@ append config { </route> </start> - <start name="test-terminal_echo"> - <resource name="RAM" quantum="1M"/> + <start name="test-terminal_echo" ram="1M"> <route> <service name="Terminal"> <child name="terminal_crosslink"/> </service> <any-service> <parent/> <any-child/> </any-service> diff --git a/repos/ports/run/tool_chain_auto.run b/repos/ports/run/tool_chain_auto.run index 1bdd2e1d6a..cecc183dba 100644 --- a/repos/ports/run/tool_chain_auto.run +++ b/repos/ports/run/tool_chain_auto.run @@ -155,15 +155,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="vfs" caps="200"> - <resource name="RAM" quantum="124M"/> + <start name="vfs" caps="200" ram="124M"> <provides> <service name="File_system"/> </provides> <config> <vfs> @@ -198,8 +196,7 @@ install_config { </config> </start> - <start name="vfs_rom"> - <resource name="RAM" quantum="60M"/> + <start name="vfs_rom" ram="60M"> <binary name="} [fs_rom_binary] {"/> <provides> <service name="ROM"/> </provides> <config/> @@ -209,8 +206,7 @@ install_config { </route> </start> - <start name="/bin/bash" caps="2000"> - <resource name="RAM" quantum="300M" /> + <start name="/bin/bash" caps="2000" ram="300M"> <config ld_verbose="yes"> <libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" pipe="/pipe"> diff --git a/repos/ports/run/vbox6_genode_usb_hid_raw.run b/repos/ports/run/vbox6_genode_usb_hid_raw.run index b16156b9fc..518b5f95a6 100644 --- a/repos/ports/run/vbox6_genode_usb_hid_raw.run +++ b/repos/ports/run/vbox6_genode_usb_hid_raw.run @@ -59,15 +59,13 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="150"/> + <default caps="150" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start> <start name="report_rom" priority="-1"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config> <policy label="pci_decode -> system" report="acpi -> acpi"/> @@ -77,16 +75,14 @@ install_config { </config> </start> - <start name="acpi" caps="250"> - <resource name="RAM" quantum="8M"/> + <start name="acpi" caps="250" ram="8M"> <route> <service name="Report"> <child name="report_rom"/> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="pci_decode" caps="350"> - <resource name="RAM" quantum="2M"/> + <start name="pci_decode" caps="350" ram="2M"> <route> <service name="ROM" label="system"> <child name="report_rom"/> </service> <service name="Report"> <child name="report_rom"/> </service> @@ -94,8 +90,7 @@ install_config { </route> </start> - <start name="platform" caps="100" managing_system="yes"> - <resource name="RAM" quantum="2M"/> + <start name="platform" caps="100" ram="2M" managing_system="yes"> <provides> <service name="Platform"/> </provides> <route> <service name="Report"> <child name="report_rom"/> </service> @@ -107,9 +102,8 @@ install_config { </config> </start> - <start name="usb" priority="-1"> + <start name="usb" ram="16M" priority="-1"> <binary name="pc_usb_host"/> - <resource name="RAM" quantum="16M"/> <provides> <service name="Usb"/> </provides> <config> <report devices="yes" config="yes"/> @@ -122,8 +116,7 @@ install_config { </route> </start> - <start name="nitpicker" priority="-1"> - <resource name="RAM" quantum="12M"/> + <start name="nitpicker" ram="12M" priority="-1"> <provides> <service name="Gui"/> </provides> <config> <report focus="yes" hover="yes" /> @@ -139,7 +132,6 @@ install_config { </start> <start name="black_hole"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Event"/> <service name="Nic"/> @@ -149,16 +141,14 @@ install_config { </config> </start> - <start name="log_terminal" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="log_terminal" ram="2M" priority="-1"> <provides> <service name="Terminal"/> </provides> </start> - <start name="virtualbox" caps="800" priority="-2"> + <start name="virtualbox" caps="800" ram="1024M" priority="-2"> <binary name="virtualbox6"/> - <resource name="RAM" quantum="1024M"/> <config vbox_file="vbox6_genode_usb_hid_raw.vbox" vm_name="TestVM" xhci="yes"> <vfs> <dir name="dev"> diff --git a/repos/ports/run/vbox_share.inc b/repos/ports/run/vbox_share.inc index 9208e6445e..1305e8feae 100644 --- a/repos/ports/run/vbox_share.inc +++ b/repos/ports/run/vbox_share.inc @@ -117,17 +117,15 @@ lappend boot_modules bash.tar coreutils.tar test.bin template.bat $vbox_file set config_of_app { - <start name="nic" priority="-1"> + <start name="nic" ram="8M" priority="-1"> <binary name="pc_nic"/> - <resource name="RAM" quantum="8M"/> <route> <service name="Uplink"><child name="nic_router"/></service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -161,8 +159,7 @@ set config_of_app { </config> </start> - <start name="tcp_terminal" priority="-1" caps="200"> - <resource name="RAM" quantum="6M"/> + <start name="tcp_terminal" priority="-1" caps="200" ram="6M"> <provides> <service name="Terminal"/> </provides> <config> <policy label_prefix="vfs" port="8888"/> @@ -179,9 +176,8 @@ set config_of_app { </route> </start> - <start name="ram_fs_from" priority="-1"> + <start name="ram_fs_from" priority="-1" ram="64M"> <binary name="vfs"/> - <resource name="RAM" quantum="64M"/> <provides><service name="File_system"/></provides> <config> <vfs> @@ -195,9 +191,8 @@ set config_of_app { </config> </start> - <start name="ram_fs_to" priority="-1"> + <start name="ram_fs_to" priority="-1" ram="64M"> <binary name="vfs"/> - <resource name="RAM" quantum="64M"/> <provides><service name="File_system"/></provides> <config> <vfs> <ram/> </vfs> @@ -205,8 +200,7 @@ set config_of_app { </config> </start> - <start name="vfs" caps="120" priority="-1"> - <resource name="RAM" quantum="30M"/> + <start name="vfs" caps="120" priority="-1" ram="30M"> <provides><service name="File_system"/></provides> <config> <vfs> @@ -238,8 +232,7 @@ set config_of_app { </route> </start> - <start name="vfs_rom" priority="-1"> - <resource name="RAM" quantum="30M"/> + <start name="vfs_rom" priority="-1" ram="30M"> <binary name="fs_rom"/> <provides> <service name="ROM"/> </provides> <config/> @@ -249,8 +242,7 @@ set config_of_app { </route> </start> - <start name="/bin/bash" caps="600" priority="-1"> - <resource name="RAM" quantum="30M" /> + <start name="/bin/bash" caps="600" priority="-1" ram="30M"> <config ld_verbose="yes"> <libc stdin="/dev/terminal" stdout="/dev/terminal" stderr="/dev/terminal" rtc="/dev/rtc" pipe="/pipe"/> @@ -268,8 +260,7 @@ set config_of_app { </route> </start> - <start name="report_rom" priority="-1"> - <resource name="RAM" quantum="1M"/> + <start name="report_rom" priority="-1" ram="1M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config> <policy label="pointer -> hover" report="nitpicker -> hover"/> @@ -278,8 +269,7 @@ set config_of_app { </config> </start> - <start name="event_filter" priority="-1"> - <resource name="RAM" quantum="1M" /> + <start name="event_filter" priority="-1" ram="1M"> <provides> <service name="Event" /> </provides> @@ -305,8 +295,7 @@ append config_of_app { </route> </start> - <start name="nitpicker" priority="-1"> - <resource name="RAM" quantum="12M"/> + <start name="nitpicker" priority="-1" ram="12M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -328,8 +317,7 @@ append config_of_app { </config> </start> - <start name="pointer" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="pointer" priority="-1" ram="2M"> <provides> <service name="Report"/> </provides> <config shapes="yes"/> <route> @@ -340,11 +328,10 @@ append config_of_app { </route> </start> - <start name="vbox1" priority="-2" caps="600">} + <start name="vbox1" priority="-2" caps="600" ram="1280M">} append_if [expr $use_vbox5] config_of_app " <binary name=\"$virtualbox5_binary\" />" append config_of_app { - <resource name="RAM" quantum="1280M"/> <config vbox_file="} $vbox_file {" vm_name="AutoDisk"> <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" pipe="/pipe"/> <vfs> diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc index 7fb877bcf4..309f5078da 100644 --- a/repos/ports/run/vbox_win.inc +++ b/repos/ports/run/vbox_win.inc @@ -50,8 +50,7 @@ set virtualbox5_binary "virtualbox5-nova" set config_of_app { - <start name="event_filter"> - <resource name="RAM" quantum="1M" /> + <start name="event_filter" ram="1M"> <provides> <service name="Event" /> </provides> @@ -75,17 +74,15 @@ set config_of_app { Note: to get network access in the VM, the virtual network adapter needs to be enabled in the .vbox file (disabled by default) --> - <start name="nic" caps="150" priority="-1"> + <start name="nic" caps="150" ram="8M" priority="-1"> <binary name="pc_nic"/> - <resource name="RAM" quantum="8M" /> <route> <service name="Uplink"> <child name="nic_router"/> </service> <any-service> <parent/> <any-child /> </any-service> </route> </start> - <start name="nic_router" caps="200"> - <resource name="RAM" quantum="10M"/> + <start name="nic_router" caps="200" ram="10M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -122,9 +119,8 @@ set config_of_app { needs to be enabled in the .vbox file (disabled by default). (Recording is configured to use the external mic.) --> - <start name="audio" priority="-1"> + <start name="audio" priority="-1" ram="9M"> <binary name="pci_audio"/> - <resource name="RAM" quantum="9M"/> <provides> <service name="Audio_out"/> <service name="Audio_in"/> @@ -136,8 +132,7 @@ set config_of_app { </config> </start> - <start name="report_rom"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config> <policy label="pointer -> hover" report="nitpicker -> hover"/> @@ -152,8 +147,7 @@ append config_of_app { </config> </start> - <start name="nitpicker" priority="-1" caps="150"> - <resource name="RAM" quantum="12M"/> + <start name="nitpicker" priority="-1" caps="150" ram="12M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -165,8 +159,7 @@ append config_of_app { </route> </start> - <start name="pointer" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="pointer" priority="-1" ram="2M"> <provides> <service name="Report"/> </provides> <config shapes="yes"/> <route> @@ -179,8 +172,7 @@ append config_of_app { if { $use_vms > 1 } { append config_of_app { - <start name="wm" caps="1000"> - <resource name="RAM" quantum="32M"/> + <start name="wm" caps="1000" ram="32M"> <binary name="init"/> <provides> <service name="Gui"/> <service name="Report"/> <service name="ROM"/> @@ -194,9 +186,8 @@ if { $use_vms > 1 } { } append config_of_app { - <start name="dynamic-config" priority="-1"> + <start name="dynamic-config" priority="-1" ram="1M"> <binary name="dynamic_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="ROM"/> </provides> <config verbose="yes"> <rom name="capslock"> @@ -254,12 +245,10 @@ append config_of_app { for { set i 1} { $i <= $use_vms } { incr i} { append config_of_app " - <start name=\"vbox${i}\" priority=\"-2\" caps=\"1200\">" + <start name=\"vbox${i}\" priority=\"-2\" caps=\"1200\" ram=\"$vm_ram\">" append_if [expr $use_vbox5] config_of_app " <binary name=\"$virtualbox5_binary\" />" - append config_of_app { - <resource name="RAM" quantum="} $vm_ram {"/>} if { $use_vms eq 1 } { append config_of_app " <config ld_verbose=\"yes\" vbox_file=\"${vbox_file}\" vm_name=\"${flavor}\" xhci=\"yes\" capslock=\"NOROM\">" diff --git a/repos/ports/run/verify.run b/repos/ports/run/verify.run index 6eaf3f0a48..b92a6aaa36 100644 --- a/repos/ports/run/verify.run +++ b/repos/ports/run/verify.run @@ -21,14 +21,12 @@ install_config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <start name="report_rom" caps="100"> - <resource name="RAM" quantum="1M"/> + <start name="report_rom" caps="100" ram="1M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config verbose="yes"/> </start> - <start name="verify" caps="200"> - <resource name="RAM" quantum="12M"/> + <start name="verify" caps="200" ram="12M"> <config verbose="yes"> <libc stdout="/dev/log" stderr="/dev/null" rtc="/dev/null"/> <vfs> diff --git a/repos/ports/run/vim.run b/repos/ports/run/vim.run index c6c9aba444..3c7cba6756 100644 --- a/repos/ports/run/vim.run +++ b/repos/ports/run/vim.run @@ -32,15 +32,13 @@ install_config { <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> - <start name="drivers" caps="1500" managing_system="yes"> - <resource name="RAM" quantum="64M"/> + <start name="drivers" caps="1500" ram="64M" managing_system="yes"> <binary name="init"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> @@ -52,7 +50,6 @@ install_config { </start> <start name="report_rom"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> </provides> @@ -61,8 +58,7 @@ install_config { </config> </start> - <start name="nitpicker"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" ram="4M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -82,16 +78,14 @@ install_config { </route> </start> - <start name="pointer"> - <resource name="RAM" quantum="2M"/> + <start name="pointer" ram="2M"> <route> <service name="Gui"> <child name="nitpicker"/> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="clipboard"> - <resource name="RAM" quantum="2M"/> + <start name="clipboard" ram="2M"> <provides> <service name="ROM"/> <service name="Report"/> </provides> @@ -104,8 +98,7 @@ install_config { </route> </start> - <start name="wm" caps="1000"> - <resource name="RAM" quantum="32M"/> + <start name="wm" caps="1000" ram="32M"> <binary name="init"/> <provides> <service name="Gui"/> <service name="Report"/> <service name="ROM"/> @@ -119,8 +112,7 @@ install_config { </route> </start> - <start name="terminal" caps="110"> - <resource name="RAM" quantum="6M"/> + <start name="terminal" caps="110" ram="6M"> <provides><service name="Terminal"/></provides> <config copy="yes" paste="yes"> <initial width="800" height="600"/> @@ -141,8 +133,7 @@ install_config { </route> </start> - <start name="vfs" caps="120"> - <resource name="RAM" quantum="5M"/> + <start name="vfs" caps="120" ram="5M"> <provides><service name="File_system"/></provides> <config> <vfs> @@ -158,8 +149,7 @@ install_config { </config> </start> - <start name="vfs_rom"> - <resource name="RAM" quantum="5M"/> + <start name="vfs_rom" ram="5M"> <binary name="fs_rom"/> <provides> <service name="ROM"/> </provides> <config/> @@ -169,8 +159,7 @@ install_config { </route> </start> - <start name="/bin/vim" caps="150"> - <resource name="RAM" quantum="10M"/> + <start name="/bin/vim" caps="150" ram="10M"> <config> <libc stdin="/dev/terminal" stdout="/dev/terminal" stderr="/dev/terminal" rtc="/dev/rtc"/> diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run index 2a4388247b..e50037da7e 100644 --- a/repos/ports/run/virtualbox.run +++ b/repos/ports/run/virtualbox.run @@ -56,15 +56,13 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start>} append_if [expr $use_top] config { - <start name="top"> - <resource name="RAM" quantum="2M"/> + <start name="top" ram="2M"> <config period_ms="15000"/> <route> <service name="TRACE"> <parent label=""/> </service> @@ -73,9 +71,8 @@ append_if [expr $use_top] config { </start>} append config { - <start name="drivers" caps="1500" managing_system="yes" priority="-1"> + <start name="drivers" caps="1500" ram="64M" managing_system="yes" priority="-1"> <binary name="init"/> - <resource name="RAM" quantum="64M"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> <service name="Timer"> <child name="timer"/> </service> @@ -86,24 +83,21 @@ append config { </start> <start name="pc_rtc" priority="-1"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Rtc"/> </provides> </start>} append_if [expr $use_net] config { - <start name="nic" priority="-1"> + <start name="nic" priority="-1" ram="8M"> <binary name="pc_nic"/> - <resource name="RAM" quantum="8M"/> <route> <service name="Uplink"> <child name="nic_router"/> </service> <any-service> <parent/> <any-child /> </any-service> </route> </start> - <start name="nic_router" caps="120"> - <resource name="RAM" quantum="5M"/> + <start name="nic_router" caps="120" ram="5M"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -139,8 +133,7 @@ append_if [expr $use_net] config { </start> } append_if [expr $use_serial] config { - <start name="log_terminal" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="log_terminal" priority="-1" ram="2M"> <provides> <service name="Terminal"/> </provides> @@ -148,8 +141,7 @@ append_if [expr $use_serial] config { } append config { - <start name="report_rom" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" priority="-1" ram="2M"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config> <policy label="pointer -> hover" report="nitpicker -> hover"/> @@ -157,8 +149,7 @@ append config { </config> </start> - <start name="nitpicker" priority="-1"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" priority="-1" ram="4M"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -181,8 +172,7 @@ append config { </config> </start> - <start name="pointer" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="pointer" priority="-1" ram="2M"> <provides><service name="Report"/></provides> <config shapes="yes"/> <route> @@ -193,8 +183,7 @@ append config { </route> </start> - <start name="wm" caps="1000" priority="-1"> - <resource name="RAM" quantum="32M"/> + <start name="wm" caps="1000" priority="-1" ram="32M"> <binary name="init"/> <provides> <service name="Gui"/> <service name="Report"/> <service name="ROM"/> @@ -210,9 +199,8 @@ append config { </start>} append_if [expr $use_gui] config { - <start name="vbox2" priority="-2" caps="1200"> + <start name="vbox2" priority="-2" caps="1200" ram="448M"> <binary name="} $virtualbox_binary {"/> - <resource name="RAM" quantum="448M"/> <config vbox_file="test.vbox" vm_name="TestVM"> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> @@ -242,9 +230,8 @@ append_if [expr $use_gui] config { </start>} append config { - <start name="vbox1" priority="-2" caps="1200"> + <start name="vbox1" priority="-2" caps="1200" ram="448M"> <binary name="} $virtualbox_binary {"/> - <resource name="RAM" quantum="448M"/> <config vbox_file="test.vbox" vm_name="TestVM"> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"/> <vfs> diff --git a/repos/ports/run/virtualbox6.run b/repos/ports/run/virtualbox6.run index 88940eda6c..f7be2deec6 100644 --- a/repos/ports/run/virtualbox6.run +++ b/repos/ports/run/virtualbox6.run @@ -68,15 +68,13 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer" priority="0"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Timer"/> </provides> </start>} append_if [expr $use_top] config { - <start name="top" priority="0"> - <resource name="RAM" quantum="2M"/> + <start name="top" priority="0" ram="2M"> <config period_ms="15000"/> <route> <service name="TRACE"> <parent label=""/> </service> @@ -85,9 +83,8 @@ append_if [expr $use_top] config { </start>} append config { - <start name="drivers" caps="1500" managing_system="yes" priority="-1"> + <start name="drivers" caps="1500" ram="64M" managing_system="yes" priority="-1"> <binary name="init"/> - <resource name="RAM" quantum="64M"/> <route> <service name="ROM" label="config"> <parent label="drivers.config"/> </service> <service name="Timer"> <child name="timer"/> </service> @@ -98,15 +95,13 @@ append config { </start> <start name="pc_rtc" priority="-1"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Rtc"/> </provides> </start>} append_if [expr $use_net] config { - <start name="nic_router" caps="120" priority="-1"> - <resource name="RAM" quantum="5M"/> + <start name="nic_router" caps="120" ram="5M" priority="-1"> <provides> <service name="Nic"/> <service name="Uplink"/> @@ -134,9 +129,8 @@ append_if [expr $use_net] config { </config> </start> - <start name="nic" priority="-1"> + <start name="nic" ram="8M" priority="-1"> <binary name="pc_nic"/> - <resource name="RAM" quantum="8M"/> <route> <service name="Platform"> <child name="drivers"/> </service> <service name="Uplink"> <child name="nic_router"/> </service> @@ -145,16 +139,14 @@ append_if [expr $use_net] config { </start>} append_if [expr $use_serial] config { - <start name="log_terminal" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="log_terminal" ram="2M" priority="-1"> <provides> <service name="Terminal"/> </provides> </start>} append config { - <start name="report_rom" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="report_rom" ram="2M" priority="-1"> <provides> <service name="Report"/> <service name="ROM"/> </provides> <config> <policy label="pointer -> hover" report="nitpicker -> hover"/> @@ -163,8 +155,7 @@ append config { </config> </start> - <start name="nitpicker" priority="-1"> - <resource name="RAM" quantum="4M"/> + <start name="nitpicker" ram="4M" priority="-1"> <provides> <service name="Gui"/> <service name="Capture"/> <service name="Event"/> </provides> @@ -185,8 +176,7 @@ append config { </route> </start> - <start name="pointer" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="pointer" ram="2M" priority="-1"> <provides> <service name="Report"/> </provides> <config shapes="yes"/> <route> @@ -197,8 +187,7 @@ append config { </route> </start> - <start name="clipboard" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="clipboard" ram="2M" priority="-1"> <provides> <service name="ROM"/> <service name="Report"/> </provides> @@ -211,8 +200,7 @@ append config { </route> </start> - <start name="wm" caps="1000" priority="-1"> - <resource name="RAM" quantum="32M"/> + <start name="wm" caps="1000" ram="32M" priority="-1"> <binary name="init"/> <provides> <service name="Gui"/> <service name="Report"/> <service name="ROM"/> @@ -227,9 +215,8 @@ append config { </route> </start> - <start name="vbox1" priority="-2" caps="1800"> + <start name="vbox1" priority="-2" caps="1800" ram="3000M"> <binary name="virtualbox6"/> - <resource name="RAM" quantum="3000M"/> <config vbox_file="virtualbox6.vbox" vm_name="TestVM" ld_verbose="yes"> <libc stdout="/dev/log" stderr="/dev/log" pipe="/pipe" rtc="/dev/rtc"> <pthread placement="single-cpu"/> diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index 602e8392d5..f76838ce84 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -107,16 +107,14 @@ append config { <default-route> <any-service> <parent/> <any-child/> </any-service> </default-route> - <default caps="100"/> + <default caps="100" ram="1M"/> <start name="timer"> - <resource name="RAM" quantum="1M"/> <provides><service name="Timer"/></provides> </start> <start name="platform_reports"> <binary name="report_rom"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Report"/> <service name="ROM"/> @@ -127,16 +125,14 @@ append config { </config> </start> - <start name="acpi" caps="350"> - <resource name="RAM" quantum="4M"/> + <start name="acpi" caps="350" ram="4M"> <route> <service name="Report"> <child name="platform_reports"/> </service> <any-service> <parent/> <any-child/> </any-service> </route> </start> - <start name="pci_decode" caps="350"> - <resource name="RAM" quantum="2M"/> + <start name="pci_decode" caps="350" ram="2M"> <route> <service name="ROM" label="system"> <child name="platform_reports"/> </service> <service name="Report"> <child name="platform_reports"/> </service> @@ -144,8 +140,7 @@ append config { </route> </start> - <start name="platform" caps="400" managing_system="yes"> - <resource name="RAM" quantum="4M"/> + <start name="platform" caps="400" ram="4M" managing_system="yes"> <provides> <service name="Platform"/> </provides> @@ -164,8 +159,7 @@ append config { </route> </start> - <start name="ahci" priority="-1"> - <resource name="RAM" quantum="10M"/> + <start name="ahci" priority="-1" ram="10M"> <provides><service name="Block"/></provides> <config> <policy label_prefix="part_block" device="0" writeable="yes"/> @@ -173,7 +167,6 @@ append config { </start> <start name="ps2" priority="-1"> - <resource name="RAM" quantum="1M"/> <config/> <route> <service name="Event"> <child name="event_filter" label="ps2"/> </service> @@ -181,21 +174,18 @@ append config { </route> </start> - <start name="fb" priority="-1" caps="150"> + <start name="fb" priority="-1" caps="150" ram="32M"> <binary name="vesa_fb"/> - <resource name="RAM" quantum="32M"/> <config/> </start> <start name="pc_rtc" priority="-1"> - <resource name="RAM" quantum="1M"/> <provides> <service name="Rtc"/> </provides> </start> - <start name="part_block" priority="-1"> - <resource name="RAM" quantum="10M"/> + <start name="part_block" priority="-1" ram="10M"> <provides><service name="Block"/></provides> <route> <any-service><child name="ahci"/> <parent/><any-child/></any-service> @@ -210,9 +200,8 @@ append config { </start>} append_if [have_spec nova] config { - <start name="log_kernel"> + <start name="log_kernel" ram="10M"> <binary name="log_core"/> - <resource name="RAM" quantum="10M"/> <config period_ms="2000"/> <route> <service name="ROM" unscoped_label="log_core"> <parent/> </service> @@ -226,9 +215,8 @@ append_if [have_spec nova] config { </start>} append_if [expr $use_rumpfs] config { - <start name="rump_fs" priority="-1" caps="200"> + <start name="rump_fs" priority="-1" caps="200" ram="64M"> <binary name="vfs"/> - <resource name="RAM" quantum="64M"/> <provides><service name="File_system"/></provides> <config ld_verbose="yes"> <vfs> @@ -245,11 +233,9 @@ append_if [expr $use_rumpfs] config { </route> </start>} -append_if [expr $use_ram_fs] config { - <start name="ram_fs" priority="-1" caps="1800"> - <binary name="vfs"/>} append_if [expr $use_ram_fs] config " - <resource name=\"RAM\" quantum=\"[expr $use_vms * 8 * 128]M\"/>" + <start name=\"ram_fs\" priority=\"-1\" caps=\"1800\" ram=\"[expr $use_vms * 8 * 128]M\"> + <binary name=\"vfs\"/>" append_if [expr $use_ram_fs] config { <provides><service name="File_system"/></provides> <config> @@ -283,9 +269,8 @@ append_if [expr $use_ram_fs] config { </start>} append_if [expr $use_ram_fs && $use_overlay_from_disk] config { - <start name="overlay_from_disk" priority="-1"> + <start name="overlay_from_disk" priority="-1" ram="32M"> <binary name="fs_rom"/> - <resource name="RAM" quantum="32M"/> <provides><service name="ROM"/></provides> <route>} append_if [expr $use_rumpfs && $use_ram_fs && $use_overlay_from_disk] config { @@ -296,8 +281,7 @@ append_if [expr $use_ram_fs && $use_overlay_from_disk] config { </start>} append_if [expr $use_cpu_load] config { - <start name="trace_subject_reporter" priority="-1"> - <resource name="RAM" quantum="6M"/> + <start name="trace_subject_reporter" priority="-1" ram="6M"> <config period_ms="500"> <report activity="yes" affinity="yes"/> </config> @@ -310,8 +294,7 @@ append_if [expr $use_cpu_load] config { </route> </start> - <start name="cpu_load_display" priority="-1"> - <resource name="RAM" quantum="6M"/> + <start name="cpu_load_display" priority="-1" ram="6M"> <config/> <route> <service name="LOG"><parent/></service> @@ -322,8 +305,7 @@ append_if [expr $use_cpu_load] config { </route> </start> - <start name="top" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="top" priority="-1" ram="2M"> <config period_ms="10000"/> <route> <service name="TRACE"><parent label=""/></service> @@ -335,9 +317,8 @@ append_if [expr $use_cpu_load] config { </start>} append_if [expr $use_usb] config { - <start name="usb" caps="200"> + <start name="usb" caps="200" ram="20M"> <binary name="pc_usb_host"/> - <resource name="RAM" quantum="20M"/> <provides> <service name="Usb"/> </provides> <route> <service name="Report"> <child name="report_rom"/> </service> @@ -370,8 +351,7 @@ append_if [expr $use_usb] config { </config> </start> - <start name="usb_hid" priority="-1" caps="140"> - <resource name="RAM" quantum="11M"/> + <start name="usb_hid" priority="-1" caps="140" ram="11M"> <route> <service name="Report"> <child name="report_rom"/> </service> <service name="Event"> <child name="event_filter" label="usb_hid"/> </service> @@ -382,17 +362,15 @@ append_if [expr $use_usb] config { </start>} append_if [expr !$use_usb] config { - <start name="usb" caps="200"> + <start name="usb" caps="200" ram="1M"> <binary name="black_hole"/> - <resource name="RAM" quantum="1M"/> <provides> <service name="Usb"/> </provides> <config> <usb/> </config> </start> } append_if [expr $use_serial] config { - <start name="log_terminal" priority="-1"> - <resource name="RAM" quantum="2M"/> + <start name="log_terminal" priority="-1" ram="2M"> <provides> <service name="Terminal"/> </provides>