From 5566aa0f94c606c059ab8f3623afdae67066f442 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Tue, 20 Jun 2017 12:30:19 +0200 Subject: [PATCH] bomb test: consider preserved PD session quota This is an adaptation to the commit "core: prevent transfer of static PD session quota". --- repos/os/src/test/bomb/main.cc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/repos/os/src/test/bomb/main.cc b/repos/os/src/test/bomb/main.cc index f92d772578..8f35e377c5 100644 --- a/repos/os/src/test/bomb/main.cc +++ b/repos/os/src/test/bomb/main.cc @@ -173,8 +173,15 @@ struct Bomb void construct_children() { - unsigned long avail_ram = env.ram().avail_ram().value; - Ram_quota const ram_amount { (avail_ram - ram_demand) / children }; + size_t const preserved_ram = Pd_connection::RAM_QUOTA; + size_t const avail_ram = env.ram().avail_ram().value; + + if (avail_ram < preserved_ram + ram_demand) { + error("RAM demand exceeds available RAM"); + return; + } + + Ram_quota const ram_amount { (avail_ram - preserved_ram - ram_demand) / children }; if (ram_amount.value < (ram_demand * children)) { log("I'm a leaf node - generation ", generation, @@ -183,7 +190,7 @@ struct Bomb } size_t const avail_caps = env.pd().avail_caps().value; - size_t const preserved_caps = children*10; + size_t const preserved_caps = children*30; if (avail_caps < preserved_caps) { log("I ran out of capabilities.");