X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FMultiConnectorMixin.hh;h=22d3a13c38e95e7837091603cd7acc48fc6a69fe;hb=93d9568d448749dc187e7622b733a4a3caa319df;hp=b386e0166cb09a133b74bc95b1f4858211f10262;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/PPI/MultiConnectorMixin.hh b/senf/PPI/MultiConnectorMixin.hh index b386e01..22d3a13 100644 --- a/senf/PPI/MultiConnectorMixin.hh +++ b/senf/PPI/MultiConnectorMixin.hh @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2009 +// Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -27,24 +27,22 @@ #define HH_SENF_PPI_MultiConnectorMixin_ 1 // Custom includes -#include "../config.hh" +#include #include #include #include -#include "Connectors.hh" -#include "Setup.hh" - -#include "MultiConnectorMixin.mpp" -#include "MultiConnectorMixin.ih" -///////////////////////////////hh.p//////////////////////////////////////// #ifndef SENF_MULTI_CONNECTOR_MAX_ARGS #define SENF_MULTI_CONNECTOR_MAX_ARGS 3 #endif +#include "MultiConnectorMixin.mpp" +#include "MultiConnectorMixin.ih" +//-///////////////////////////////////////////////////////////////////////////////////////////////// + namespace senf { namespace ppi { - + #ifdef DOXYGEN // For exposition only. @@ -61,8 +59,8 @@ namespace ppi { */ template MultiConnectorSource::ConnectorType & connect( - MultiConnectorSource & source, Target & target, A1 const & a1); - + MultiConnectorSource & source, A1 const & a1, Target & target); + /** \brief Connect arbitrary source to MultiConnector target Additional implementations with 0..SENF_MULTI_CONNECTOR_MAX_ARGS arguments. @@ -73,9 +71,14 @@ namespace ppi { MultiConnectorTarget::ConnectorType & connect( Source & source, MultiConnectorTarget & target, A1 const & a1); + template + std::pair + connect( + MultiConnectorSource & source, MultiConnectorTarget & target, A1 const & a1, A2 const & a2); + #else - // Include 'senf::ppi::namespace member declarations' from MultiConnectorMixin.mpp + // Include 'senf::ppi namespace member declarations' from MultiConnectorMixin.mpp # define BOOST_PP_ITERATION_PARAMS_1 (4, ( \ 0, \ SENF_MULTI_CONNECTOR_MAX_ARGS, \ @@ -87,13 +90,15 @@ namespace ppi { namespace module { - /** \brief Multi connector management + namespace detail { class MultiConnectorMixinAccess; } + + /** \brief Multi-Connector management This mixin provides a module with support for a runtime configurable number of input or output connectors. \code - class MyModule - : public senf::ppi::module::Modulem, + class MyModule + : public senf::ppi::module::Module, public senf::ppi::module::MultiConnectorMixin< MyModule, senf::ppi::connector::ActiveInput<> > { @@ -110,13 +115,19 @@ namespace module { input.onThrottle(&MyModule::doThrottle); } + // Optional + void connectorDestroy(senf::ppi::connector::ActiveInput const & input) + { + // whatever + } + void doThrottle() - { + { // ... } friend class senf::ppi::module::MultiConnectorMixin< - MyModule, senf::ppi::connector::ActiveInput<> > + MyModule, senf::ppi::connector::ActiveInput<> >; } \endcode @@ -124,6 +135,7 @@ namespace module { \li inheriting from MultiConnectorMixin \li defining a function \c connectorSetup \li declaring the mixin as a friend + \li optionally defining \c connectorDestroy to be notified when connectors are disconnected The MultiConnectorMixin takes several template arguments \li the name of the derived class, \a Self_ @@ -141,10 +153,8 @@ namespace module { \code container().insert(begin(), container().pop_back().release()); \endcode - which will move the new connector from the end to the beginning. - \warning If you throw an exception from \c connectorSetup(), you must do so \e before moving - the new connector around since the mixin will remove the last element from the container - on an exception. + which will move the new connector from the end to the beginning. If you want to abort adding + the new connector, you may throw an exception. \par "Example:" senf::ppi::module::PriorityJoin @@ -156,7 +166,7 @@ namespace module { will this be written to the container only \e after \c connectorSetup() returns. When the returned key is not unique, the new connector will \e replace the old one. If this - is not, what you want, either check for an already existing member and throw an exception in + is not what you want, either check for an already existing member and throw an exception in \c connectorSetup() or replace the \c boost::ptr_map by a \c boost::ptr_multimap using the fourth template argument to MultiConnectorMixin. @@ -168,7 +178,7 @@ namespace module { allocate a new connector \code MyModule muModule; - + senf::ppi::connect(someModule, myModule); \endcode Some modules will expect additional arguments to be passed (see below) @@ -190,16 +200,19 @@ namespace module { \par "Advanced note:" These additional arguments are always passed by const-reference. If you need to pass a non-const reference, declare the \c connectorSetup() argument as non-const reference and wrap the real argument using \c boost::ref() (The reason for - this is known as 'The forwarding problem' + this is known as 'The forwarding problem'). \section senf_ppi_multiconnector_advanced Advanced usage: Managing your own container If you need to use a completely different type of container, you can take over the container management yourself. To do this, pass \c void as container type and change \c connectorSetup() to take an \c std::auto_ptr as argument. \c connectorSetup() must ensure to - save this connector in some container or throw an exception + save this connector in some container or throw an exception. + + Implementing \c connectorDestroy now is \e mandatory. The signature is changed to take a + pointer as argument \code - class MyModule + class MyModule : public senf::ppi::module::Module, public senf::ppi::module::MultiConnectorMixin< MyModule, senf::ppi::connector::ActiveInput<>, void, void > @@ -217,6 +230,15 @@ namespace module { connectors_.insert(connectors_.begin()+p,conn); } + void connectorDestroy(ConnectorType const * conn) + { + using boost::lambda::_1; + boost::ptr_vector::iterator i ( + std::find_if(connectors_.begin(),connectors_.end(), &_1==conn)) + if (i != connectors_.end()) + connectors_.erase(i); + } + boost::ptr_vector connectors_; }; \endcode @@ -225,12 +247,12 @@ namespace module { successfully, otherwise your code will break. */ - template ::type> - class MultiConnectorMixin + class MultiConnectorMixin : private detail::MultiConnectorSelectBase::type { public: @@ -238,30 +260,14 @@ namespace module { protected: typedef ContainerType_ ContainerType; ///< Type of connector container + ContainerType_ & connectors(); ///< Get connector container ContainerType_ const & connectors() const; ///< Get connectors container (const) + void connectorDestroy(ConnectorType const &); + private: -#if 0 - // For exposition only - // Other implementations with 0..SENF_MULTI_CONNECTOR_MAX_ARGS arguments accordingly - - tempalte - ConnectorType_ & newConnector(A1 const & a1); - - // See above for an additional note regarding the boost::enable_if in the real - // implementation - - template - friend Source::ConnectorType & senf::ppi::connect(Source & source, - Target & target, - A1 const & a1); - - template - friend Target::ConnectorType & senf::ppi::connect(Source & source, - Target & target, - A1 const & a1); -#endif + #ifndef DOXYGEN // Include 'MultiConnectorMixin member declaration' from MultiConnectorMixin.mpp @@ -273,7 +279,12 @@ namespace module { # include BOOST_PP_ITERATE() #endif - + + void disconnected(ConnectorType_ const & c); + + friend class detail::MultiConnectorMixinAccess; + friend class detail::MultiConnectorWrapper; + ContainerType_ connectors_; }; @@ -287,33 +298,16 @@ namespace module { { public: typedef ConnectorType_ ConnectorType; - + protected: typedef ContainerType_ ContainerType; + ContainerType_ & connectors(); + ContainerType_ const & connectors() const; - private: + void connectorDestroy(ConnectorType const &); -#if 0 - // For exposition only - // Other implementations with 0..SENF_MULTI_CONNECTOR_MAX_ARGS arguments accordingly - - tempalte - ConnectorType_ & newConnector(A1 const & a1); - - // See above for an additional note regarding the boost::enable_if in the real - // implementation - - template - friend Source::ConnectorType & senf::ppi::connect(Source & source, - Target & target, - A1 const & a1); - - template - friend Target::ConnectorType & senf::ppi::connect(Source & source, - Target & target, - A1 const & a1); -#endif + private: // Include 'MultiConnectorMixin member declaration' from MultiConnectorMixin.mpp # define BOOST_PP_ITERATION_PARAMS_1 (4, ( \ @@ -322,11 +316,16 @@ namespace module { SENF_ABSOLUTE_INCLUDE_PATH(PPI/MultiConnectorMixin.mpp), \ 1 )) # include BOOST_PP_ITERATE() - + + void disconnected(ConnectorType_ const & c); + + friend class detail::MultiConnectorMixinAccess; + friend class detail::MultiConnectorWrapper; + ContainerType_ connectors_; }; - template class MultiConnectorMixin : private detail::MultiConnectorSelectBase::type @@ -336,27 +335,6 @@ namespace module { private: -#if 0 - // For exposition only - // Other implementations with 0..SENF_MULTI_CONNECTOR_MAX_ARGS arguments accordingly - - tempalte - ConnectorType_ & newConnector(A1 const & a1); - - // See above for an additional note regarding the boost::enable_if in the real - // implementation - - template - friend Source::ConnectorType & senf::ppi::connect(Source & source, - Target & target, - A1 const & a1); - - template - friend Target::ConnectorType & senf::ppi::connect(Source & source, - Target & target, - A1 const & a1); -#endif - // Include 'MultiConnectorMixin member declaration' from MultiConnectorMixin.mpp # define BOOST_PP_ITERATION_PARAMS_1 (4, ( \ 0, \ @@ -364,15 +342,20 @@ namespace module { SENF_ABSOLUTE_INCLUDE_PATH(PPI/MultiConnectorMixin.mpp), \ 1 )) # include BOOST_PP_ITERATE() + + void disconnected(ConnectorType_ const & c); + + friend class detail::MultiConnectorMixinAccess; + friend class detail::MultiConnectorWrapper; }; #endif - + }}} -///////////////////////////////hh.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// //#include "MultiConnectorMixin.cci" -//#include "MultiConnectorMixin.ct" +#include "MultiConnectorMixin.ct" #include "MultiConnectorMixin.cti" #endif