From 227b539193ac40846da94a6181e2bfceccda1142 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Wed, 2 Dec 2015 12:14:31 +0100 Subject: [PATCH] cpu_quota x86_64: fix RAM quota and stack size The test threads previously used a stack size independent from the machine word width. Qemu was previously configured to provide 64Mb of RAM which isn't sufficient for x86_64. Ref #1805 --- repos/base-hw/src/test/cpu_quota/main.cc | 2 +- repos/os/run/cpu_quota.run | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repos/base-hw/src/test/cpu_quota/main.cc b/repos/base-hw/src/test/cpu_quota/main.cc index 473a97011..5b15034aa 100644 --- a/repos/base-hw/src/test/cpu_quota/main.cc +++ b/repos/base-hw/src/test/cpu_quota/main.cc @@ -73,7 +73,7 @@ class Sync::Signal } }; -class Counter : private Thread<8 * 1024> +class Counter : private Thread<2 * 1024 * sizeof(Genode::addr_t)> { private: diff --git a/repos/os/run/cpu_quota.run b/repos/os/run/cpu_quota.run index 4e77ca490..404098821 100644 --- a/repos/os/run/cpu_quota.run +++ b/repos/os/run/cpu_quota.run @@ -128,7 +128,7 @@ build_boot_image "core init timer test-cpu_quota test-sync" # Execution # -append qemu_args "-nographic -m 64" +append qemu_args "-nographic -m 128" run_genode_until ".*done.*\n.*done.*\n.*done.*\n" 100