X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FRateStuffer%2Fratestuffer.cc;h=6f6a63423d70a59577bc9455ad077b78299ff3b1;hb=20c3dbf64b3beed10655dceaee5791680fb25383;hp=7c1d1c79b147686c4638c3623fdfef64dc57b692;hpb=77a726fdfa20680c691ba528fdad979422ef829c;p=senf.git

diff --git a/Examples/RateStuffer/ratestuffer.cc b/Examples/RateStuffer/ratestuffer.cc
index 7c1d1c7..6f6a634 100644
--- a/Examples/RateStuffer/ratestuffer.cc
+++ b/Examples/RateStuffer/ratestuffer.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -27,16 +27,8 @@
 //#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 <senf/Socket/Protocols/INet.hh>
+#include <senf/PPI.hh>
 
 //#include "ppitest.mpp"
 #define prefix_
@@ -55,8 +47,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 +59,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()
@@ -80,36 +72,40 @@ void RateFilter::timeout()
 }
 
 // ////////////////////////////////////////////////////////////////////////
-// CopyPacketGenerator
 
-class CopyPacketGenerator
-    : public module::Module
+class RateStuffer
 {
-    SENF_PPI_MODULE(CopyPacketGenerator);
-public:
-
-    connector::PassiveOutput output;
-
-    CopyPacketGenerator(senf::Packet p);
+    module::ThrottleBarrier barrier;
+    module::PassiveQueue    queue;
+    module::CloneSource     generator;
+    module::PriorityJoin    join;
+    RateFilter              rateFilter;
 
-private:
-    void request();
-
-    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);
-}
-
 // ////////////////////////////////////////////////////////////////////////
 // ////////////////////////////////////////////////////////////////////////
 
@@ -118,30 +114,31 @@ void CopyPacketGenerator::request()
 // '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("<idle>\n")));
-    module::PriorityJoin          join;
-    RateFilter                    rateFilter (1000000000ul);
-    module::PassiveSocketWriter<> udpWriter  (outputSocket);
-
-    ppi::connect( udpReader,  queue      );
-    ppi::connect( queue,      join       );
-    ppi::connect( generator,  join       );
-    ppi::connect( join,       rateFilter );
-    ppi::connect( rateFilter, udpWriter  );
+    module::ActiveSocketSource<>  udpSource ( inputSocket );
+    RateStuffer                   stuffer   ( 1000000000ul,
+                                              senf::DataPacket::create(std::string("<idle>\n")),
+                                              2u, 1u );
+    module::PassiveSocketSink<>   udpSink   ( outputSocket );
+
+    ppi::connect( udpSource, stuffer   );
+    ppi::connect( stuffer,   udpSink );
 
     ppi::run();