ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vfs: support label attribute in log file system 

The log plugin can now be configured to request a log session with the
specified label like follows.

  <log label="..."/>

Per default, no new log session is requested but the existing log
session of the component's environment is used.
This commit is contained in:
Christian Helmuth 2016-11-25 13:04:19 +01:00
parent 9e86621b07
commit f184118930
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
repos/os/src/lib/vfs/log_file_system.h
View File

@ -16,6 +16,7 @@
#include <log_session/connection.h>
#include <vfs/single_file_system.h>
#include <util/volatile_object.h>
namespace Vfs { class Log_file_system; }
@ -24,15 +25,36 @@ class Vfs::Log_file_system : public Single_file_system
{
private:
Genode::Log_connection _log;
typedef Genode::String<64> Label;
Label _label;
Genode::Lazy_volatile_object<Genode::Log_connection> _log_connection;
Genode::Lazy_volatile_object<Genode::Log_session_client> _log_client;
Genode::Log_session & _log_session(Genode::Env &env)
{
if (_label.valid()) {
_log_connection.construct(env, _label);
return *_log_connection;
} else {
_log_client.construct(
Genode::reinterpret_cap_cast<Genode::Log_session>
(env.parent().session_cap(Genode::Parent::Env::log())));
return *_log_client;
}
}
Genode::Log_session &_log;
public:
Log_file_system(Genode::Env&,
Log_file_system(Genode::Env &env,
Genode::Allocator&,
Genode::Xml_node config)
:
Single_file_system(NODE_TYPE_CHAR_DEVICE, name(), config)
Single_file_system(NODE_TYPE_CHAR_DEVICE, name(), config),
_label(config.attribute_value("label", Label())),
_log(_log_session(env))
{ }
static const char *name() { return "log"; }