senfscons: Fix 'Object' build helper to work with empty source list in SCons 0.96.1

[senf.git] / Examples / RateStuffer / ratestuffer.cc

diff --git a/Examples/RateStuffer/ratestuffer.cc b/Examples/RateStuffer/ratestuffer.cc
index 7969d59..631210e 100644 (file)
--- a/Examples/RateStuffer/ratestuffer.cc
+++ b/Examples/RateStuffer/ratestuffer.cc
@@ -27,19 +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/ThrottleBarrier.hh"
-#include "PPI/PassiveQueue.hh"
-#include "PPI/Queueing.hh"
-#include "PPI/CloneSource.hh"
-#include "PPI/Setup.hh"
+#include <senf/Socket/Protocols/INet.hh>
+#include <senf/PPI.hh>
 
 //#include "ppitest.mpp"
 #define prefix_
@@ -74,7 +63,7 @@ RateFilter::RateFilter(senf::ClockService::clock_type interval)
 {
     route(input,timer);
     route(timer,output);
-    registerEvent(&RateFilter::timeout, timer);
+    registerEvent(timer, &RateFilter::timeout);
 }
 
 void RateFilter::timeout()
@@ -128,28 +117,28 @@ public:
 //                   +----------------------------------------------------+
 //                   | stuffer                                            |
 //                   |                                                    |
-// [ udpReader ] O-->:---> [ queue ] -->O [      ]                        |
-//                   |                    [ join ] -->O [ rateFilter] O-->:O--> [ udpWriter ]
+// [ 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::ActiveSocketSource<>  udpSource  ( inputSocket );
     RateStuffer                   stuffer    ( 1000000000ul, 
                                                senf::DataPacket::create(std::string("<idle>\n")),
                                                2u, 1u );
-    module::PassiveSocketWriter<> udpWriter  ( outputSocket );
+    module::PassiveSocketSink<> udpSink  ( outputSocket );
 
-    ppi::connect( udpReader, stuffer   );
-    ppi::connect( stuffer,   udpWriter );
+    ppi::connect( udpSource, stuffer   );
+    ppi::connect( stuffer,   udpSink );
 
     ppi::run();