X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FTarget.cci;h=7e02f9103d575816da3a879b7eabc85978d29953;hb=a1fdb7bb122f0b05be809a922d4b7ef5e125fa67;hp=5261bdb4dceb85648601cca913bfde683f3ee597;hpb=56ec4faa5dcae61746a78375cb7de605d0b79738;p=senf.git

diff --git a/Utils/Logger/Target.cci b/Utils/Logger/Target.cci
index 5261bdb..7e02f91 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 <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -23,10 +23,10 @@
 /** \file
     \brief Target inline non-template implementation */
 
-//#include "Target.ih"
+#include "Target.ih"
 
 // Custom includes
-#include <algorithm>
+#include "AreaRegistry.hh"
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
@@ -34,18 +34,46 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::log::Target
 
-prefix_ iterator senf::log::Target::begin()
+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
 {
     return rib_.begin();
 }
 
-prefix_ iterator senf::log::Target::end()
+prefix_ senf::log::Target::iterator senf::log::Target::end()
     const
 {
     return rib_.end();
 }
 
+prefix_ senf::log::Target::RoutingEntry const & senf::log::Target::operator[](size_type i)
+    const
+{
+    return rib_[i];
+}
+
+prefix_ senf::log::Target::size_type senf::log::Target::size()
+    const
+{
+    return rib_.size();
+}
+
+prefix_ bool senf::log::Target::empty()
+    const
+{
+    return rib_.empty();
+}
+
 ///////////////////////////////////////////////////////////////////////////
 // senf::log::Target::RoutingEntry
 
@@ -60,6 +88,7 @@ prefix_ senf::log::Target::RoutingEntry::RoutingEntry()
 {}
 
 prefix_ bool senf::log::Target::RoutingEntry::operator==(RoutingEntry const & other)
+    const
 { 
     return 
         stream_ == other.stream_ && 
@@ -71,13 +100,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()
@@ -93,14 +122,27 @@ prefix_ senf::log::Target::action_t senf::log::Target::RoutingEntry::action()
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::log::TargetRegistry
+// senf::log::detail::TargetRegistry
 
-prefix_ void senf::log::TargetRegistry::registerTarget(Target * target)
+prefix_ void senf::log::detail::TargetRegistry::routed()
 {
-    targets_.insert(target);
+    fallbackRouting_ = false;
 }
 
-prefix_ void senf::log::TargetRegistry::unregisterTarget(Target * target)
+prefix_ bool senf::log::detail::TargetRegistry::fallbackRouting()
+{
+    return fallbackRouting_;
+}
+
+prefix_ senf::console::ScopedDirectory<> & senf::log::detail::TargetRegistry::consoleDir()
+{
+    return consoleDir_();
+}
+
+////////////////////////////////////////
+// private members
+
+prefix_ void senf::log::detail::TargetRegistry::unregisterTarget(Target * target)
 {
     targets_.erase(target);
 }