X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FTarget.cci;h=c7854973df34fbb0a7841109961d36213192ca9b;hb=412024ed31a4ab4eaea7a4165a434f8efebee325;hp=1aa5b77b2941fe4fc77f923f865ce635ae872029;hpb=0d797005aea3471b1d4311709232ccf2c292f3c5;p=senf.git diff --git a/Utils/Logger/Target.cci b/Utils/Logger/Target.cci index 1aa5b77..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 @@ -23,9 +23,10 @@ /** \file \brief Target inline non-template implementation */ -//#include "Target.ih" +#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 { @@ -70,13 +81,13 @@ prefix_ bool senf::log::Target::RoutingEntry::operator==(RoutingEntry const & ot prefix_ std::string senf::log::Target::RoutingEntry::stream() const { - return stream_->v_name(); + return stream_ ? stream_->v_name() : ""; } prefix_ std::string senf::log::Target::RoutingEntry::area() const { - return area_->v_name(); + return area_ ? area_->v_name() : ""; } prefix_ unsigned senf::log::Target::RoutingEntry::level() @@ -92,14 +103,31 @@ prefix_ senf::log::Target::action_t senf::log::Target::RoutingEntry::action() } /////////////////////////////////////////////////////////////////////////// -// senf::log::TargetRegistry +// senf::log::detail::TargetRegistry + +prefix_ void senf::log::detail::TargetRegistry::routed() +{ + fallbackRouting_ = false; +} + +prefix_ bool senf::log::detail::TargetRegistry::fallbackRouting() +{ + return fallbackRouting_; +} + +//////////////////////////////////////// +// private members + +prefix_ senf::log::detail::TargetRegistry::TargetRegistry() + : fallbackRouting_(true) +{} -prefix_ void senf::log::TargetRegistry::registerTarget(Target * target) +prefix_ void senf::log::detail::TargetRegistry::registerTarget(Target * target) { targets_.insert(target); } -prefix_ void senf::log::TargetRegistry::unregisterTarget(Target * target) +prefix_ void senf::log::detail::TargetRegistry::unregisterTarget(Target * target) { targets_.erase(target); }