removed some useless spaces; not very important, I know :)

[senf.git] / PPI / DebugModules.hh

diff --git a/PPI/DebugModules.hh b/PPI/DebugModules.hh
index 67068d1..536a10c 100644 (file)
--- a/PPI/DebugModules.hh
+++ b/PPI/DebugModules.hh
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Copyright (C) 2007
+// 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
@@ -28,11 +28,11 @@
 
 // Custom includes
 #include <deque>
-#include "../Utils/SafeBool.hh"
+#include "../Utils/safe_bool.hh"
 #include "../Packets/Packets.hh"
 #include "Module.hh"
 #include "ActiveFeeder.hh"
-#include "../Utils/Logger.hh"
+#include "../Utils/Logger/SenfLog.hh"
 
 //#include "DebugModules.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
@@ -41,7 +41,7 @@ namespace senf {
 namespace ppi {
 namespace module {
 namespace debug {
-    
+
     /** \namespace senf::ppi::module::debug
         \brief Debug modules
 
@@ -49,7 +49,7 @@ namespace debug {
         manually pass packets into a network and read back the output packets.
 
         There are three categories of modules:
-    
+
         \li <i>Active modules</i> (ActiveSource, ActiveSink) are triggered by external
             calls. Calling \c submit() / \c request() will send the request into the module network
             synchronously. From this it follows, that senf::ppi::run() should \e not be
@@ -74,13 +74,13 @@ namespace debug {
             signaled in the network</em>.
      */
     class ActiveSource
-        : public Module, 
-          public SafeBool<ActiveSource>
+        : public Module,
+          public safe_bool<ActiveSource>
     {
         SENF_PPI_MODULE(ActiveSource);
 
     public:
-        connector::ActiveOutput output;
+        connector::ActiveOutput<> output;
 
         ActiveSource();
 
@@ -91,7 +91,7 @@ namespace debug {
     };
 
     /** \brief Debug packet source with passive output
-        
+
         This module provides a queue of packets for reading by the network. Each submit() call adds
         a packet to the queue which will be sent into the network when requested. The output is
         automatically throttled when the queue becomes empty.
@@ -105,14 +105,14 @@ namespace debug {
 
     public:
         typedef Queue::size_type size_type;
-        
-        connector::PassiveOutput output;
+
+        connector::PassiveOutput<> output;
 
         PassiveSource();
 
         void throttle();                ///< Throttle output connector
         void unthrottle();              ///< Unthrottle output connector
-        
+
         void submit(Packet packet);     ///< Enqueue packet
 
         bool empty();                   ///< \c true if queue is empty
@@ -121,10 +121,10 @@ namespace debug {
     private:
         void request();
         void init();
-        
+
         Queue packets_;
     };
-    
+
     /** \brief Debug packet sink with active input
 
         This module requests packets from the network. Each call to request() will pass a packet
@@ -136,12 +136,12 @@ namespace debug {
      */
     class ActiveSink
         : public Module,
-          public SafeBool<ActiveSink>
+          public safe_bool<ActiveSink>
     {
         SENF_PPI_MODULE(ActiveSink);
 
     public:
-        connector::ActiveInput input;
+        connector::ActiveInput<> input;
 
         ActiveSink();
 
@@ -167,7 +167,7 @@ namespace debug {
         typedef Queue::size_type size_type;
         typedef Queue::const_iterator iterator;
 
-        connector::PassiveInput input;
+        connector::PassiveInput<> input;
 
         PassiveSink();
 
@@ -191,7 +191,7 @@ namespace debug {
     };
 
     /** \brief Active, queue-based packet source
-        
+
         The ActiveFeederSource contains a packet queue containing the packets to be precessed. These
         packets are actively fed into the network when it is run with senf::ppi::run() until it is
         empty, when senf::ppi::run() will return.
@@ -212,8 +212,8 @@ namespace debug {
 
     public:
         typedef PassiveSource::size_type size_type;
-        
-        connector::ActiveOutput & output;
+
+        connector::ActiveOutput<> & output;
 
         ActiveFeederSource();
 
@@ -223,7 +223,7 @@ namespace debug {
     };
 
     /** \brief Active, queue-based packet sink
-    
+
         The ActiveFeederSink contains a packet queue to receive the packets from the network. The
         ActiveFeederSink will actively request packets from the network until it's input is
         throttled.
@@ -234,7 +234,7 @@ namespace debug {
             eventually or senf::ppi::run will not return.
 
         ActiveFeederSink is not a module but a collection of two modules: a PassiveSink and an
-        ActiveFeeder. 
+        ActiveFeeder.
      */
     class ActiveFeederSink
     {
@@ -246,8 +246,8 @@ namespace debug {
         typedef PassiveSink::size_type size_type;
         typedef PassiveSink::iterator iterator;
 
-        connector::ActiveInput & input;
-        
+        connector::ActiveInput<> & input;
+
         ActiveFeederSink();
 
         bool empty();
@@ -260,14 +260,14 @@ namespace debug {
 
         void clear();
     };
-   
+
     /** \brief Log received packets
 
         This module will log all packets sent to it's input using SENF_LOG to the given log
         \a Stream, \a Area and \a Level.
      */
-    template < class Stream = log::Debug, 
-               class Area   = log::DefaultArea, 
+    template < class Stream = log::Debug,
+               class Area   = log::DefaultArea,
                class Level  = log::VERBOSE >
     class LogSink
         : public module::Module
@@ -275,7 +275,7 @@ namespace debug {
         SENF_PPI_MODULE(LogSink);
     public:
 
-        connector::PassiveInput input;
+        connector::PassiveInput<> input;
 
         LogSink();