X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FDebugModules.cci;h=132632675c1ec8c636603f13d42ec620e5dfbd7b;hb=92f8630b75f3ef50e73c48cde58645dcd1534e27;hp=5eac3c3022d6b2450fb7350227a79533e6659c67;hpb=e8b91aa6a817af6d9a3714e7b66be6c0d6b0a4e5;p=senf.git

diff --git a/PPI/DebugModules.cci b/PPI/DebugModules.cci
index 5eac3c3..1326326 100644
--- a/PPI/DebugModules.cci
+++ b/PPI/DebugModules.cci
@@ -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
@@ -24,6 +24,7 @@
     \brief DebugModules inline non-template implementation */
 
 // Custom includes
+#include "../Utils/senfassert.hh"
 #include "Setup.hh"
 
 #define prefix_ inline
@@ -37,7 +38,7 @@ prefix_ senf::ppi::module::debug::ActiveSource::ActiveSource()
     noroute(output);
 }
 
-prefix_ void senf::ppi::module::debug::ActiveSource::submit(Packet packet)
+prefix_ void senf::ppi::module::debug::ActiveSource::submit(Packet const & packet)
 {
     output(packet);
 }
@@ -67,7 +68,7 @@ prefix_ void senf::ppi::module::debug::PassiveSource::unthrottle()
     output.unthrottle();
 }
 
-prefix_ void senf::ppi::module::debug::PassiveSource::submit(Packet packet)
+prefix_ void senf::ppi::module::debug::PassiveSource::submit(Packet const & packet)
 {
     packets_.push_back(packet);
     output.unthrottle();
@@ -87,16 +88,7 @@ senf::ppi::module::debug::PassiveSource::size()
 ////////////////////////////////////////
 // private members
 
-prefix_ void senf::ppi::module::debug::PassiveSource::request()
-{
-    BOOST_ASSERT( ! packets_.empty() );
-    output(packets_.front());
-    packets_.pop_front();
-    if (packets_.empty())
-        output.throttle();
-}
-
-prefix_ void senf::ppi::module::debug::PassiveSource::init()
+prefix_ void senf::ppi::module::debug::PassiveSource::v_init()
 {
     if (empty())
         output.throttle();
@@ -174,7 +166,7 @@ prefix_ senf::Packet senf::ppi::module::debug::PassiveSink::front()
 prefix_ senf::Packet senf::ppi::module::debug::PassiveSink::pop_front()
 {
     Packet p (front());
-    if (p) 
+    if (p)
         packets_.pop_front();
     return p;
 }
@@ -184,14 +176,6 @@ prefix_ void senf::ppi::module::debug::PassiveSink::clear()
     packets_.erase(packets_.begin(), packets_.end());
 }
 
-////////////////////////////////////////
-// private members
-
-prefix_ void senf::ppi::module::debug::PassiveSink::request()
-{
-    packets_.push_back(input());
-}
-
 ///////////////////////////////////////////////////////////////////////////
 // senf::ppi::module::debug::ActiveFeederSource