From c629a92aa22e1de0ca2deb93586a952fccc0d396 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Wed, 30 Jan 2019 17:14:33 +0100 Subject: [PATCH] base: init_env_ram_session -> init_env_pd_session The notion of a RAM session does not exist anymore. Hence, we have to adjust the name of 'init_env_ram_session'. Since this change modifies the ABI, it comes as separate commit. Issue #2407 --- repos/base/include/base/child.h | 4 ++-- repos/base/lib/symbols/ld | 2 +- repos/base/src/lib/base/child.cc | 4 ++-- repos/os/src/init/child.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/repos/base/include/base/child.h b/repos/base/include/base/child.h index 1dad8a125..a78ca2a9a 100644 --- a/repos/base/include/base/child.h +++ b/repos/base/include/base/child.h @@ -701,9 +701,9 @@ class Genode::Child : protected Rpc_object, bool active() const { return _process.constructed(); } /** - * Initialize the child's RAM session + * Initialize the child's PD session */ - void initiate_env_ram_session(); + void initiate_env_pd_session(); /** * Trigger the routing and creation of the child's environment session diff --git a/repos/base/lib/symbols/ld b/repos/base/lib/symbols/ld index ca11a0c1a..70d126772 100644 --- a/repos/base/lib/symbols/ld +++ b/repos/base/lib/symbols/ld @@ -255,7 +255,7 @@ _ZN6Genode5Child18close_all_sessionsEv T _ZN6Genode5Child19deliver_session_capENS_8Id_spaceINS_6Parent6ServerEE2IdENS_10CapabilityINS_7SessionEEE T _ZN6Genode5Child19resource_avail_sighENS_10CapabilityINS_14Signal_contextEEE T _ZN6Genode5Child21initiate_env_sessionsEv T -_ZN6Genode5Child24initiate_env_ram_sessionEv T +_ZN6Genode5Child23initiate_env_pd_sessionEv T _ZN6Genode5Child4exitEi T _ZN6Genode5Child5closeENS_8Id_spaceINS_6Parent6ClientEE2IdE T _ZN6Genode5Child5yieldERKNS_6StringILm160EEE T diff --git a/repos/base/src/lib/base/child.cc b/repos/base/src/lib/base/child.cc index 96341e704..fb594691c 100644 --- a/repos/base/src/lib/base/child.cc +++ b/repos/base/src/lib/base/child.cc @@ -835,7 +835,7 @@ void Child::_discard_env_session(Id_space::Id id) } -void Child::initiate_env_ram_session() +void Child::initiate_env_pd_session() { _pd.initiate(); _policy.init(_pd.session(), _pd.cap()); @@ -965,7 +965,7 @@ Child::Child(Region_map &local_rm, _policy(policy), _local_rm(local_rm), _parent_cap_guard(entrypoint, *this) { if (_policy.initiate_env_sessions()) { - initiate_env_ram_session(); + initiate_env_pd_session(); initiate_env_sessions(); } } diff --git a/repos/os/src/init/child.h b/repos/os/src/init/child.h index 895d71065..e98f5625e 100644 --- a/repos/os/src/init/child.h +++ b/repos/os/src/init/child.h @@ -494,7 +494,7 @@ class Init::Child : Child_policy, Routed_service::Wakeup void initiate_env_pd_session() { if (_state == STATE_INITIAL) { - _child.initiate_env_ram_session(); + _child.initiate_env_pd_session(); _state = STATE_RAM_INITIALIZED; } }