X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FRateStuffer%2Fratestuffer.cc;h=b9587d774971e6589e1f68632a0392a0aa25af13;hb=0aaf358bb221fa902aa291b66436206e7cb4de0c;hp=7c1d1c79b147686c4638c3623fdfef64dc57b692;hpb=77a726fdfa20680c691ba528fdad979422ef829c;p=senf.git diff --git a/Examples/RateStuffer/ratestuffer.cc b/Examples/RateStuffer/ratestuffer.cc index 7c1d1c7..b9587d7 100644 --- a/Examples/RateStuffer/ratestuffer.cc +++ b/Examples/RateStuffer/ratestuffer.cc @@ -1,24 +1,29 @@ // $Id$ // // Copyright (C) 2007 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer Satelitenkommunikation (SatCom) -// Stefan Bund +// Fraunhofer Institute for Open Communication Systems (FOKUS) // -// 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. +// The contents of this file are subject to the Fraunhofer FOKUS Public License +// Version 1.0 (the "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// http://senf.berlios.de/license.html // -// 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. +// The Fraunhofer FOKUS Public License Version 1.0 is based on, +// but modifies the Mozilla Public License Version 1.1. +// See the full license text for the amendments. // -// 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. +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the License. +// +// The Original Code is Fraunhofer FOKUS code. +// +// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. +// (registered association), Hansastraße 27 c, 80686 Munich, Germany. +// All Rights Reserved. +// +// Contributor(s): +// Stefan Bund /** \file \brief ppitest non-inline non-template implementation */ @@ -27,26 +32,18 @@ //#include "ppitest.ih" // Custom includes -#include "Socket/Protocols/INet/UDPSocketHandle.hh" -#include "Socket/Protocols/INet/ConnectedUDPSocketHandle.hh" -#include "Socket/Protocols/INet/INetAddressing.hh" -#include "PPI/SocketReader.hh" -#include "PPI/SocketWriter.hh" -#include "PPI/Module.hh" -#include "PPI/IntervalTimer.hh" -#include "PPI/Joins.hh" -#include "PPI/PassiveQueue.hh" -#include "PPI/Setup.hh" +#include +#include //#include "ppitest.mpp" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace module = senf::ppi::module; namespace connector = senf::ppi::connector; namespace ppi = senf::ppi; -// //////////////////////////////////////////////////////////////////////// +//-//////////////////////////////////////////////////////////////////////// // RateFilter class RateFilter @@ -55,8 +52,8 @@ class RateFilter SENF_PPI_MODULE(RateFilter); public: - connector::ActiveInput input; - connector::ActiveOutput output; + connector::ActiveInput<> input; + connector::ActiveOutput<> output; RateFilter(senf::ClockService::clock_type interval); @@ -67,11 +64,11 @@ private: }; RateFilter::RateFilter(senf::ClockService::clock_type interval) - : timer(interval) + : timer(interval) { route(input,timer); route(timer,output); - registerEvent(&RateFilter::timeout, timer); + registerEvent(timer, &RateFilter::timeout); } void RateFilter::timeout() @@ -79,76 +76,81 @@ void RateFilter::timeout() output(input()); } -// //////////////////////////////////////////////////////////////////////// -// CopyPacketGenerator +//-//////////////////////////////////////////////////////////////////////// -class CopyPacketGenerator - : public module::Module +class RateStuffer { - SENF_PPI_MODULE(CopyPacketGenerator); -public: - - connector::PassiveOutput output; - - CopyPacketGenerator(senf::Packet p); - -private: - void request(); + module::ThrottleBarrier barrier; + module::PassiveQueue queue; + module::CloneSource generator; + module::PriorityJoin join; + RateFilter rateFilter; - senf::Packet packet; +public: + connector::PassiveInput<> & input; + connector::ActiveOutput<> & output; + + RateStuffer(senf::ClockService::clock_type interval, + senf::Packet packet, + unsigned high = 1, + unsigned low = 0) + : barrier (), + queue (), + generator ( packet ), + join (), + rateFilter ( interval ), + input ( barrier.input ), + output ( rateFilter.output ) + { + ppi::connect( barrier, queue ); + ppi::connect( queue, join ); + ppi::connect( generator, join ); + ppi::connect( join, rateFilter ); + + queue.qdisc(ppi::ThresholdQueueing(high,low)); + } }; -CopyPacketGenerator::CopyPacketGenerator(senf::Packet p) - : packet(p) -{ - noroute(output); - output.onRequest(&CopyPacketGenerator::request); -} - -void CopyPacketGenerator::request() -{ - output(packet); -} - -// //////////////////////////////////////////////////////////////////////// -// //////////////////////////////////////////////////////////////////////// +//-//////////////////////////////////////////////////////////////////////// +//-//////////////////////////////////////////////////////////////////////// // Module setup: // // 'O' = active connector // '>' or '<' = input connector // -// [ udpReader ] O--> [ queue ] -->O [ ] -// [ join ] -->O [ rateFilter] O--> [ udpWriter ] -// [ generator ] -->O [ ] +// +----------------------------------------------------+ +// | stuffer | +// | | +// [ udpSource ] O-->:---> [ queue ] -->O [ ] | +// | [ join ] -->O [ rateFilter] O-->:O--> [ udpSink ] +// | [ generator ] -->O [ ] | +// | | +// +----------------------------------------------------+ int main(int argc, char * argv[]) { - senf::UDPv4ClientSocketHandle inputSocket; - inputSocket.bind(senf::INet4SocketAddress("0.0.0.0:44344")); + senf::UDPv4ClientSocketHandle inputSocket( + senf::INet4SocketAddress("0.0.0.0:44344")); senf::ConnectedUDPv4ClientSocketHandle outputSocket( senf::INet4SocketAddress("localhost:44345")); - module::ActiveSocketReader<> udpReader (inputSocket); - module::PassiveQueue queue; - CopyPacketGenerator generator (senf::DataPacket::create(std::string("\n"))); - module::PriorityJoin join; - RateFilter rateFilter (1000000000ul); - module::PassiveSocketWriter<> udpWriter (outputSocket); + module::ActiveSocketSource<> udpSource ( inputSocket ); + RateStuffer stuffer ( 1000000000ul, + senf::DataPacket::create(std::string("\n")), + 2u, 1u ); + module::PassiveSocketSink<> udpSink ( outputSocket ); - ppi::connect( udpReader, queue ); - ppi::connect( queue, join ); - ppi::connect( generator, join ); - ppi::connect( join, rateFilter ); - ppi::connect( rateFilter, udpWriter ); + ppi::connect( udpSource, stuffer ); + ppi::connect( stuffer, udpSink ); ppi::run(); return 0; } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_ //#include "ppitest.mpp"