X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FTarget.cci;h=c7854973df34fbb0a7841109961d36213192ca9b;hb=412024ed31a4ab4eaea7a4165a434f8efebee325;hp=da1ee4ed73f7008614f32b997387ef7ca0dd58f6;hpb=82ad2ed94c12c3e53097fef92978de8c28239fab;p=senf.git diff --git a/Utils/Logger/Target.cci b/Utils/Logger/Target.cci index da1ee4e..c785497 100644 --- a/Utils/Logger/Target.cci +++ b/Utils/Logger/Target.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 // // This program is free software; you can redistribute it and/or modify @@ -26,6 +26,7 @@ #include "Target.ih" // Custom includes +#include "AreaRegistry.hh" #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// @@ -33,6 +34,16 @@ /////////////////////////////////////////////////////////////////////////// // senf::log::Target +prefix_ void senf::log::Target::route(action_t action, int index) +{ + route(0, 0, NONE::value, action, index); +} + +prefix_ void senf::log::Target::unroute(action_t action) +{ + unroute(0, 0, NONE::value, action); +} + prefix_ senf::log::Target::iterator senf::log::Target::begin() const { @@ -94,23 +105,21 @@ prefix_ senf::log::Target::action_t senf::log::Target::RoutingEntry::action() /////////////////////////////////////////////////////////////////////////// // senf::log::detail::TargetRegistry -prefix_ void senf::log::detail::TargetRegistry::write(StreamBase const & stream, - AreaBase const & area, unsigned level, - std::string msg) +prefix_ void senf::log::detail::TargetRegistry::routed() { - area.write((*timeSource_)(), stream, level, msg); + fallbackRouting_ = false; } -prefix_ void senf::log::detail::TargetRegistry::timeSource(std::auto_ptr source) +prefix_ bool senf::log::detail::TargetRegistry::fallbackRouting() { - timeSource_.reset(source.release()); + return fallbackRouting_; } //////////////////////////////////////// // private members prefix_ senf::log::detail::TargetRegistry::TargetRegistry() - : timeSource_(new SystemTimeSource()) + : fallbackRouting_(true) {} prefix_ void senf::log::detail::TargetRegistry::registerTarget(Target * target) @@ -123,14 +132,6 @@ prefix_ void senf::log::detail::TargetRegistry::unregisterTarget(Target * target targets_.erase(target); } -/////////////////////////////////////////////////////////////////////////// -// namespace senf::log members - -prefix_ void senf::log::timeSource(std::auto_ptr source) -{ - detail::TargetRegistry::instance().timeSource(source); -} - /////////////////////////////cci.e/////////////////////////////////////// #undef prefix_