denshooter/genode
1
0
Fork 0
mirror of https://github.com/mmueller41/genode.git synced 2026-01-21 12:32:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

ealanos: Fixed deadlock and XML exceptions in Hoitaja.

Browse Source
This commit is contained in:
Michael Mueller
2025-09-09 15:42:42 +02:00
parent 865eded4aa
commit 04bf2ed28c
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
repos/ealanos/src/lib/sandbox/library.cc
View File

@@ -316,8 +316,8 @@ struct Genode::Sandbox::Library : ::Sandbox::State_reporter::Producer,
Genode::Xml_node* update(Child &child, Genode::Xml_node *config, Genode::Mutex &config_lock) { Genode::Xml_node* update(Child &child, Genode::Xml_node *config, Genode::Mutex &config_lock) {
if (child.exited()) { if (child.exited()) {
_children.remove(&child); //_children.remove(&child);
_core_allocator->free_cores_from_cell(child); //_core_allocator->free_cores_from_cell(child);
/* Remove child from config */ /* Remove child from config */
try { try {
/* Find XML node for the child */ /* Find XML node for the child */
@@ -346,9 +346,14 @@ struct Genode::Sandbox::Library : ::Sandbox::State_reporter::Producer,
Genode::size_t tail_len = static_cast<Genode::size_t>(config_end - node_end); Genode::size_t tail_len = static_cast<Genode::size_t>(config_end - node_end);
/* Remove child's start node with memmove */ /* Remove child's start node with memmove */
Genode::memmove(node_ptr-1, node_end, tail_len); for (; *node_ptr != '>'; node_ptr--);
*(node_ptr + tail_len) = '\0';
Genode::memmove(node_ptr + 1, node_end, tail_len);
/* Cut of junk after closing "config" tag */
for (; *(node_ptr + tail_len) != '>'; tail_len--);
*(node_ptr + tail_len + 1) = '\0';
/* Reparse changed buffer */ /* Reparse changed buffer */
Xml_node *new_config = new (_heap) Xml_node(config_ptr, config_len - len); Xml_node *new_config = new (_heap) Xml_node(config_ptr, config_len - len);
_heap.free(config, sizeof(Xml_node)); _heap.free(config, sizeof(Xml_node));
@@ -358,15 +363,13 @@ struct Genode::Sandbox::Library : ::Sandbox::State_reporter::Producer,
catch (Genode::Xml_node::Nonexistent_sub_node) catch (Genode::Xml_node::Nonexistent_sub_node)
{ {
Genode::error("Could not find child's start node"); Genode::error("Could not find child's start node");
config_lock.release();
return config; return config;
}; };
Genode::log("Removed child ", child.name()); Genode::log("Removed child ", child.name());
_habitat->groom(); _habitat->groom();
config_lock.acquire();
apply_config(*config); apply_config(*config);
config_lock.release();
maintain_cells();
} else { } else {
_groom(); _groom();
} }