ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-21 08:29:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

os/session_policy.h: avoid use of Xml_node assign

Browse Source 
Issue #5411
This commit is contained in:
Norman Feske
2025-01-07 11:29:45 +01:00
committed by Christian Helmuth
parent fe40a3c45e
commit c0c6f3f660
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
repos/os/include/os/session_policy.h
View File

@ -17,6 +17,7 @@
#include <base/session_label.h> #include <base/session_label.h>
#include <base/log.h> #include <base/log.h>
#include <session/session.h> #include <session/session.h>
#include <util/reconstructible.h>
#include <util/arg_string.h> #include <util/arg_string.h>
#include <util/xml_node.h> #include <util/xml_node.h>
@ -57,7 +58,7 @@ struct Genode::Xml_node_label_score
Xml_node_label_score() { } Xml_node_label_score() { }
template <size_t N> template <size_t N>
Xml_node_label_score(Xml_node node, String<N> const &label) Xml_node_label_score(Xml_node const &node, String<N> const &label)
: :
label_present (node.has_attribute("label")), label_present (node.has_attribute("label")),
prefix_present(node.has_attribute("label_prefix")), prefix_present(node.has_attribute("label_prefix")),
@ -178,28 +179,31 @@ void Genode::with_matching_policy(String<N> const &label,
/* /*
* Find policy node that matches best * Find policy node that matches best
*/ */
Xml_node best_match("<none/>"); Constructible<Xml_node> best_match { };
Xml_node_label_score best_score; Xml_node_label_score best_score;
policies.for_each_sub_node("policy", [&] (Xml_node const &policy) { policies.for_each_sub_node("policy", [&] (Xml_node const &policy) {
Xml_node_label_score const score(policy, label); Xml_node_label_score const score(policy, label);
if (score.stronger(best_score)) { if (score.stronger(best_score))
best_match = policy; policy.with_raw_node([&] (char const *ptr, size_t len) {
best_score = score; best_match.construct(ptr, len);
} best_score = score; });
}); });
/* fall back to default policy if no match exists */ /* fall back to default policy if no match exists */
if (best_match.has_type("none")) if (!best_match.constructed())
policies.with_optional_sub_node("default-policy", [&] (Xml_node const &policy) { policies.with_optional_sub_node("default-policy", [&] (Xml_node const &policy) {
best_match = policy; }); policy.with_raw_node([&] (char const *ptr, size_t len) {
best_match.construct(ptr, len); }); });
if (best_match.has_type("none")) if (best_match.constructed()) {
Xml_node const &node = *best_match;
match_fn(node);
} else {
no_match_fn(); no_match_fn();
else }
match_fn(best_match);
} }
@ -221,20 +225,24 @@ class Genode::Session_policy : public Xml_node
* Query session policy from session label * Query session policy from session label
*/ */
template <size_t N> template <size_t N>
static Xml_node _query_policy(String<N> const &label, Xml_node config) static Const_byte_range_ptr _query_policy(String<N> const &label, Xml_node const &config)
{ {
Xml_node result("<none/>"); char const *start_ptr = "<none/>";
size_t num_bytes = 7;
with_matching_policy(label, config, with_matching_policy(label, config,
[&] (Xml_node const &policy) { [&] (Xml_node const &policy) {
result = policy; }, policy.with_raw_node([&] (char const *ptr, size_t len) {
start_ptr = ptr;
num_bytes = len; });
},
[&] () { [&] () {
warning("no policy defined for label '", label, "'"); warning("no policy defined for label '", label, "'");
throw No_policy_defined(); }); throw No_policy_defined(); });
return result; return { start_ptr, num_bytes };
} }
public: public:
@ -257,7 +265,7 @@ class Genode::Session_policy : public Xml_node
* with the longest label is selected. * with the longest label is selected.
*/ */
template <size_t N> template <size_t N>
Session_policy(String<N> const &label, Xml_node config) Session_policy(String<N> const &label, Xml_node const &config)
: :
Xml_node(_query_policy(label, config)) Xml_node(_query_policy(label, config))
{ } { }