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

sculpt_manager: keep launchers in 'Dictionary'

Browse Source 
This patch replaces the direct use of an 'Avl_tree' by the modern
'Dictionary' utility.
This commit is contained in:
Norman Feske 2023-01-10 16:22:01 +01:00 committed by Christian Helmuth
parent be7022dadc
commit 39ca06114b
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
repos/gems/src/app/sculpt_manager/model/launchers.h
View File

@ -16,7 +16,7 @@
/* Genode includes */ /* Genode includes */
#include <util/list_model.h> #include <util/list_model.h>
#include <util/avl_tree.h> #include <util/dictionary.h>
/* local includes */ /* local includes */
#include <types.h> #include <types.h>
@ -39,24 +39,16 @@ class Sculpt::Launchers : public Noncopyable
Allocator &_alloc; Allocator &_alloc;
struct Launcher : Info, Avl_node<Launcher>, List_model<Launcher>::Element struct Launcher;
using Dict = Dictionary<Launcher, Path>;
struct Launcher : Dict::Element, List_model<Launcher>::Element
{ {
Avl_tree<Launcher> &_avl_tree; Launcher(Dict &dict, Path const &path) : Dict::Element(dict, path) { }
Launcher(Avl_tree<Launcher> &avl_tree, Path const &path)
: Info(path), _avl_tree(avl_tree)
{ _avl_tree.insert(this); }
~Launcher() { _avl_tree.remove(this); }
/**
* Avl_node interface
*/
bool higher(Launcher *l) {
return strcmp(l->path.string(), path.string()) > 0; }
}; };
Avl_tree<Launcher> _sorted { }; Dict _sorted { };
List_model<Launcher> _launchers { }; List_model<Launcher> _launchers { };
@ -64,9 +56,9 @@ class Sculpt::Launchers : public Noncopyable
{ {
Allocator &_alloc; Allocator &_alloc;
Avl_tree<Launcher> &_sorted; Dict &_sorted;
Update_policy(Allocator &alloc, Avl_tree<Launcher> &sorted) Update_policy(Allocator &alloc, Dict &sorted)
: _alloc(alloc), _sorted(sorted) { } : _alloc(alloc), _sorted(sorted) { }
void destroy_element(Launcher &elem) { destroy(_alloc, &elem); } void destroy_element(Launcher &elem) { destroy(_alloc, &elem); }
@ -81,7 +73,7 @@ class Sculpt::Launchers : public Noncopyable
static bool element_matches_xml_node(Launcher const &elem, Xml_node node) static bool element_matches_xml_node(Launcher const &elem, Xml_node node)
{ {
return node.attribute_value("name", Path()) == elem.path; return node.attribute_value("name", Path()) == elem.name;
} }
}; };
@ -89,14 +81,18 @@ class Sculpt::Launchers : public Noncopyable
Launchers(Allocator &alloc) : _alloc(alloc) { } Launchers(Allocator &alloc) : _alloc(alloc) { }
void update_from_xml(Xml_node node) void update_from_xml(Xml_node const &node)
{ {
Update_policy policy(_alloc, _sorted); Update_policy policy(_alloc, _sorted);
_launchers.update_from_xml(policy, node); _launchers.update_from_xml(policy, node);
} }
template <typename FN> template <typename FN>
void for_each(FN const &fn) const { _sorted.for_each(fn); } void for_each(FN const &fn) const
{
_sorted.for_each([&] (Dict::Element const &e) {
fn(Info(e.name)); });
}
}; };
#endif /* _MODEL__LAUNCHERS_H_ */ #endif /* _MODEL__LAUNCHERS_H_ */