X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FTarget.cci;h=7e02f9103d575816da3a879b7eabc85978d29953;hb=6cfb0a8ca46d3cb0cc521a75118027ecc3fa4ef1;hp=ed2c0d9d04fed9862c5101337289d7e5bd3d1e63;hpb=17e24d84603667395e9ffa786a9cdbb722bf9c1f;p=senf.git

diff --git a/Utils/Logger/Target.cci b/Utils/Logger/Target.cci
index ed2c0d9..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
@@ -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
 {
@@ -45,6 +56,24 @@ prefix_ senf::log::Target::iterator senf::log::Target::end()
     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
 
@@ -59,6 +88,7 @@ prefix_ senf::log::Target::RoutingEntry::RoutingEntry()
 {}
 
 prefix_ bool senf::log::Target::RoutingEntry::operator==(RoutingEntry const & other)
+    const
 { 
     return 
         stream_ == other.stream_ && 
@@ -94,11 +124,6 @@ prefix_ senf::log::Target::action_t senf::log::Target::RoutingEntry::action()
 ///////////////////////////////////////////////////////////////////////////
 // senf::log::detail::TargetRegistry
 
-prefix_ void senf::log::detail::TargetRegistry::timeSource(std::auto_ptr<TimeSource> source)
-{
-    timeSource_.reset(source.release());
-}
-
 prefix_ void senf::log::detail::TargetRegistry::routed()
 {
     fallbackRouting_ = false;
@@ -109,31 +134,19 @@ prefix_ bool senf::log::detail::TargetRegistry::fallbackRouting()
     return fallbackRouting_;
 }
 
-////////////////////////////////////////
-// private members
-
-prefix_ senf::log::detail::TargetRegistry::TargetRegistry()
-    : timeSource_(new SystemTimeSource()), fallbackRouting_(true)
-{}
-
-prefix_ void senf::log::detail::TargetRegistry::registerTarget(Target * target)
+prefix_ senf::console::ScopedDirectory<> & senf::log::detail::TargetRegistry::consoleDir()
 {
-    targets_.insert(target);
+    return consoleDir_();
 }
 
+////////////////////////////////////////
+// private members
+
 prefix_ void senf::log::detail::TargetRegistry::unregisterTarget(Target * target)
 {
     targets_.erase(target);
 }
 
-///////////////////////////////////////////////////////////////////////////
-// namespace senf::log members
-
-prefix_ void senf::log::timeSource(std::auto_ptr<TimeSource> source)
-{
-    detail::TargetRegistry::instance().timeSource(source);
-}
-
 /////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_