X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FConnectors.hh;h=e6b8c07af00c67d44e45ce232f4841876907d891;hb=d5a72d0b3f6fee56dba6de1c54cafb448ebe3457;hp=60b1f719d8ba476b4a5ada017886a8970153cc38;hpb=8aa27cfde664f462f1aebd601f1521c186d819c3;p=senf.git diff --git a/PPI/Connectors.hh b/PPI/Connectors.hh index 60b1f71..e6b8c07 100644 --- a/PPI/Connectors.hh +++ b/PPI/Connectors.hh @@ -23,8 +23,8 @@ /** \file \brief Connectors public header */ -#ifndef HH_Connectors_ -#define HH_Connectors_ 1 +#ifndef HH_SENF_PPI_Connectors_ +#define HH_SENF_PPI_Connectors_ 1 // Custom includes #include @@ -36,6 +36,7 @@ #include "predecl.hh" #include "detail/Callback.hh" #include "Queueing.hh" +#include "ModuleManager.hh" //#include "Connectors.mpp" ///////////////////////////////hh.p//////////////////////////////////////// @@ -47,22 +48,24 @@ namespace connector { /** \namespace senf::ppi::connector \brief Connector classes - A connector has two independent properties - - it may be \e active or \e passive - - it may be an \e input or an \e output + A connector has three independent properties + \li it may be \e active or \e passive + \li it may be an \e input or an \e output + \li it has an (optional) packet type \e Active connectors are activated from within the module, \e passive connectors are - signaled by the external framework. \e Input modules receive packets, \e output modules send - packets. + signaled by the external framework. \e Input connectors receive packets, \e output + connectors send packets. All passive connectors call some onRequest callback whenever I/O needs to be performed. All - input modules possess a packet queue. + input connectors possess a packet queue. - We therefore have 4 connector types: - - senf::ppi::connector::ActiveInput - - senf::ppi::connector::ActiveOutput - - senf::ppi::connector::PassiveInput - - senf::ppi::connector::PassiveOutput. + We therefore have 4 connector types each of which is parameterized by the type of packet + traversing the connector: + \li senf::ppi::connector::ActiveInput + \li senf::ppi::connector::ActiveOutput + \li senf::ppi::connector::PassiveInput + \li senf::ppi::connector::PassiveOutput. Connectors are declared as module data members and are then externally connected to other modules. @@ -88,18 +91,64 @@ namespace connector { private: void onRequest() { // 'input()' will return a senf::EthernetPacket packet handle - try { output( input().find() ); } + try { output( input().find() ); } catch (senf::InvalidPacketChainException & ex) { ; } } }; \endcode + + \section ppi_jacks Jacks + + A Jack is a packet type aware and possibly packet type converting reference to an arbitrary + connector of the same type. Jacks are used in groups to indirectly declare the input's and + output's + + \code + class MyGroup + { + private: + senf::ppi::module::PassiveQueue queue; + senf::ppi::module::RateAnalyzer analyzer; + + public: + senf::ppi::connector::ActiveInputJack input; + senf::ppi::connector::ActiveOutputJack output; + + MyGroup() + : queue (), analyzer (), input (queue.input), output (analyzer.output) + { + senf::ppi::connect(queue, analyzer); + } + }; + \endcode + + The jacks are initialized by passing an arbitrary compatible connector to the jack + constructor. A connector is compatible, if + \li It has the same input/output active/passive specification + \li Either the Jack or the Connector are generic (senf::Packet) or Jack and Connector have + the same packet type + + Jacks can be used wherever connectors may be used. Jacks may be defined anywhere, not only + in modules. It is however important to ensure that the lifetime of the jack does not exceed + the lifetime of the referenced connector. + \see senf::ppi::module::Module \n senf::ppi::connect() \n \ref ppi_connectors */ + /** \brief Incompatible connectors connected + + This exception is thrown, when two incompatible connectors are connected. This happens if + both connectors of a senf::ppi::connect() statement declare a packet type (the connector + template argument) but they don't declare the same packet type. + + You need to ensure, that both connectors use the same packet type. + + \see senf::ppi::connect() + */ struct IncompatibleConnectorsException : public senf::Exception { IncompatibleConnectorsException() : senf::Exception("Incompatible connectors") {} }; @@ -110,18 +159,32 @@ namespace connector { to the containing module) */ class Connector - : boost::noncopyable + : ModuleManager::Initializable, boost::noncopyable { + SENF_LOG_CLASS_AREA(); + SENF_LOG_DEFAULT_LEVEL(senf::log::NOTICE); public: Connector & peer() const; ///< Get peer connected to this connector module::Module & module() const; ///< Get this connectors containing module + bool connected() const; ///< \c true, if connector connected, \c false otherwise + + void disconnect(); ///< Disconnect connector from peer + + enum TraceState { NO_TRACING, TRACE_IDS, TRACE_CONTENTS }; + + static void tracing(TraceState state); + static TraceState tracing(); + protected: Connector(); virtual ~Connector(); void connect(Connector & target); + void trace(Packet const & p, char const * label); + void throttleTrace(char const * label, char const * type); + private: virtual std::type_info const & packetTypeID(); @@ -130,6 +193,8 @@ namespace connector { Connector * peer_; module::Module * module_; + static TraceState traceState_; + friend class module::Module; }; @@ -181,11 +246,13 @@ namespace connector { void emit(); private: - // Called by the routing to change the remote throttling state + virtual void v_init(); + + // Called by the routing to change the throttling state from forwarding routes void notifyThrottle(); ///< Forward a throttle notification to this connector void notifyUnthrottle(); ///< Forward an unthrottle notification to this connector - // Internal members to emit throttling notifications + // Internal members to emit throttling notifications to the connected peer void emitThrottle(); void emitUnthrottle(); @@ -256,6 +323,8 @@ namespace connector { ActiveConnector(); private: + virtual void v_init(); + // called by the peer() to forward throttling notifications void notifyThrottle(); void notifyUnthrottle(); @@ -269,6 +338,8 @@ namespace connector { typedef std::vector NotifyRoutes; NotifyRoutes notifyRoutes_; + bool throttled_; + friend class senf::ppi::ForwardingRoute; friend class PassiveConnector; }; @@ -327,7 +398,7 @@ namespace connector { InputConnector(); private: - void enqueue(Packet p); + void enqueue(Packet const & p); virtual void v_requestEvent(); virtual void v_enqueueEvent(); @@ -348,9 +419,9 @@ namespace connector { : public virtual Connector { public: - void operator()(Packet p); ///< Send out a packet + void operator()(Packet const & p); ///< Send out a packet - void write(Packet p); ///< Alias for operator()(Packet p) + void write(Packet const & p); ///< Alias for operator()(Packet p) InputConnector & peer() const; @@ -490,9 +561,10 @@ namespace connector { \tparam PacketType Type of packet to read. Defaults to senf::Packet - The ActiveInput connector template reads data actively from a connected module. This class - is completely implemented via it's base-class, GenericActiveInput, the only difference is - that read packets are returned as \a PacketType instead of generic senf::Packet references. + The %ActiveInput %connector template reads data actively from a connected %module. This + class is completely implemented via it's base-class, GenericActiveInput, the only + difference is that read packets are returned as \a PacketType instead of generic + senf::Packet references. \see GenericActiveInput \n senf::ppi::connector @@ -502,7 +574,7 @@ namespace connector { { public: PacketType operator()(); ///< Read packet - /**< \throws std::bad_cast, if the connector receives a + /**< \throws std::bad_cast if the %connector receives a Packet which is not of type \a PacketType. \returns newly read packet reference. */ PacketType read(); ///< Alias for operator() @@ -512,9 +584,9 @@ namespace connector { \tparam PacketType Type of packet to read. Defaults to senf::Packet - The PassiveInput connector template receives packets sent to it from a connected - module. This class is completely implemented via it's base-class, GenericPassiveInput, the - only difference is that read packets are returned as \a PacketType instead of generic + The %PassiveInput %connector template receives packets sent to it from a connected + %module. This class is completely implemented via it's base-class, GenericPassiveInput, + the only difference is that read packets are returned as \a PacketType instead of generic senf::Packet references. \see GenericPassiveInput \n @@ -525,7 +597,7 @@ namespace connector { { public: PacketType operator()(); ///< Read packet - /**< \throws std::bad_cast, if the connector receives a + /**< \throws std::bad_cast if the %connector receives a Packet which is not of type \a PacketType. \returns newly read packet reference. */ PacketType read(); ///< Alias for operator() @@ -535,9 +607,9 @@ namespace connector { \tparam PacketType Type of packet to send. Defaults to senf::Packet - The ActiveOutput connector template sends data actively to a connected module. This class is - completely implemented via it's base-class, GenericActiveOutput, the only difference is that - it only sends packets of type \a PacketType. + The %ActiveOutput %connector template sends data actively to a connected %module. This + class is completely implemented via it's base-class, GenericActiveOutput, the only + difference is that it only sends packets of type \a PacketType. \see GenericActiveOutput \n senf::ppi::connector @@ -547,16 +619,17 @@ namespace connector { { public: operator()(PacketType packet); ///< Send out a packet - write(PacketType packet); ///< Alias for operator() + void write(PacketType packet); ///< Alias for operator() }; /** \brief Connector passively providing packets \tparam PacketType Type of packet to send. Defaults to senf::Packet - The PassiveOutput connector template provides data passively to a connected module whenever - signaled. This class is completely implemented via it's base-class, GenericPassiveOutput, the - only difference is that it only sends packets of type \a PacketType. + The %PassiveOutput %connector template provides data passively to a connected %module + whenever signaled. This class is completely implemented via it's base-class, + GenericPassiveOutput, the only difference is that it only sends packets of type + \a PacketType. \see GenericPassiveOutput \n senf::ppi::connector @@ -566,7 +639,7 @@ namespace connector { { public: operator()(PacketType packet); ///< Send out a packet - write(PacketType packet); ///< Alias for operator() + void write(PacketType packet); ///< Alias for operator() }; #endif