ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-24 19:24:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

genode_c_api: add config update to block interface

Browse Source 
Ref genodelabs/genode#4653
This commit is contained in:
Stefan Kalkowski 2022-10-27 13:47:54 +02:00 committed by Christian Helmuth
parent d8d9f94075
commit 11a6117da6
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repos/os/include/genode_c_api/block.h
View File

@ -21,8 +21,11 @@ struct genode_block_session; /* definition is private to the implementation */
#ifdef __cplusplus #ifdef __cplusplus
void genode_block_apply_config(Genode::Xml_node const & config);
extern "C" { extern "C" {
#endif #endif /* __cplusplus */
/******************** /********************
@ -41,6 +44,7 @@ void genode_block_init(struct genode_env *env,
genode_shared_dataspace_free_t); genode_shared_dataspace_free_t);
/************************************** /**************************************
** Block device lifetime management ** ** Block device lifetime management **
**************************************/ **************************************/

37
repos/os/src/lib/genode_c_api/block.cc
View File

@ -11,11 +11,10 @@
* under the terms of the GNU Affero General Public License version 3. * under the terms of the GNU Affero General Public License version 3.
*/ */
#include <base/attached_dataspace.h>
#include <base/attached_rom_dataspace.h>
#include <base/env.h> #include <base/env.h>
#include <block/request_stream.h> #include <block/request_stream.h>
#include <root/component.h> #include <root/component.h>
#include <os/buffered_xml.h>
#include <os/reporter.h> #include <os/reporter.h>
#include <os/session_policy.h> #include <os/session_policy.h>
@ -106,12 +105,13 @@ class Root : public Root_component<genode_block_session>
: name(name), info(info) {} : name(name), info(info) {}
}; };
Env & _env; Env & _env;
Signal_context_capability _sigh_cap; Signal_context_capability _sigh_cap;
Attached_rom_dataspace _config { _env, "config" }; Constructible<Buffered_xml> _config { };
Reporter _reporter { _env, "block_devices" }; Reporter _reporter { _env, "block_devices" };
Constructible<Session_info> _sessions[MAX_BLOCK_DEVICES]; Constructible<Session_info> _sessions[MAX_BLOCK_DEVICES];
bool _announced { false }; bool _announced { false };
bool _report_needed { false };
Root(const Root&); Root(const Root&);
Root & operator=(const Root&); Root & operator=(const Root&);
@ -141,6 +141,7 @@ class Root : public Root_component<genode_block_session>
void discontinue_device(const char * name); void discontinue_device(const char * name);
genode_block_session * session(const char * name); genode_block_session * session(const char * name);
void notify_peers(); void notify_peers();
void apply_config(Xml_node const &);
}; };
@ -235,8 +236,11 @@ genode_block_session::genode_block_session(Env & env,
genode_block_session * ::Root::_create_session(const char * args, genode_block_session * ::Root::_create_session(const char * args,
Affinity const &) Affinity const &)
{ {
if (!_config.constructed())
throw Service_denied();
Session_label const label = label_from_args(args); Session_label const label = label_from_args(args);
Session_policy const policy(label, _config.xml()); Session_policy const policy(label, _config->xml());
Session_info::Name const device = Session_info::Name const device =
policy.attribute_value("device", Session_info::Name()); policy.attribute_value("device", Session_info::Name());
@ -283,7 +287,7 @@ void ::Root::_destroy_session(genode_block_session * session)
void ::Root::_report() void ::Root::_report()
{ {
if (!_config.xml().attribute_value("report", false)) if (!_report_needed)
return; return;
_reporter.enabled(true); _reporter.enabled(true);
@ -351,6 +355,13 @@ void ::Root::notify_peers()
} }
void ::Root::apply_config(Xml_node const & config)
{
_config.construct(*md_alloc(), config);
_report_needed = config.attribute_value("report", false);
}
::Root::Root(Env & env, Allocator & alloc, Signal_context_capability cap) ::Root::Root(Env & env, Allocator & alloc, Signal_context_capability cap)
: :
Root_component<genode_block_session>(env.ep(), alloc), Root_component<genode_block_session>(env.ep(), alloc),
@ -423,3 +434,9 @@ extern "C" void genode_block_notify_peers()
{ {
if (_block_root) _block_root->notify_peers(); if (_block_root) _block_root->notify_peers();
} }
void genode_block_apply_config(Xml_node const & config)
{
if (_block_root) _block_root->apply_config(config);
}