ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-11 13:35:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sandbox: don't use Xml_node as return value

Browse Source 
Issue #5411
This commit is contained in:
Norman Feske 2025-01-15 16:05:52 +01:00 committed by Christian Helmuth
parent 33446be8ac
commit 2407968242
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
repos/os/src/lib/sandbox/child.h
View File

@ -50,8 +50,22 @@ class Sandbox::Child : Child_policy, Routed_service::Wakeup
*/
struct Id { unsigned value; };
struct Default_route_accessor : Interface { virtual Xml_node default_route() = 0; };
struct Default_caps_accessor : Interface { virtual Cap_quota default_caps() = 0; };
using With_xml = Callable<void, Xml_node const &>;
struct Default_route_accessor : Interface
{
virtual void _with_default_route(With_xml::Ft const &) = 0;
void with_default_route(auto const &fn)
{
_with_default_route(With_xml::Fn { fn });
}
};
struct Default_caps_accessor : Interface
{
virtual Cap_quota default_caps() = 0;
};
template <typename QUOTA>
struct Resource_limit_accessor : Interface
@ -140,8 +154,10 @@ class Sandbox::Child : Child_policy, Routed_service::Wakeup
start.with_sub_node("route",
[&] (Xml_node const &route) {
_route_model.construct(_alloc, route); },
[&] () {
_route_model.construct(_alloc, _default_route_accessor.default_route()); });
[&] {
_default_route_accessor.with_default_route([&] (Xml_node const &node) {
_route_model.construct(_alloc, node); });
});
}
/*

6
repos/os/src/lib/sandbox/library.cc
View File

@ -189,10 +189,10 @@ struct Genode::Sandbox::Library : ::Sandbox::State_reporter::Producer,
/**
* Default_route_accessor interface
*/
Xml_node default_route() override
void _with_default_route(Child::With_xml::Ft const &fn) override
{
return _default_route.constructed() ? _default_route->xml()
: Xml_node("<empty/>");
if (_default_route.constructed())
fn(_default_route->xml());
}
/**