ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-25 00:11:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

core: support upgrades of init's Env:: sessions

Browse Source
This commit is contained in:
Norman Feske 2013-01-30 17:00:00 +01:00
parent 62bb85255a
commit 9acad80f37
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
base/src/core/main.cc
View File

@ -110,9 +110,9 @@ class Core_child : public Child_policy
Rpc_entrypoint _entrypoint; Rpc_entrypoint _entrypoint;
enum { STACK_SIZE = 8*1024 }; enum { STACK_SIZE = 8*1024 };
Child _child; Service_registry &_local_services;
Service_registry *_local_services; Child _child;
public: public:
@ -121,11 +121,14 @@ class Core_child : public Child_policy
*/ */
Core_child(Dataspace_capability elf_ds, Cap_session *cap_session, Core_child(Dataspace_capability elf_ds, Cap_session *cap_session,
Ram_session_capability ram, Cpu_session_capability cpu, Ram_session_capability ram, Cpu_session_capability cpu,
Rm_session_capability rm, Service_registry *services) Rm_session_capability rm, Service_registry &services)
: :
_entrypoint(cap_session, STACK_SIZE, "init", false), _entrypoint(cap_session, STACK_SIZE, "init", false),
_child(elf_ds, ram, cpu, rm, &_entrypoint, this), _local_services(services),
_local_services(services) _child(elf_ds, ram, cpu, rm, &_entrypoint, this,
*_local_services.find(Ram_session::service_name()),
*_local_services.find(Cpu_session::service_name()),
*_local_services.find(Rm_session::service_name()))
{ {
_entrypoint.activate(); _entrypoint.activate();
} }
@ -139,7 +142,7 @@ class Core_child : public Child_policy
Service *resolve_session_request(const char *service, const char *) Service *resolve_session_request(const char *service, const char *)
{ {
return _local_services->find(service); return _local_services.find(service);
} }
}; };
@ -229,7 +232,7 @@ int main()
Core_child *init = new (env()->heap()) Core_child *init = new (env()->heap())
Core_child(Rom_session_client(init_rom_session_cap).dataspace(), Core_child(Rom_session_client(init_rom_session_cap).dataspace(),
core_env()->cap_session(), init_ram_session_cap, core_env()->cap_session(), init_ram_session_cap,
init_cpu.cap(), init_rm.cap(), &local_services); init_cpu.cap(), init_rm.cap(), local_services);
PDBG("--- init created, waiting for exit condition ---"); PDBG("--- init created, waiting for exit condition ---");
platform()->wait_for_exit(); platform()->wait_for_exit();