mirror of
https://github.com/genodelabs/genode.git
synced 2025-01-02 12:06:44 +00:00
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
91 lines
2.2 KiB
C++
91 lines
2.2 KiB
C++
/*
|
|
* \brief A net interface in form of a signal-driven NIC-packet handler
|
|
* \author Martin Stein
|
|
* \date 2017-03-08
|
|
*/
|
|
|
|
/*
|
|
* Copyright (C) 2016-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.
|
|
*/
|
|
|
|
#ifndef _INTERFACE_H_
|
|
#define _INTERFACE_H_
|
|
|
|
/* local includes */
|
|
#include <pointer.h>
|
|
|
|
/* Genode includes */
|
|
#include <nic_session/nic_session.h>
|
|
#include <util/string.h>
|
|
#include <timer_session/connection.h>
|
|
|
|
namespace Net {
|
|
|
|
using Packet_descriptor = ::Nic::Packet_descriptor;
|
|
using Packet_stream_sink = ::Nic::Packet_stream_sink< ::Nic::Session::Policy>;
|
|
using Packet_stream_source = ::Nic::Packet_stream_source< ::Nic::Session::Policy>;
|
|
class Ethernet_frame;
|
|
class Interface;
|
|
using Interface_label = Genode::String<64>;
|
|
}
|
|
|
|
|
|
class Net::Interface
|
|
{
|
|
protected:
|
|
|
|
using Signal_handler = Genode::Signal_handler<Interface>;
|
|
|
|
Signal_handler _sink_ack;
|
|
Signal_handler _sink_submit;
|
|
Signal_handler _source_ack;
|
|
Signal_handler _source_submit;
|
|
|
|
private:
|
|
|
|
Genode::Allocator &_alloc;
|
|
Pointer<Interface> _remote { };
|
|
Interface_label _label;
|
|
Timer::Connection &_timer;
|
|
Genode::Duration &_curr_time;
|
|
bool _log_time;
|
|
|
|
void _send(Ethernet_frame ð, Genode::size_t const eth_size);
|
|
|
|
void _handle_eth(void *const eth_base,
|
|
Genode::size_t const eth_size,
|
|
Packet_descriptor const &pkt);
|
|
|
|
virtual Packet_stream_sink &_sink() = 0;
|
|
|
|
virtual Packet_stream_source &_source() = 0;
|
|
|
|
|
|
/***********************************
|
|
** Packet-stream signal handlers **
|
|
***********************************/
|
|
|
|
void _ready_to_submit();
|
|
void _ack_avail() { }
|
|
void _ready_to_ack();
|
|
void _packet_avail() { }
|
|
|
|
public:
|
|
|
|
Interface(Genode::Entrypoint &ep,
|
|
Interface_label label,
|
|
Timer::Connection &timer,
|
|
Genode::Duration &curr_time,
|
|
bool log_time,
|
|
Genode::Allocator &alloc);
|
|
|
|
virtual ~Interface() { }
|
|
|
|
void remote(Interface &remote) { _remote.set(remote); }
|
|
};
|
|
|
|
#endif /* _INTERFACE_H_ */
|