From f4d323103452cdd3a0f16cb58358938179a2e28c Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Thu, 16 Jul 2020 16:51:26 +0200 Subject: [PATCH] cpu_sampler: handle all quota upgrades Beforehand cap_quota upgrades got ignored which leads to non working clients. Issue #3826 --- repos/gems/src/server/cpu_sampler/cpu_root.h | 3 +-- repos/gems/src/server/cpu_sampler/cpu_session_component.cc | 5 ++--- repos/gems/src/server/cpu_sampler/cpu_session_component.h | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/repos/gems/src/server/cpu_sampler/cpu_root.h b/repos/gems/src/server/cpu_sampler/cpu_root.h index 318b2de42b..979cb0f68b 100644 --- a/repos/gems/src/server/cpu_sampler/cpu_root.h +++ b/repos/gems/src/server/cpu_sampler/cpu_root.h @@ -51,8 +51,7 @@ class Cpu_sampler::Cpu_root : public Root_component void _upgrade_session(Cpu_session_component *cpu, const char *args) override { - size_t ram_quota = Arg_string::find_arg(args, "ram_quota").ulong_value(0); - cpu->upgrade_ram_quota(ram_quota); + cpu->upgrade_quota(args); } public: diff --git a/repos/gems/src/server/cpu_sampler/cpu_session_component.cc b/repos/gems/src/server/cpu_sampler/cpu_session_component.cc index cc73490cd0..2f93ac88cb 100644 --- a/repos/gems/src/server/cpu_sampler/cpu_session_component.cc +++ b/repos/gems/src/server/cpu_sampler/cpu_session_component.cc @@ -109,10 +109,9 @@ Cpu_session_component(Rpc_entrypoint &thread_ep, { } -void Cpu_sampler::Cpu_session_component::upgrade_ram_quota(size_t ram_quota) +void Cpu_sampler::Cpu_session_component::upgrade_quota(char const * args) { - String<64> const args("ram_quota=", ram_quota); - _env.upgrade(_id_space_element.id(), args.string()); + _env.upgrade(_id_space_element.id(), args); } diff --git a/repos/gems/src/server/cpu_sampler/cpu_session_component.h b/repos/gems/src/server/cpu_sampler/cpu_session_component.h index adb77ae128..918f7c4889 100644 --- a/repos/gems/src/server/cpu_sampler/cpu_session_component.h +++ b/repos/gems/src/server/cpu_sampler/cpu_session_component.h @@ -90,7 +90,7 @@ class Cpu_sampler::Cpu_session_component : public Rpc_object */ ~Cpu_session_component(); - void upgrade_ram_quota(size_t ram_quota); + void upgrade_quota(char const *); /***************************