From 4952b37e4cb24c4063708af36a144c1ba832dd4f Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 24 Jul 2019 11:38:05 +0200 Subject: [PATCH] Core: exit with child exit value Effective for base-linux only. --- repos/base-fiasco/src/core/include/platform.h | 2 +- repos/base-fiasco/src/core/platform.cc | 2 +- repos/base-foc/src/core/include/platform.h | 2 +- repos/base-foc/src/core/platform.cc | 2 +- repos/base-hw/src/core/platform.h | 2 +- repos/base-linux/src/core/include/platform.h | 4 +++- repos/base-linux/src/core/platform.cc | 6 +++-- repos/base-nova/src/core/include/platform.h | 2 +- repos/base-nova/src/core/platform.cc | 2 +- repos/base-okl4/src/core/include/platform.h | 2 +- repos/base-okl4/src/core/platform.cc | 2 +- .../src/core/include/platform.h | 2 +- repos/base-pistachio/src/core/platform.cc | 2 +- repos/base-sel4/src/core/include/platform.h | 2 +- repos/base-sel4/src/core/platform.cc | 2 +- .../base/src/core/include/platform_generic.h | 7 +++++- repos/base/src/core/main.cc | 23 +++++++++++++++---- 17 files changed, 44 insertions(+), 22 deletions(-) diff --git a/repos/base-fiasco/src/core/include/platform.h b/repos/base-fiasco/src/core/include/platform.h index 17e2b3f6a..3ca52b785 100644 --- a/repos/base-fiasco/src/core/include/platform.h +++ b/repos/base-fiasco/src/core/include/platform.h @@ -167,7 +167,7 @@ namespace Genode { size_t max_caps() const override { return Capability_space::max_caps(); } - void wait_for_exit() override; + void wait_for_exit(int const &) override; }; } diff --git a/repos/base-fiasco/src/core/platform.cc b/repos/base-fiasco/src/core/platform.cc index 7b6af01ae..af1540bf9 100644 --- a/repos/base-fiasco/src/core/platform.cc +++ b/repos/base-fiasco/src/core/platform.cc @@ -483,7 +483,7 @@ Platform::Platform() : ** Generic platform interface ** ********************************/ -void Platform::wait_for_exit() +void Platform::wait_for_exit(int const &) { /* * On Fiasco, Core never exits. So let us sleep forever. diff --git a/repos/base-foc/src/core/include/platform.h b/repos/base-foc/src/core/include/platform.h index 93ab31e30..8aa66f1af 100644 --- a/repos/base-foc/src/core/include/platform.h +++ b/repos/base-foc/src/core/include/platform.h @@ -183,7 +183,7 @@ namespace Genode { Cap_id_allocator &cap_id_alloc() { return _cap_id_alloc; } - void wait_for_exit() override; + void wait_for_exit(int const &) override; }; } diff --git a/repos/base-foc/src/core/platform.cc b/repos/base-foc/src/core/platform.cc index e8641b481..c34092d42 100644 --- a/repos/base-foc/src/core/platform.cc +++ b/repos/base-foc/src/core/platform.cc @@ -582,7 +582,7 @@ Platform::Platform() : ** Generic platform interface ** ********************************/ -void Platform::wait_for_exit() +void Platform::wait_for_exit(int const &) { /* * On Fiasco, Core never exits. So let us sleep forever. diff --git a/repos/base-hw/src/core/platform.h b/repos/base-hw/src/core/platform.h index 4a8288f93..b299bdae3 100644 --- a/repos/base-hw/src/core/platform.h +++ b/repos/base-hw/src/core/platform.h @@ -128,7 +128,7 @@ class Genode::Platform : public Genode::Platform_generic size_t vm_size() const override { return Hw::Mm::user().size; } Rom_fs &rom_fs() override { return _rom_fs; } - void wait_for_exit() override { + void wait_for_exit(int const &) override { while (1) { Kernel::stop_thread(); } }; bool supports_direct_unmap() const override { return true; } diff --git a/repos/base-linux/src/core/include/platform.h b/repos/base-linux/src/core/include/platform.h index e952ade6e..49f71dd0c 100644 --- a/repos/base-linux/src/core/include/platform.h +++ b/repos/base-linux/src/core/include/platform.h @@ -129,7 +129,9 @@ namespace Genode { */ size_t max_caps() const override { return 10000; } - void wait_for_exit() override; + void wait_for_exit(int const &) override; + + void child_exit() override; }; } diff --git a/repos/base-linux/src/core/platform.cc b/repos/base-linux/src/core/platform.cc index ea8fe69d6..1d4332226 100644 --- a/repos/base-linux/src/core/platform.cc +++ b/repos/base-linux/src/core/platform.cc @@ -113,7 +113,7 @@ Platform::Platform() } -void Platform::wait_for_exit() +void Platform::wait_for_exit(int const &exit_value) { for (;;) { @@ -145,9 +145,11 @@ void Platform::wait_for_exit() Platform_thread::submit_exception(pid); } } - lx_exit_group(0); + lx_exit_group(exit_value); } +void Platform::child_exit() { sigint_handler(0); } + /***************************** ** Support for IPC library ** diff --git a/repos/base-nova/src/core/include/platform.h b/repos/base-nova/src/core/include/platform.h index 30c92693c..b63e29e64 100644 --- a/repos/base-nova/src/core/include/platform.h +++ b/repos/base-nova/src/core/include/platform.h @@ -82,7 +82,7 @@ namespace Genode { size_t vm_size() const override { return _vm_size; } Rom_fs &rom_fs() override { return _rom_fs; } size_t max_caps() const override { return _max_caps; } - void wait_for_exit() override; + void wait_for_exit(int const &) override; bool supports_direct_unmap() const override { return true; } diff --git a/repos/base-nova/src/core/platform.cc b/repos/base-nova/src/core/platform.cc index bb8e51635..7c708d374 100644 --- a/repos/base-nova/src/core/platform.cc +++ b/repos/base-nova/src/core/platform.cc @@ -993,5 +993,5 @@ bool Mapped_mem_allocator::_unmap_local(addr_t virt_addr, addr_t, unsigned size) ** Generic platform interface ** ********************************/ -void Platform::wait_for_exit() { sleep_forever(); } +void Platform::wait_for_exit(int const &) { sleep_forever(); } diff --git a/repos/base-okl4/src/core/include/platform.h b/repos/base-okl4/src/core/include/platform.h index 2c61bb262..6d0093495 100644 --- a/repos/base-okl4/src/core/include/platform.h +++ b/repos/base-okl4/src/core/include/platform.h @@ -139,7 +139,7 @@ namespace Genode { Rom_fs &rom_fs() override { return _rom_fs; } size_t max_caps() const override { return Capability_space::max_caps(); } - void wait_for_exit() override; + void wait_for_exit(int const &) override; bool supports_direct_unmap() const override { return true; } diff --git a/repos/base-okl4/src/core/platform.cc b/repos/base-okl4/src/core/platform.cc index e9194d00d..e7f62ec74 100644 --- a/repos/base-okl4/src/core/platform.cc +++ b/repos/base-okl4/src/core/platform.cc @@ -215,7 +215,7 @@ Platform::Platform() ** Generic platform interface ** ********************************/ -void Platform::wait_for_exit() +void Platform::wait_for_exit(int const &) { /* * On OKL4, core never exits. So let us sleep forever. diff --git a/repos/base-pistachio/src/core/include/platform.h b/repos/base-pistachio/src/core/include/platform.h index 1edd4c9b1..defac7698 100644 --- a/repos/base-pistachio/src/core/include/platform.h +++ b/repos/base-pistachio/src/core/include/platform.h @@ -153,7 +153,7 @@ namespace Genode { Rom_fs &rom_fs() override { return _rom_fs; } size_t max_caps() const override { return Capability_space::max_caps(); } - void wait_for_exit() override; + void wait_for_exit(int const &) override; Affinity::Space affinity_space() const override { diff --git a/repos/base-pistachio/src/core/platform.cc b/repos/base-pistachio/src/core/platform.cc index d37b17cbb..b07b3bbee 100644 --- a/repos/base-pistachio/src/core/platform.cc +++ b/repos/base-pistachio/src/core/platform.cc @@ -640,7 +640,7 @@ Platform::Platform() ** Generic platform interface ** ********************************/ -void Platform::wait_for_exit() +void Platform::wait_for_exit(int const &) { /* * On Pistachio, core never exits. So let us sleep forever. diff --git a/repos/base-sel4/src/core/include/platform.h b/repos/base-sel4/src/core/include/platform.h index acd250f26..2ab62200c 100644 --- a/repos/base-sel4/src/core/include/platform.h +++ b/repos/base-sel4/src/core/include/platform.h @@ -274,7 +274,7 @@ class Genode::Platform : public Platform_generic Cap_sel asid_pool() const { return _asid_pool_sel; } - void wait_for_exit() override; + void wait_for_exit(int const &) override; /** * Determine size of a core local mapping required for a diff --git a/repos/base-sel4/src/core/platform.cc b/repos/base-sel4/src/core/platform.cc index 1d9a07498..d99809a27 100644 --- a/repos/base-sel4/src/core/platform.cc +++ b/repos/base-sel4/src/core/platform.cc @@ -661,7 +661,7 @@ void Platform::reset_sel(unsigned sel) } -void Platform::wait_for_exit() +void Platform::wait_for_exit(int const &) { sleep_forever(); } diff --git a/repos/base/src/core/include/platform_generic.h b/repos/base/src/core/include/platform_generic.h index c394c83a7..d98f04e35 100644 --- a/repos/base/src/core/include/platform_generic.h +++ b/repos/base/src/core/include/platform_generic.h @@ -77,7 +77,12 @@ namespace Genode { /** * Wait for exit condition */ - virtual void wait_for_exit() = 0; + virtual void wait_for_exit(int const &exit_value) = 0; + + /** + * Handle exit of child + */ + virtual void child_exit() { }; /** * Return true if platform supports direct unmap (no mapping db) diff --git a/repos/base/src/core/main.cc b/repos/base/src/core/main.cc index d8b2805c0..d7b405db3 100644 --- a/repos/base/src/core/main.cc +++ b/repos/base/src/core/main.cc @@ -119,6 +119,8 @@ class Core_child : public Child_policy Child _child; + int &_exit_value; + public: /** @@ -128,14 +130,16 @@ class Core_child : public Child_policy Pd_session &core_pd, Capability core_pd_cap, Cpu_session &core_cpu, Capability core_cpu_cap, Cap_quota cap_quota, Ram_quota ram_quota, - Rpc_entrypoint &ep) + Rpc_entrypoint &ep, + int &exit_value) : _services(services), _core_pd_cap (core_pd_cap), _core_pd (core_pd), _core_cpu_cap(core_cpu_cap), _core_cpu(core_cpu), _cap_quota(Child::effective_quota(cap_quota)), _ram_quota(Child::effective_quota(ram_quota)), - _child(local_rm, ep, *this) + _child(local_rm, ep, *this), + _exit_value(exit_value) { } @@ -174,6 +178,13 @@ class Core_child : public Child_policy _core_cpu.transfer_quota(cap, Cpu_session::quota_lim_upscale(100, 100)); } + void exit(int exit_value) override + { + _exit_value = exit_value; + Child_policy::exit(exit_value); + platform().child_exit(); + } + Pd_session &ref_pd() override { return _core_pd; } Pd_session_capability ref_pd_cap() const override { return _core_pd_cap; } @@ -221,6 +232,8 @@ namespace Genode { int main() { + static int exit_value { 0 }; + /** * Disable tracing within core because it is currently not fully implemented. */ @@ -309,10 +322,10 @@ int main() static Reconstructible init(services, local_rm, core_pd, core_pd_cap, core_cpu, core_cpu_cap, - init_cap_quota, init_ram_quota, ep); + init_cap_quota, init_ram_quota, ep, exit_value); - platform().wait_for_exit(); + platform().wait_for_exit(exit_value); init.destruct(); - return 0; + return exit_value; }