ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-18 10:46:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

launchpad: distinguish unique name from elf name

Browse Source 
This patch re-enables the launchpad to start multiple instances of the
same program. Without it, launchpad wrongly requests the binary ROM with
the child's unique name as label. The lookup of the first instance
solely succeeds because the unique name equals the binary name.
This commit is contained in:
Norman Feske 2017-01-18 09:29:52 +01:00
parent 3a6d5b9d1a
commit 94d991277f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
repos/demo/include/launchpad/launchpad.h
View File

@ -47,6 +47,8 @@ class Launchpad_child : public Genode::Child_policy,
Name const _name; Name const _name;
Binary_name const _elf_name;
Genode::Env &_env; Genode::Env &_env;
Genode::Ram_session_capability _ref_ram_cap; Genode::Ram_session_capability _ref_ram_cap;
@ -87,13 +89,13 @@ class Launchpad_child : public Genode::Child_policy,
Launchpad_child(Genode::Env &env, Launchpad_child(Genode::Env &env,
Genode::Session_label const &label, Genode::Session_label const &label,
Name const &elf_name, Binary_name const &elf_name,
Genode::size_t ram_quota, Genode::size_t ram_quota,
Parent_services &parent_services, Parent_services &parent_services,
Child_services &child_services, Child_services &child_services,
Genode::Dataspace_capability config_ds) Genode::Dataspace_capability config_ds)
: :
_name(label), _name(label), _elf_name(elf_name),
_env(env), _ref_ram_cap(env.ram_session_cap()), _ram_quota(ram_quota), _env(env), _ref_ram_cap(env.ram_session_cap()), _ram_quota(ram_quota),
_parent_services(parent_services), _parent_services(parent_services),
_child_services(child_services), _child_services(child_services),
@ -120,6 +122,8 @@ class Launchpad_child : public Genode::Child_policy,
Name name() const override { return _name; } Name name() const override { return _name; }
Binary_name binary_name() const override { return _elf_name; }
Genode::Ram_session &ref_ram() override { return _ref_ram; } Genode::Ram_session &ref_ram() override { return _ref_ram; }
Genode::Ram_session_capability ref_ram_cap() const override { return _ref_ram_cap; } Genode::Ram_session_capability ref_ram_cap() const override { return _ref_ram_cap; }