// $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
\brief Target non-inline non-template implementation */
#include "Target.hh"
-//#include "Target.ih"
+#include "Target.ih"
// Custom includes
+#include <algorithm>
+#include "ConsoleTarget.hh"
//#include "Target.mpp"
#define prefix_
prefix_ senf::log::Target::Target()
{
- TargetRegistry::instance().registerTarget(this);
+ detail::TargetRegistry::instance().registerTarget(this);
}
prefix_ senf::log::Target::~Target()
// This is terribly slow but simplifies the area cache handling and removing a target should
// be quite seldom
RIB::reverse_iterator i (rib_.rbegin());
- unroute(i->stream, i->area, i->level, i->action);
+ unroute(i->stream_, i->area_, i->level_, i->action_);
}
- TargetRegistry::instance().unregisterTarget(this);
+ detail::TargetRegistry::instance().unregisterTarget(this);
+}
+
+prefix_ void senf::log::Target::route(std::string const & stream, std::string const & area,
+ unsigned level, action_t action, int index)
+{
+ detail::StreamBase const * s (StreamRegistry::instance().lookup(stream));
+ if (!s)
+ throw InvalidStreamException();
+ detail::AreaBase const * a (0);
+ if (! area.empty()) {
+ a = AreaRegistry::instance().lookup(area);
+ if (!a)
+ throw InvalidAreaException();
+ }
+ route(s, a, level, action, index);
+}
+
+prefix_ void senf::log::Target::unroute(std::string const & stream, std::string const & area,
+ unsigned level, action_t action)
+{
+ detail::StreamBase const * s (StreamRegistry::instance().lookup(stream));
+ if (!s)
+ throw InvalidStreamException();
+ detail::AreaBase const * a (0);
+ if (! area.empty()) {
+ a = AreaRegistry::instance().lookup(area);
+ if (!a)
+ throw InvalidAreaException();
+ }
+ unroute(s, a, level, action);
+}
+
+prefix_ void senf::log::Target::unroute(int index)
+{
+ RIB::iterator i;
+ if (index < 0) {
+ if (RIB::size_type(-index) >= rib_.size())
+ i = rib_.begin();
+ else {
+ i = rib_.end();
+ std::advance(i, index);
+ }
+ } else {
+ if (RIB::size_type(index+1) >= rib_.size()) {
+ i = rib_.end();
+ --i;
+ } else {
+ i = rib_.begin();
+ std::advance(i, index);
+ }
+ }
+ if (i == rib_.end())
+ return;
+ RoutingEntry entry (*i);
+ rib_.erase(i);
+ if (entry.action_ == ACCEPT)
+ updateRoutingCache(entry.stream_, entry.area_);
+}
+
+////////////////////////////////////////
+// private members
+
+prefix_ void senf::log::Target::route(detail::StreamBase const * stream,
+ detail::AreaBase const * area, unsigned level,
+ action_t action, int index)
+{
+ RIB::iterator i;
+ if (index < 0) {
+ if (RIB::size_type(-index-1) >= rib_.size())
+ i = rib_.begin();
+ else {
+ i = rib_.end();
+ std::advance(i, index + 1 );
+ }
+ } else {
+ if (RIB::size_type(index) >= rib_.size())
+ i = rib_.end();
+ else {
+ i = rib_.begin();
+ std::advance(i, index);
+ }
+ }
+ rib_.insert(i, RoutingEntry(stream, area, level, action));
+ if (action == ACCEPT)
+ updateRoutingCache(stream, area);
+ // This disables the initial fallback routing
+ detail::TargetRegistry::instance().routed();
+}
+
+prefix_ void senf::log::Target::unroute(detail::StreamBase const * stream,
+ detail::AreaBase const * area, unsigned level,
+ action_t action)
+{
+ RIB::iterator i = std::find(rib_.begin(), rib_.end(),
+ RoutingEntry(stream, area, level, action));
+ if (i != rib_.end())
+ unroute(std::distance(rib_.begin(), i));
}
prefix_ void senf::log::Target::updateRoutingCache(detail::StreamBase const * stream,
RIB::iterator i (rib_.begin());
RIB::iterator const i_end (rib_.end());
for(; i != i_end; ++i)
- if ( (! i->stream || i->stream == stream) &&
- (! i->area || i->area == area) &&
- i->action == ACCEPT ) {
- unsigned l (i->level == NONE::value ? i->stream->defaultRuntimeLimit() : i->level);
+ if ( (! i->stream_ || i->stream_ == stream) &&
+ (! i->area_ || i->area_ == area) &&
+ i->action_ == ACCEPT ) {
+ unsigned l (i->level_ == NONE::value ? i->stream_->defaultRuntimeLimit() : i->level_);
if (l < limit)
limit = l;
}
RIB::iterator i (rib_.begin());
RIB::iterator const i_end (rib_.end());
for (; i != i_end; ++i)
- if ( (! i->stream || i->stream == &stream) &&
- (! i->area || i->area == &area) &&
- (i->level == NONE::value ? i->stream->defaultRuntimeLimit() : i->level) <= level ) {
- if (i->action == ACCEPT)
+ if ( (! i->stream_ || i->stream_ == &stream) &&
+ (! i->area_ || i->area_ == &area) &&
+ (i->level_ == NONE::value ? i->stream_->defaultRuntimeLimit() : i->level_) <= level ) {
+ if (i->action_ == ACCEPT)
v_write(timestamp, stream.v_name(), area.v_name(), level, message);
return;
}
}
///////////////////////////////////////////////////////////////////////////
-// senf::log::TargetRegistry
+// senf::log::detail::TargetRegistry
+
+prefix_ void senf::log::detail::TargetRegistry::write(StreamBase const & stream,
+ AreaBase const & area, unsigned level,
+ std::string msg)
+{
+ if (fallbackRouting_)
+ static_cast<Target &>(ConsoleTarget::instance()).v_write(
+ (*timeSource_)(), stream.v_name(), area.v_name(), level, msg );
+ else
+ area.write( (*timeSource_)(), stream, level, msg );
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::log::TimeSource
+
+prefix_ senf::log::TimeSource::~TimeSource()
+{}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::log::SystemTimeSource
-prefix_ void senf::log::TargetRegistry::write(detail::StreamBase const & stream,
- detail::AreaBase const & area, unsigned level,
- std::string msg)
+prefix_ boost::posix_time::ptime senf::log::SystemTimeSource::operator()()
+ const
{
- boost::posix_time::ptime timestamp (boost::posix_time::microsec_clock::universal_time());
- area.write(timestamp, stream, level, msg);
+ return boost::posix_time::microsec_clock::universal_time();
}
///////////////////////////////cc.e////////////////////////////////////////
projects / senf.git / blobdiff