parent
d37f32fb21
commit
8bc4389411
|
@ -60,6 +60,7 @@ class Genode::Core_env : public Env_deprecated
|
||||||
_entrypoint(nullptr, ENTRYPOINT_STACK_SIZE, "entrypoint"),
|
_entrypoint(nullptr, ENTRYPOINT_STACK_SIZE, "entrypoint"),
|
||||||
_region_map(_entrypoint),
|
_region_map(_entrypoint),
|
||||||
_pd_session(_entrypoint,
|
_pd_session(_entrypoint,
|
||||||
|
_entrypoint,
|
||||||
Session::Resources {
|
Session::Resources {
|
||||||
Ram_quota { platform()->ram_alloc()->avail() },
|
Ram_quota { platform()->ram_alloc()->avail() },
|
||||||
Cap_quota { platform()->max_caps() } },
|
Cap_quota { platform()->max_caps() } },
|
||||||
|
|
|
@ -30,6 +30,7 @@ class Genode::Pd_root : public Genode::Root_component<Genode::Pd_session_compone
|
||||||
private:
|
private:
|
||||||
|
|
||||||
Rpc_entrypoint &_ep;
|
Rpc_entrypoint &_ep;
|
||||||
|
Rpc_entrypoint &_signal_ep;
|
||||||
Pager_entrypoint &_pager_ep;
|
Pager_entrypoint &_pager_ep;
|
||||||
Range_allocator &_phys_alloc;
|
Range_allocator &_phys_alloc;
|
||||||
Region_map &_local_rm;
|
Region_map &_local_rm;
|
||||||
|
@ -62,6 +63,7 @@ class Genode::Pd_root : public Genode::Root_component<Genode::Pd_session_compone
|
||||||
{
|
{
|
||||||
return new (md_alloc())
|
return new (md_alloc())
|
||||||
Pd_session_component(_ep,
|
Pd_session_component(_ep,
|
||||||
|
_signal_ep,
|
||||||
session_resources_from_args(args),
|
session_resources_from_args(args),
|
||||||
session_label_from_args(args),
|
session_label_from_args(args),
|
||||||
session_diag_from_args(args),
|
session_diag_from_args(args),
|
||||||
|
@ -84,6 +86,7 @@ class Genode::Pd_root : public Genode::Root_component<Genode::Pd_session_compone
|
||||||
* Constructor
|
* Constructor
|
||||||
*/
|
*/
|
||||||
Pd_root(Rpc_entrypoint &ep,
|
Pd_root(Rpc_entrypoint &ep,
|
||||||
|
Rpc_entrypoint &signal_ep,
|
||||||
Pager_entrypoint &pager_ep,
|
Pager_entrypoint &pager_ep,
|
||||||
Range_allocator &phys_alloc,
|
Range_allocator &phys_alloc,
|
||||||
Region_map &local_rm,
|
Region_map &local_rm,
|
||||||
|
@ -91,8 +94,8 @@ class Genode::Pd_root : public Genode::Root_component<Genode::Pd_session_compone
|
||||||
Range_allocator &core_mem)
|
Range_allocator &core_mem)
|
||||||
:
|
:
|
||||||
Root_component<Pd_session_component>(&ep, &md_alloc),
|
Root_component<Pd_session_component>(&ep, &md_alloc),
|
||||||
_ep(ep), _pager_ep(pager_ep), _phys_alloc(phys_alloc),
|
_ep(ep), _signal_ep(signal_ep), _pager_ep(pager_ep),
|
||||||
_local_rm(local_rm), _core_mem(core_mem)
|
_phys_alloc(phys_alloc), _local_rm(local_rm), _core_mem(core_mem)
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -116,6 +116,7 @@ class Genode::Pd_session_component : public Session_object<Pd_session>
|
||||||
* Constructor
|
* Constructor
|
||||||
*/
|
*/
|
||||||
Pd_session_component(Rpc_entrypoint &ep,
|
Pd_session_component(Rpc_entrypoint &ep,
|
||||||
|
Rpc_entrypoint &signal_ep,
|
||||||
Resources resources,
|
Resources resources,
|
||||||
Label const &label,
|
Label const &label,
|
||||||
Diag diag,
|
Diag diag,
|
||||||
|
@ -132,7 +133,7 @@ class Genode::Pd_session_component : public Session_object<Pd_session>
|
||||||
_constrained_md_ram_alloc(*this, *this, *this),
|
_constrained_md_ram_alloc(*this, *this, *this),
|
||||||
_constrained_core_ram_alloc(*this, *this, core_mem),
|
_constrained_core_ram_alloc(*this, *this, core_mem),
|
||||||
_sliced_heap(_constrained_md_ram_alloc, local_rm),
|
_sliced_heap(_constrained_md_ram_alloc, local_rm),
|
||||||
_signal_broker(_sliced_heap, ep, ep),
|
_signal_broker(_sliced_heap, signal_ep, signal_ep),
|
||||||
_ram_ds_factory(ep, phys_alloc, phys_range, local_rm,
|
_ram_ds_factory(ep, phys_alloc, phys_range, local_rm,
|
||||||
_constrained_core_ram_alloc),
|
_constrained_core_ram_alloc),
|
||||||
_rpc_cap_factory(_sliced_heap),
|
_rpc_cap_factory(_sliced_heap),
|
||||||
|
|
|
@ -256,7 +256,7 @@ int main()
|
||||||
static Rm_root rm_root (&ep, &sliced_heap, pager_ep);
|
static Rm_root rm_root (&ep, &sliced_heap, pager_ep);
|
||||||
static Cpu_root cpu_root (&ep, &ep, &pager_ep, &sliced_heap,
|
static Cpu_root cpu_root (&ep, &ep, &pager_ep, &sliced_heap,
|
||||||
Trace::sources());
|
Trace::sources());
|
||||||
static Pd_root pd_root (ep, pager_ep, *platform()->ram_alloc(),
|
static Pd_root pd_root (ep, ep, pager_ep, *platform()->ram_alloc(),
|
||||||
local_rm, sliced_heap,
|
local_rm, sliced_heap,
|
||||||
*platform_specific()->core_mem_alloc());
|
*platform_specific()->core_mem_alloc());
|
||||||
static Log_root log_root (&ep, &sliced_heap);
|
static Log_root log_root (&ep, &sliced_heap);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user