//#include "Jack.test.ih"
// Custom includes
-#include "PPI.hh"
+#include "Jack.hh"
+#include "DebugModules.hh"
#include <senf/Utils/auto_unit_test.hh>
#include <boost/test/test_tools.hpp>
//#include "MultiConnectorMixin.test.ih"
// Custom includes
-#include "PPI.hh"
+#include "MultiConnectorMixin.hh"
+#include "DebugModules.hh"
+#include "Joins.hh"
+#include "AnnotationRouter.hh"
#include <senf/Utils/auto_unit_test.hh>
#include <boost/test/test_tools.hpp>
--- /dev/null
+// $Id$
+//
+// Copyright (C) 2010
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// Thorsten Horstmann <tho@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+/** \file
+ \brief QueueingSocketSink non-inline template implementation */
+
+//#include "QueueingSocketSink.ih"
+
+// Custom includes
+
+#define prefix_
+///////////////////////////////ct.p////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////
+// senf::ppi::FIFOQueueingAlgorithm<PacketType>
+
+template <typename PacketType>
+prefix_ senf::ppi::FIFOQueueingAlgorithm<PacketType>::FIFOQueueingAlgorithm(unsigned size)
+ : size_( size)
+{ }
+
+template <typename PacketType>
+prefix_ PacketType senf::ppi::FIFOQueueingAlgorithm<PacketType>::dequeue()
+{
+ if (queue_.size() > 0) {
+ PacketType const & p = queue_.front();
+ queue_.pop();
+ return p;
+ }
+ return PacketType();
+}
+
+template <typename PacketType>
+prefix_ bool senf::ppi::FIFOQueueingAlgorithm<PacketType>::enqueue(PacketType const & packet)
+{
+ if (queue_.size() < size_) {
+ queue_.push( packet);
+ return true;
+ }
+ return false;
+}
+
+template <typename PacketType>
+prefix_ void senf::ppi::FIFOQueueingAlgorithm<PacketType>::clear()
+{
+ while (! queue_.empty())
+ queue_.pop();
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::ppi::module::PassiveQueueingSocketSink<Writer>
+
+template <class Writer>
+template <class QAlgorithm>
+prefix_ senf::ppi::module::PassiveQueueingSocketSink<Writer>::PassiveQueueingSocketSink(Handle handle, QAlgorithm const & qAlgorithm)
+ : handle_( handle), writer_( ),
+ qAlgo_( new QAlgorithm(qAlgorithm)),
+ event_( handle_, IOEvent::Write)
+{
+ registerEvent( event_, &PassiveQueueingSocketSink::writable );
+ event_.enabled( false);
+ noroute(input);
+ input.onRequest( &PassiveQueueingSocketSink::write);
+ checkThrottle();
+}
+
+template <class Writer>
+prefix_ void senf::ppi::module::PassiveQueueingSocketSink<Writer>::write()
+{
+ PacketType p ( input.read());
+ if (qAlgo_->size() > 0) {
+ qAlgo_->enqueue( p);
+ return;
+ }
+ if (! writer_( handle_, p)) {
+ if (qAlgo_->enqueue( p) && !event_.enabled()) {
+ event_.enabled( true);
+ }
+ }
+}
+
+template <class Writer>
+prefix_ void senf::ppi::module::PassiveQueueingSocketSink<Writer>::writable()
+{
+ PacketType p (qAlgo_->dequeue());
+ if (p)
+ writer_( handle_, p);
+ if (qAlgo_->size() == 0) {
+ event_.enabled( false);
+ }
+}
+
+template <class Writer>
+prefix_ void senf::ppi::module::PassiveQueueingSocketSink<Writer>::checkThrottle()
+{
+ if (handle_.valid())
+ input.unthrottle();
+ else
+ input.throttle();
+}
+
+///////////////////////////////ct.e////////////////////////////////////////
+#undef prefix_
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
--- /dev/null
+// $Id$
+//
+// Copyright (C) 2010
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// Thorsten Horstmann <tho@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+/** \file
+ \brief QueueingSocketSink inline template implementation */
+
+//#include "QueueingSocketSink.ih"
+
+// Custom includes
+
+#define prefix_ inline
+///////////////////////////////cti.p///////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////
+// senf::ppi::FIFOQueueingAlgorithm<PacketType>
+
+template <typename PacketType>
+prefix_ unsigned senf::ppi::FIFOQueueingAlgorithm<PacketType>::size()
+ const
+{
+ return queue_.size();
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::ppi::module::PassiveQueueingSocketSink<Writer>
+
+template <class Writer>
+prefix_ Writer & senf::ppi::module::PassiveQueueingSocketSink<Writer>::writer()
+{
+ return writer_;
+}
+
+template <class Writer>
+prefix_ typename Writer::Handle & senf::ppi::module::PassiveQueueingSocketSink<Writer>::handle()
+{
+ return handle_;
+}
+
+template <class Writer>
+prefix_ void senf::ppi::module::PassiveQueueingSocketSink<Writer>::handle(Handle handle)
+{
+ handle_ = handle;
+ qAlgo_->clear();
+ checkThrottle();
+}
+
+template <class Writer>
+prefix_ senf::ppi::QueueingAlgorithm<typename senf::ppi::module::PassiveQueueingSocketSink<Writer>::PacketType> &
+senf::ppi::module::PassiveQueueingSocketSink<Writer>::qAlgorithm()
+{
+ return *qAlgo_;
+}
+
+
+///////////////////////////////cti.e///////////////////////////////////////
+#undef prefix_
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
--- /dev/null
+// $Id$
+//
+// Copyright (C) 2010
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// Thorsten Horstmann <tho@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+/** \file
+ \brief QueueingSocketSink public header */
+
+#ifndef HH_SENF_PPI_QueueingSocketSink_
+#define HH_SENF_PPI_QueueingSocketSink_ 1
+
+// Custom includes
+#include <queue>
+#include "SocketSink.hh"
+
+//#include "QueueingSocketSink.mpp"
+///////////////////////////////hh.p////////////////////////////////////////
+
+namespace senf {
+namespace ppi {
+
+ template <typename PacketType=Packet>
+ class QueueingAlgorithm
+ {
+ public:
+ virtual ~QueueingAlgorithm() {};
+ virtual PacketType dequeue() = 0;
+ virtual bool enqueue(PacketType const & packet) = 0;
+ virtual unsigned size() const = 0;
+ virtual void clear() = 0;
+ };
+
+ template <typename PacketType=Packet>
+ class FIFOQueueingAlgorithm : public QueueingAlgorithm<PacketType>
+ {
+ public:
+ FIFOQueueingAlgorithm(unsigned size);
+
+ virtual PacketType dequeue();
+ virtual bool enqueue(PacketType const & packet);
+ virtual unsigned size() const;
+ virtual void clear();
+
+ private:
+ std::queue<PacketType> queue_;
+ unsigned size_;
+ };
+
+
+namespace module {
+
+ /** \brief QueueingSocketSink
+
+ \ingroup io_modules
+ */
+ template <class Writer=ConnectedDgramWriter>
+ class PassiveQueueingSocketSink : public Module
+ {
+ SENF_PPI_MODULE(PassiveQueueingSocketSink);
+
+ public:
+ typedef typename Writer::Handle Handle; ///< Handle type requested by writer
+ typedef typename Writer::PacketType PacketType;
+
+ connector::PassiveInput<PacketType> input; ///< Input connector from which data is received
+
+ template <class QAlgorithm>
+ explicit PassiveQueueingSocketSink(Handle handle, QAlgorithm const & qAlgorithm);
+
+ Writer & writer(); ///< Access the Writer
+ Handle & handle(); ///< Access handle
+ void handle(Handle handle); ///< Set handle
+ /**< Assigning an empty or in-valid() handle will disable
+ the module until a new valid handle is assigned. */
+ QueueingAlgorithm<PacketType> & qAlgorithm();
+
+ private:
+ void write();
+ void writable();
+ void checkThrottle();
+
+ Handle handle_;
+ Writer writer_;
+ boost::scoped_ptr<QueueingAlgorithm<PacketType> > qAlgo_;
+ IOEvent event_;
+ };
+
+}}}
+
+///////////////////////////////hh.e////////////////////////////////////////
+//#include "QueueingSocketSink.cci"
+#include "QueueingSocketSink.ct"
+#include "QueueingSocketSink.cti"
+#endif
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
+// End:
--- /dev/null
+// $Id$
+//
+// Copyright (C) 2010
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// Thorsten Horstmann <tho@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+/** \file
+ \brief QueueingSocketSink unit tests */
+
+#include "QueueingSocketSink.hh"
+
+// Custom includes
+#include <senf/Socket/Protocols/INet/UDPSocketHandle.hh>
+#include <senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh>
+#include "DebugModules.hh"
+#include "SocketSink.hh"
+#include "Setup.hh"
+
+#include <senf/Utils/auto_unit_test.hh>
+#include <boost/test/test_tools.hpp>
+
+#define prefix_
+///////////////////////////////cc.p////////////////////////////////////////
+namespace ppi = senf::ppi;
+namespace module = ppi::module;
+namespace debug = module::debug;
+namespace scheduler = senf::scheduler;
+
+namespace {
+ void runPPI(senf::ClockService::clock_type t)
+ {
+ scheduler::TimerEvent timeout(
+ "test-timeout", &scheduler::terminate, scheduler::now() + t);
+ ppi::run();
+ }
+
+ int base_pid = 0;
+
+ unsigned port(unsigned i)
+ {
+ if (! base_pid)
+ base_pid = ::getpid();
+ return 23456u + (((base_pid^(base_pid>>8)^(base_pid>>16)^(base_pid>>24))&0xff)<<2) + i;
+ }
+
+ std::string localhost4str(unsigned i)
+ {
+ return (boost::format("localhost:%d") % port(i)).str();
+ }
+
+ struct TestingConnectedDgramWriter
+ : public ppi::ConnectedDgramWriter
+ {
+ bool throttled;
+
+ bool operator()(Handle handle, PacketType const & packet)
+ {
+ if (throttled)
+ return false;
+ return ConnectedDgramWriter::operator()( handle, packet);
+ }
+ };
+}
+
+SENF_AUTO_UNIT_TEST(passiveQueueingSocketSink)
+{
+ senf::ConnectedUDPv4ClientSocketHandle outputSocket (
+ senf::INet4SocketAddress( localhost4str(0)));
+ ppi::FIFOQueueingAlgorithm<TestingConnectedDgramWriter::PacketType> queueingAlgorithm ( 100);
+ module::PassiveQueueingSocketSink<TestingConnectedDgramWriter> udpSink (
+ outputSocket, queueingAlgorithm);
+ udpSink.writer().throttled = false;
+ debug::ActiveSource source;
+ ppi::connect(source, udpSink);
+ senf::ppi::init();
+
+ std::string data ("TEST");
+ senf::Packet p (senf::DataPacket::create(data));
+
+ senf::UDPv4ClientSocketHandle inputSocket;
+ inputSocket.bind(senf::INet4SocketAddress(localhost4str(0)));
+
+ source.submit(p);
+
+ std::string input (inputSocket.read());
+ BOOST_CHECK_EQUAL( data, input );
+ BOOST_CHECK_EQUAL( udpSink.qAlgorithm().size(), 0);
+
+ udpSink.writer().throttled = true;
+
+ source.submit(p);
+ BOOST_CHECK_EQUAL( udpSink.qAlgorithm().size(), 1);
+
+ udpSink.writer().throttled = false;
+
+ runPPI( senf::ClockService::milliseconds(200));
+
+ input = inputSocket.read();
+ BOOST_CHECK_EQUAL( data, input );
+ BOOST_CHECK_EQUAL( udpSink.qAlgorithm().size(), 0);
+}
+
+
+///////////////////////////////cc.e////////////////////////////////////////
+#undef prefix_
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
// Custom includes
#include "RateAnalyzer.hh"
-#include "PPI.hh"
+#include "CloneSource.hh"
+#include "RateFilter.hh"
+#include "Setup.hh"
#include <senf/Utils/auto_unit_test.hh>
#include <boost/test/test_tools.hpp>
protocolId_ = dest.port();
}
-prefix_ void senf::ppi::IPv4SourceForcingDgramWriter::operator()(Handle handle,
+prefix_ bool senf::ppi::IPv4SourceForcingDgramWriter::operator()(Handle handle,
Packet const & packet)
{
- sendtoandfrom(
+ return sendtoandfrom(
handle.fd(),
reinterpret_cast<void*> (&*packet.data().begin()),
packet.size(),
reinterpret_cast<in_addr*> (&destination_),
protocolId_,
- reinterpret_cast<in_addr*> (&source_));
+ reinterpret_cast<in_addr*> (&source_)) > 0;
}
prefix_ int senf::ppi::IPv4SourceForcingDgramWriter::sendtoandfrom(
protocolId_ = dest.port();
}
-prefix_ void senf::ppi::IPv6SourceForcingDgramWriter::operator()(Handle handle,
+prefix_ bool senf::ppi::IPv6SourceForcingDgramWriter::operator()(Handle handle,
Packet const & packet)
{
- sendtoandfrom(
+ return sendtoandfrom(
handle.fd(),
reinterpret_cast<void*> (&*packet.data().begin()),
packet.size(),
reinterpret_cast<in6_addr*> (&destination_),
protocolId_,
- reinterpret_cast<in6_addr*> (&source_));
+ reinterpret_cast<in6_addr*> (&source_)) > 0;
}
prefix_ int senf::ppi::IPv6SourceForcingDgramWriter::sendtoandfrom(
///////////////////////////////////////////////////////////////////////////
// senf::ppi::ConnectedDgramWriter
-prefix_ void senf::ppi::ConnectedDgramWriter::operator()(Handle handle,
+prefix_ bool senf::ppi::ConnectedDgramWriter::operator()(Handle handle,
Packet const & packet)
{
- handle.write(packet.data());
+ return handle.write(packet.data()) != packet.data().begin();
}
///////////////////////////////cci.e///////////////////////////////////////
}
template <class HandleType>
-prefix_ void senf::ppi::TargetDgramWriter<HandleType>::operator()(Handle handle,
+prefix_ bool senf::ppi::TargetDgramWriter<HandleType>::operator()(Handle handle,
Packet const & packet)
{
if (target_)
- handle.writeto(target_, packet.data());
+ return handle.writeto(target_, packet.data()) != packet.data().begin();
+ return false;
}
///////////////////////////////////////////////////////////////////////////
///< Handle type supported by this writer
typedef Packet PacketType;
- void operator()(Handle handle, Packet const & packet);
+ bool operator()(Handle handle, Packet const & packet);
///< Write \a packet to \a handle
/**< Write the complete \a packet as a datagram to \a
handle.
typename Handle::Address target() const; ///< Get current target address
void target(typename Handle::Address const & target); ///< Set target address
- void operator()(Handle handle, Packet const & packet); ///< Write \a packet to \a handle
+ bool operator()(Handle handle, Packet const & packet); ///< Write \a packet to \a handle
/**< Write the complete \a packet as a datagram to \a
handle.
\param[in] handle Handle to write data to
void destination(senf::INet4SocketAddress & dest);
senf::INet4SocketAddress destination();
- void operator()(Handle handle, Packet const & packet);
+ bool operator()(Handle handle, Packet const & packet);
///< Write \a packet to \a handle
/**< Write the complete \a packet as a datagram to \a
handle.
void destination(senf::INet6SocketAddress & dest);
senf::INet6SocketAddress destination();
- void operator()(Handle handle, Packet const & packet);
+ bool operator()(Handle handle, Packet const & packet);
///< Write \a packet to \a handle
/**< Write the complete \a packet as a datagram to \a
handle.
SomeWriter(); // EITHER default constructible OR
SomeWriter(SomeWriter const & other); // copy constructible
- void operator()(Handle handle, Packet packet); // insertion function
+ bool operator()(Handle handle, Packet packet); // insertion function
};
\endcode
Whenever a packet is received for sending, the \a Writer's \c operator() is called.
SomeWriter(); // EITHER default constructible
SomeWriter(SomeWriter const & other); // OR copy constructible
- void operator()(Handle handle, Packet packet); // insertion function
+ bool operator()(Handle handle, Packet packet); // insertion function
};
\endcode
Whenever a packet is received for sending, the \a Writer's \c operator() is called.
projects / senf.git / commitdiff