//
// 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
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+// http://senf.berlios.de/license.html
//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on,
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V.
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+// Stefan Bund <g0dil@berlios.de>
/** \file
\brief PacketImpl inline non-template implementation */
// Custom includes
-#include <senf/Utils/senfassert.hh>
-// #include "PacketInterpreter.hh"
#define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::detail::AnnotationRegistry
-prefix_ void senf::detail::AnnotationRegistry::dump(key_t key, std::ostream & os,
- void * annotation)
+prefix_ std::string senf::detail::AnnotationRegistry::name(key_type key)
const
{
Registry::const_iterator i (registry_.find(key));
- if (i != registry_.end()) {
- os << fieldName(i->second->v_name());
- i->second->v_dump(os, annotation);
- os << "\n";
- }
+ return i == registry_.end() ? "" : i->second->v_name();
}
-prefix_ std::string senf::detail::AnnotationRegistry::name(key_t key)
+prefix_ bool senf::detail::AnnotationRegistry::isComplex(key_type key)
const
{
Registry::const_iterator i (registry_.find(key));
- return i == registry_.end() ? "" : i->second->v_name();
+ return i != registry_.end() && i->second->v_isComplex();
}
-prefix_ bool senf::detail::AnnotationRegistry::isComplex(key_t key)
+prefix_ unsigned senf::detail::AnnotationRegistry::size(key_type key)
const
{
Registry::const_iterator i (registry_.find(key));
- return i != registry_.end() && i->second->v_isComplex();
+ return i == registry_.end() ? 0 : i->second->v_size();
}
-prefix_ unsigned senf::detail::AnnotationRegistry::size(key_t key)
+prefix_ senf::detail::AnnotationRegistry::iterator senf::detail::AnnotationRegistry::begin()
const
{
- Registry::const_iterator i (registry_.find(key));
- return i == registry_.end() ? 0 : i->second->v_size();
+ return boost::make_transform_iterator(index_.begin(),
+ __gnu_cxx::select2nd<Index::value_type>());
+}
+
+prefix_ senf::detail::AnnotationRegistry::iterator senf::detail::AnnotationRegistry::end()
+ const
+{
+ return boost::make_transform_iterator(index_.end(),
+ __gnu_cxx::select2nd<Index::value_type>());
}
prefix_ senf::detail::AnnotationRegistry::AnnotationRegistry()
: simpleAnnotationCount_ (0), complexAnnotationCount_ (0)
{}
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// Memory management:
//
// The last three also modify the impl_ member accordingly by calling
// PacketInterpreterBase::assign/release
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::detail::PacketImpl
prefix_ senf::detail::PacketImpl::PacketImpl()
// reference/memory management
-prefix_ void senf::detail::PacketImpl::add_ref(refcount_t n)
+prefix_ void senf::detail::PacketImpl::add_ref()
{
- refcount_ += n;
+ ++ refcount_;
}
prefix_ senf::detail::PacketImpl::refcount_t senf::detail::PacketImpl::refcount()
return data_.capacity();
}
-// This function has a problem being inlined. Somehow, often when calling this, the size of the
-// resulting inlined code would be huge?
-
-prefix_ void senf::detail::PacketImpl::release(refcount_t n)
-{
- SENF_ASSERT(refcount_ >= n, "Internal failure: Releasing dead PacketImpl ??");
- // uah ... we need to be extremely careful here. If refcount_ is n, we want to commit suicide,
- // however the destructor will remove all PacketInterpreters from the list and will thereby
- // decrement refcount -> only decrement refcount_ when *not* calling delete
- if (refcount_ == n)
- delete this;
- else
- refcount_ -= n;
-}
-
// Annotations
-prefix_ void * senf::detail::PacketImpl::annotation(AnnotationRegistry::key_t key)
+prefix_ void * senf::detail::PacketImpl::annotation(AnnotationRegistry::key_type key)
{
return key >= 0 ? & simpleAnnotations_[key] : complexAnnotation(key);
}
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::detail::PacketImpl::Guard
prefix_ senf::detail::PacketImpl::Guard::Guard(PacketImpl * impl)
p->release();
}
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
\f
projects / senf.git / blobdiff