eba9c15746
The patch adjust the code of the base, base-<kernel>, and os repository.
To adapt existing components to fix violations of the best practices
suggested by "Effective C++" as reported by the -Weffc++ compiler
argument. The changes follow the patterns outlined below:
* A class with virtual functions can no longer publicly inherit base
classed without a vtable. The inherited object may either be moved
to a member variable, or inherited privately. The latter would be
used for classes that inherit 'List::Element' or 'Avl_node'. In order
to enable the 'List' and 'Avl_tree' to access the meta data, the
'List' must become a friend.
* Instead of adding a virtual destructor to abstract base classes,
we inherit the new 'Interface' class, which contains a virtual
destructor. This way, single-line abstract base classes can stay
as compact as they are now. The 'Interface' utility resides in
base/include/util/interface.h.
* With the new warnings enabled, all member variables must be explicitly
initialized. Basic types may be initialized with '='. All other types
are initialized with braces '{ ... }' or as class initializers. If
basic types and non-basic types appear in a row, it is nice to only
use the brace syntax (also for basic types) and align the braces.
* If a class contains pointers as members, it must now also provide a
copy constructor and assignment operator. In the most cases, one
would make them private, effectively disallowing the objects to be
copied. Unfortunately, this warning cannot be fixed be inheriting
our existing 'Noncopyable' class (the compiler fails to detect that
the inheriting class cannot be copied and still gives the error).
For now, we have to manually add declarations for both the copy
constructor and assignment operator as private class members. Those
declarations should be prepended with a comment like this:
/*
* Noncopyable
*/
Thread(Thread const &);
Thread &operator = (Thread const &);
In the future, we should revisit these places and try to replace
the pointers with references. In the presence of at least one
reference member, the compiler would no longer implicitly generate
a copy constructor. So we could remove the manual declaration.
Issue #465
139 lines
3.1 KiB
C++
139 lines
3.1 KiB
C++
/*
|
|
* \brief Test for 'Reconstructible'
|
|
* \author Norman Feske
|
|
* \date 2013-01-10
|
|
*/
|
|
|
|
/*
|
|
* Copyright (C) 2014-2017 Genode Labs GmbH
|
|
*
|
|
* This file is part of the Genode OS framework, which is distributed
|
|
* under the terms of the GNU Affero General Public License version 3.
|
|
*/
|
|
|
|
/* Genode includes */
|
|
#include <util/reconstructible.h>
|
|
#include <base/component.h>
|
|
|
|
using namespace Genode;
|
|
|
|
struct Object
|
|
{
|
|
unsigned const id;
|
|
|
|
Object(unsigned id) : id(id) { log("construct Object ", id); }
|
|
~Object() { log("destruct Object ", id); }
|
|
|
|
void method() { log("method called on Object ", id); }
|
|
void const_method() const { log("const method called on Object ", id); }
|
|
};
|
|
|
|
|
|
struct Member_with_reference
|
|
{
|
|
Object &reference;
|
|
int const c = 13;
|
|
|
|
Member_with_reference(Object &reference) : reference(reference) {
|
|
log("construct Member_with_reference"); }
|
|
|
|
~Member_with_reference() { log("destruct Member_with_reference"); }
|
|
};
|
|
|
|
|
|
struct Compound
|
|
{
|
|
Reconstructible<Member_with_reference> member;
|
|
Constructible<Member_with_reference> lazy_member { };
|
|
|
|
Compound(Object &object) : member(object) {
|
|
log("construct Compound"); }
|
|
|
|
~Compound() { log("destruct Compound"); }
|
|
};
|
|
|
|
|
|
struct Bool
|
|
{
|
|
bool b;
|
|
|
|
Bool(Bool const &) = delete;
|
|
|
|
Bool(bool const &b) : b(b) { }
|
|
};
|
|
|
|
|
|
struct Throwing
|
|
{
|
|
Throwing(Bool const &throws)
|
|
{
|
|
if (throws.b) {
|
|
log("construct Throwing -> throw exception");
|
|
throw -1;
|
|
} else {
|
|
log("construct Throwing -> don't throw"); }
|
|
}
|
|
|
|
virtual ~Throwing() { log("destruct Throwing"); }
|
|
};
|
|
|
|
|
|
struct Main
|
|
{
|
|
void call_const_method(Compound const &compound) {
|
|
compound.member->reference.const_method(); }
|
|
|
|
Main(Env &)
|
|
{
|
|
log("--- Reconstructible utility test ---");
|
|
{
|
|
Object object_1(1);
|
|
Object object_2(2);
|
|
|
|
log("create Compound object");
|
|
Compound compound(object_1);
|
|
|
|
log("compound.member.constructed returns ",
|
|
compound.member.constructed());
|
|
log("compound.lazy_member.constructed returns ",
|
|
compound.lazy_member.constructed());
|
|
|
|
log("construct lazy member");
|
|
compound.lazy_member.construct(object_2);
|
|
log("compound.lazy_member.constructed returns ",
|
|
compound.lazy_member.constructed());
|
|
|
|
log("call method on member (with reference to Object 1)");
|
|
call_const_method(compound);
|
|
|
|
log("reconstruct member with Object 2 as reference");
|
|
compound.member.construct(object_2);
|
|
|
|
log("call method on member");
|
|
call_const_method(compound);
|
|
|
|
log("destruct member");
|
|
compound.member.destruct();
|
|
|
|
log("try to call method on member, catch exception");
|
|
try { call_const_method(compound); }
|
|
catch (typename Reconstructible<Member_with_reference>::Deref_unconstructed_object) {
|
|
log("got exception, as expected"); }
|
|
|
|
log("destruct Compound and Objects 1 and 2");
|
|
}
|
|
try {
|
|
log("construct Throwing object");
|
|
Bool const b_false(false), b_true(true);
|
|
Reconstructible<Throwing> inst(b_false);
|
|
inst.construct(b_true);
|
|
Genode::error("expected contructor to throw");
|
|
} catch (int i) {
|
|
log("got exception, as expected"); }
|
|
|
|
log("--- Reconstructible utility test finished ---");
|
|
}
|
|
};
|
|
|
|
void Component::construct(Env &env) { static Main main(env); }
|