mirror of
https://github.com/genodelabs/genode.git
synced 2025-06-15 21:58:24 +00:00
init: enable init to report its internal state
This patch equips init with the ability to report its internal state in the form of a "state" report. This feature can be enabled by placing a '<report>' node in init's configuration. The report node accepts the following arguments (with their default values): 'delay_ms="100"': specifies the number of milliseconds to wait before producing a new report. This way, many consecutive state changes - like they occur during the startup - do not result in an overly large number of reports but are merged into one final report. 'buffer="4K"': the maximum size of the report in bytes. The attribute accepts the use of K/M/G as units. 'init_ram="no"': if enabled, the report will contain a '<ram>' node with the memory stats of init. 'ids="no"': supplement the children in the report with unique IDs, which may be used to infer the lifetime of children accross configuration updates in the future; 'requested="no"': if enabled, the report will contain information about all session requests initiated by the children. 'provided="no"': if enabled, the report will contain information about all sessions provided by all servers. 'session_args="no"': level of detail of the session information generated via 'requested' or 'provided'. 'child_ram="no"': if enabled, the report will contain a '<ram>' node for each child based on the information obtained from the child's RAM session. Issue #2246
This commit is contained in:
committed by
Christian Helmuth
parent
9d683a56a0
commit
84fddafda7
@ -24,6 +24,7 @@
|
||||
#include <init/verbose.h>
|
||||
#include <init/child_config.h>
|
||||
#include <init/child_policy.h>
|
||||
#include <init/report.h>
|
||||
|
||||
namespace Init {
|
||||
|
||||
@ -234,6 +235,21 @@ namespace Init {
|
||||
service = &s; });
|
||||
return service;
|
||||
}
|
||||
|
||||
|
||||
inline void generate_ram_info(Xml_generator &xml, Ram_session const &ram)
|
||||
{
|
||||
/*
|
||||
* The const cast is needed because the 'Ram_session' accessors are
|
||||
* non-const methods.
|
||||
*/
|
||||
Ram_session &ram_nonconst = const_cast<Ram_session &>(ram);
|
||||
|
||||
typedef String<32> Value;
|
||||
xml.attribute("quota", Value(Number_of_bytes(ram_nonconst.quota())));
|
||||
xml.attribute("used", Value(Number_of_bytes(ram_nonconst.used())));
|
||||
xml.attribute("avail", Value(Number_of_bytes(ram_nonconst.avail())));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -312,6 +328,11 @@ class Init::Child : Child_policy, Child_service::Wakeup
|
||||
*/
|
||||
class Child_name_is_not_unique { };
|
||||
|
||||
/**
|
||||
* Unique ID of the child, solely used for diagnostic purposes
|
||||
*/
|
||||
struct Id { unsigned value; };
|
||||
|
||||
private:
|
||||
|
||||
friend class Child_registry;
|
||||
@ -320,6 +341,10 @@ class Init::Child : Child_policy, Child_service::Wakeup
|
||||
|
||||
Verbose const &_verbose;
|
||||
|
||||
Id const _id;
|
||||
|
||||
Report_update_trigger &_report_update_trigger;
|
||||
|
||||
List_element<Child> _list_element;
|
||||
|
||||
Xml_node _start_node;
|
||||
@ -488,6 +513,8 @@ class Init::Child : Child_policy, Child_service::Wakeup
|
||||
*/
|
||||
Child(Env &env,
|
||||
Verbose const &verbose,
|
||||
Id id,
|
||||
Report_update_trigger &report_update_trigger,
|
||||
Xml_node start_node,
|
||||
Xml_node default_route_node,
|
||||
Name_registry &name_registry,
|
||||
@ -496,7 +523,8 @@ class Init::Child : Child_policy, Child_service::Wakeup
|
||||
Registry<Parent_service> &parent_services,
|
||||
Registry<Routed_service> &child_services)
|
||||
:
|
||||
_env(env), _verbose(verbose),
|
||||
_env(env), _verbose(verbose), _id(id),
|
||||
_report_update_trigger(report_update_trigger),
|
||||
_list_element(this),
|
||||
_start_node(start_node),
|
||||
_default_route_node(default_route_node),
|
||||
@ -564,6 +592,51 @@ class Init::Child : Child_policy, Child_service::Wakeup
|
||||
*/
|
||||
bool has_name(Child_policy::Name const &str) const { return str == name(); }
|
||||
|
||||
void report_state(Xml_generator &xml, Report_detail const &detail) const
|
||||
{
|
||||
xml.node("child", [&] () {
|
||||
|
||||
xml.attribute("name", _name.unique);
|
||||
xml.attribute("binary", _name.file);
|
||||
|
||||
if (detail.ids())
|
||||
xml.attribute("id", _id.value);
|
||||
|
||||
if (detail.child_ram() && _child.ram_session_cap().valid()) {
|
||||
xml.node("ram", [&] () {
|
||||
/*
|
||||
* The const cast is needed because there is no const
|
||||
* accessor for the RAM session of the child.
|
||||
*/
|
||||
auto &nonconst_child = const_cast<Genode::Child &>(_child);
|
||||
generate_ram_info(xml, nonconst_child.ram());
|
||||
});
|
||||
}
|
||||
|
||||
Session_state::Detail const
|
||||
session_detail { detail.session_args() ? Session_state::Detail::ARGS
|
||||
: Session_state::Detail::NO_ARGS};
|
||||
|
||||
if (detail.requested()) {
|
||||
xml.node("requested", [&] () {
|
||||
_child.for_each_session([&] (Session_state const &session) {
|
||||
xml.node("session", [&] () {
|
||||
session.generate_client_side_info(xml, session_detail); }); }); });
|
||||
}
|
||||
|
||||
if (detail.provided()) {
|
||||
xml.node("provided", [&] () {
|
||||
|
||||
auto fn = [&] (Session_state const &session) {
|
||||
xml.node("session", [&] () {
|
||||
session.generate_server_side_info(xml, session_detail); }); };
|
||||
|
||||
server_id_space().for_each<Session_state const>(fn);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
/****************************
|
||||
** Child-policy interface **
|
||||
@ -792,6 +865,11 @@ class Init::Child : Child_policy, Child_service::Wakeup
|
||||
*/
|
||||
Child_policy::exit(exit_value);
|
||||
}
|
||||
|
||||
void session_state_changed() override
|
||||
{
|
||||
_report_update_trigger.trigger_report_update();
|
||||
}
|
||||
};
|
||||
|
||||
#endif /* _INCLUDE__INIT__CHILD_H_ */
|
||||
|
68
repos/os/include/init/report.h
Normal file
68
repos/os/include/init/report.h
Normal file
@ -0,0 +1,68 @@
|
||||
/*
|
||||
* \brief Report configuration
|
||||
* \author Norman Feske
|
||||
* \date 2017-01-16
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2017 Genode Labs GmbH
|
||||
*
|
||||
* This file is part of the Genode OS framework, which is distributed
|
||||
* under the terms of the GNU General Public License version 2.
|
||||
*/
|
||||
|
||||
#ifndef _INCLUDE__INIT__REPORT_H_
|
||||
#define _INCLUDE__INIT__REPORT_H_
|
||||
|
||||
#include <util/noncopyable.h>
|
||||
#include <util/xml_node.h>
|
||||
|
||||
namespace Init {
|
||||
struct Report_update_trigger;
|
||||
struct Report_detail;
|
||||
}
|
||||
|
||||
|
||||
class Init::Report_detail : Genode::Noncopyable
|
||||
{
|
||||
private:
|
||||
|
||||
bool _children = false;
|
||||
bool _ids = false;
|
||||
bool _requested = false;
|
||||
bool _provided = false;
|
||||
bool _session_args = false;
|
||||
bool _child_ram = false;
|
||||
bool _init_ram = false;
|
||||
|
||||
public:
|
||||
|
||||
Report_detail() { }
|
||||
|
||||
Report_detail(Genode::Xml_node report)
|
||||
{
|
||||
_children = true;
|
||||
_ids = report.attribute_value("ids", false);
|
||||
_requested = report.attribute_value("requested", false);
|
||||
_provided = report.attribute_value("provided", false);
|
||||
_session_args = report.attribute_value("session_args", false);
|
||||
_child_ram = report.attribute_value("child_ram", false);
|
||||
_init_ram = report.attribute_value("init_ram", false);
|
||||
}
|
||||
|
||||
bool children() const { return _children; }
|
||||
bool ids() const { return _ids; }
|
||||
bool requested() const { return _requested; }
|
||||
bool provided() const { return _provided; }
|
||||
bool session_args() const { return _session_args; }
|
||||
bool child_ram() const { return _child_ram; }
|
||||
bool init_ram() const { return _init_ram; }
|
||||
};
|
||||
|
||||
|
||||
struct Init::Report_update_trigger
|
||||
{
|
||||
virtual void trigger_report_update() = 0;
|
||||
};
|
||||
|
||||
#endif /* _INCLUDE__INIT__REPORT_H_ */
|
Reference in New Issue
Block a user