X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FDebugModules.cci;h=132632675c1ec8c636603f13d42ec620e5dfbd7b;hb=bd9f9d3fd6fbcff0112a7bf48ab9284da9576b11;hp=22fabd5e1cc8f06dc8e30d7dd3efc21f3ce2a38d;hpb=51044eb18f034c1a059ffe2fb109a422c1cbe251;p=senf.git diff --git a/PPI/DebugModules.cci b/PPI/DebugModules.cci index 22fabd5..1326326 100644 --- a/PPI/DebugModules.cci +++ b/PPI/DebugModules.cci @@ -1,8 +1,8 @@ // $Id$ // -// Copyright (C) 2007 -// Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Copyright (C) 2007 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund // // This program is free software; you can redistribute it and/or modify @@ -38,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); } @@ -68,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(); @@ -88,16 +88,7 @@ senf::ppi::module::debug::PassiveSource::size() //////////////////////////////////////// // private members -prefix_ void senf::ppi::module::debug::PassiveSource::request() -{ - SENF_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(); @@ -175,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; } @@ -185,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