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
46 lines
1.1 KiB
C++
46 lines
1.1 KiB
C++
/*
|
|
* \brief Common types for launcher
|
|
* \author Norman Feske
|
|
* \date 2014-09-30
|
|
*/
|
|
|
|
/*
|
|
* Copyright (C) 2014 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 _TYPES_H_
|
|
#define _TYPES_H_
|
|
|
|
/* Genode includes */
|
|
#include <decorator/xml_utils.h>
|
|
#include <nitpicker_session/nitpicker_session.h>
|
|
|
|
namespace Launcher {
|
|
using namespace Genode;
|
|
|
|
typedef String<128> Label;
|
|
|
|
static Nitpicker::Session::Label selector(Label label)
|
|
{
|
|
/*
|
|
* Append label separator to uniquely identify the subsystem.
|
|
* Otherwise, the selector may be ambiguous if the label of one
|
|
* subsystem starts with the label of another subsystem.
|
|
*/
|
|
char selector[Nitpicker::Session::Label::size()];
|
|
snprintf(selector, sizeof(selector), "%s ->", label.string());
|
|
return Nitpicker::Session::Label(Cstring(selector));
|
|
}
|
|
|
|
using Decorator::area_attribute;
|
|
using Decorator::point_attribute;
|
|
|
|
typedef Nitpicker::Point Point;
|
|
typedef Nitpicker::Rect Rect;
|
|
}
|
|
|
|
#endif /* _TYPES_H_ */
|