17c79a9e23
Besides adapting the components to the use of base/log.h, the patch cleans up a few base headers, i.e., it removes unused includes from root/component.h, specifically base/heap.h and ram_session/ram_session.h. Hence, components that relied on the implicit inclusion of those headers have to manually include those headers now. While adjusting the log messages, I repeatedly stumbled over the problem that printing char * arguments is ambiguous. It is unclear whether to print the argument as pointer or null-terminated string. To overcome this problem, the patch introduces a new type 'Cstring' that allows the caller to express that the argument should be handled as null-terminated string. As a nice side effect, with this type in place, the optional len argument of the 'String' class could be removed. Instead of supplying a pair of (char const *, size_t), the constructor accepts a 'Cstring'. This, in turn, clears the way let the 'String' constructor use the new output mechanism to assemble a string from multiple arguments (and thereby getting rid of snprintf within Genode in the near future). To enforce the explicit resolution of the char * ambiguity, the 'char *' overload of the 'print' function is marked as deleted. Issue #1987
100 lines
2.1 KiB
C++
100 lines
2.1 KiB
C++
/*
|
|
* \brief ROM session implementation used by Noux processes
|
|
* \author Norman Feske
|
|
* \date 2013-07-18
|
|
*/
|
|
|
|
/*
|
|
* Copyright (C) 2013 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 _NOUX__ROM_SESSION_COMPONENT_H_
|
|
#define _NOUX__ROM_SESSION_COMPONENT_H_
|
|
|
|
/* Genode includes */
|
|
#include <rom_session/connection.h>
|
|
#include <base/rpc_server.h>
|
|
|
|
namespace Noux {
|
|
|
|
struct Rom_dataspace_info : Dataspace_info
|
|
{
|
|
Rom_dataspace_info(Dataspace_capability ds) : Dataspace_info(ds) { }
|
|
|
|
~Rom_dataspace_info() { }
|
|
|
|
Dataspace_capability fork(Ram_session_capability,
|
|
Dataspace_registry &ds_registry,
|
|
Rpc_entrypoint &)
|
|
{
|
|
return ds_cap();
|
|
}
|
|
|
|
void poke(addr_t dst_offset, void const *src, size_t len)
|
|
{
|
|
error("attempt to poke onto a ROM dataspace");
|
|
}
|
|
};
|
|
|
|
|
|
class Rom_session_component : public Rpc_object<Rom_session>
|
|
{
|
|
private:
|
|
|
|
/**
|
|
* Wrapped ROM session at core
|
|
*/
|
|
Rom_connection _rom;
|
|
|
|
Dataspace_registry &_ds_registry;
|
|
|
|
Rom_dataspace_info _ds_info;
|
|
|
|
public:
|
|
|
|
Rom_session_component(Dataspace_registry &ds_registry,
|
|
char const *name)
|
|
:
|
|
_rom(name), _ds_registry(ds_registry), _ds_info(_rom.dataspace())
|
|
{
|
|
_ds_registry.insert(&_ds_info);
|
|
}
|
|
|
|
~Rom_session_component()
|
|
{
|
|
/*
|
|
* Lookup and lock ds info instead of directly accessing
|
|
* the '_ds_info' member.
|
|
*/
|
|
_ds_registry.apply(_ds_info.ds_cap(), [this] (Dataspace_info *info) {
|
|
|
|
if (!info) {
|
|
error("~Rom_session_component: unexpected !info");
|
|
return;
|
|
}
|
|
|
|
_ds_registry.remove(&_ds_info);
|
|
|
|
info->dissolve_users();
|
|
});
|
|
}
|
|
|
|
|
|
/***************************
|
|
** ROM session interface **
|
|
***************************/
|
|
|
|
Rom_dataspace_capability dataspace()
|
|
{
|
|
return static_cap_cast<Rom_dataspace>(_ds_info.ds_cap());
|
|
}
|
|
|
|
void sigh(Signal_context_capability) { }
|
|
};
|
|
}
|
|
|
|
#endif /* _NOUX__ROM_SESSION_COMPONENT_H_ */
|