X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketImpl.cci;h=5e2a672d1698c3d2f961c83651185b12690bd80a;hb=ddb2132be4265f8a0d7d4c954c7c9401e59d027c;hp=34c3d1d56ca445a0c85ab30a4768f5fcc22bb68a;hpb=a1c37005ec4c281f6a76c07070a943cd1e36b6af;p=senf.git diff --git a/senf/Packets/PacketImpl.cci b/senf/Packets/PacketImpl.cci index 34c3d1d..5e2a672 100644 --- a/senf/Packets/PacketImpl.cci +++ b/senf/Packets/PacketImpl.cci @@ -2,69 +2,91 @@ // // 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 -// 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 /** \file \brief PacketImpl inline non-template implementation */ // Custom includes -#include -// #include "PacketInterpreter.hh" #define prefix_ inline -///////////////////////////////cci.p/////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////// -// senf::detail::AnnotationIndexerBase +//-///////////////////////////////////////////////////////////////////////////////////////////////// +// senf::detail::AnnotationRegistry -prefix_ senf::detail::AnnotationIndexerBase::~AnnotationIndexerBase() -{} +prefix_ std::string senf::detail::AnnotationRegistry::name(key_type key) + const +{ + Registry::const_iterator i (registry_.find(key)); + return i == registry_.end() ? "" : i->second->v_name(); +} -prefix_ std::vector & senf::detail::AnnotationIndexerBase::small() +prefix_ bool senf::detail::AnnotationRegistry::isComplex(key_type key) + const { - static std::vector smalls; - return smalls; + Registry::const_iterator i (registry_.find(key)); + return i != registry_.end() && i->second->v_isComplex(); } -prefix_ std::vector & -senf::detail::AnnotationIndexerBase::registry() +prefix_ unsigned senf::detail::AnnotationRegistry::size(key_type key) + const { - static std::vector reg; - return reg; + Registry::const_iterator i (registry_.find(key)); + return i == registry_.end() ? 0 : i->second->v_size(); } -/////////////////////////////////////////////////////////////////////////// -// senf::detail::AnnotationP +prefix_ senf::detail::AnnotationRegistry::iterator senf::detail::AnnotationRegistry::begin() + const +{ + return boost::make_transform_iterator(index_.begin(), + __gnu_cxx::select2nd()); +} -prefix_ senf::detail::AnnotationP::~AnnotationP() +prefix_ senf::detail::AnnotationRegistry::iterator senf::detail::AnnotationRegistry::end() + const +{ + return boost::make_transform_iterator(index_.end(), + __gnu_cxx::select2nd()); +} + +prefix_ senf::detail::AnnotationRegistry::AnnotationRegistry() + : simpleAnnotationCount_ (0), complexAnnotationCount_ (0) {} +//-///////////////////////////////////////////////////////////////////////////////////////////////// + // Memory management: // // * The PacketImpl destructor will *explicitly* clean-up the interpreters_ list by removing // each element from the list and deleting it if it's (intrusive) refcount is 0 -// * The PacketInterpreters use safe hooks -> they know wether they are part of a list or not +// * The PacketInterpreters use safe hooks -> they know whether they are part of a list or not // * PacketHandle has an intrusive_ptr to PacketInterpreterBase. The intrusive_ptr_add_ref // will refcount both the PacketImpl as well as the PacketInterpreterBase // * intrusive_ptr_remove will only delete the object if it's not in a container // * removing an object from the list will decrement the PacketImpl refcount accordingly -// * inserting an object into the list will incroment the PacketImpl refcount accordingly +// * inserting an object into the list will increment the PacketImpl refcount accordingly // * each PacketInterpreterBase instance holds a *raw* pointer to the PacketImpl // // The following operations change refcounts: @@ -78,22 +100,26 @@ prefix_ senf::detail::AnnotationP::~AnnotationP() // The last three also modify the impl_ member accordingly by calling // PacketInterpreterBase::assign/release -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::detail::PacketImpl prefix_ senf::detail::PacketImpl::PacketImpl() - : refcount_(0), annotations_(AnnotationIndexerBase::maxAnnotations) -{} + : refcount_(0) +{ + ::memset(simpleAnnotations_, 0, sizeof(simpleAnnotations_)); +} prefix_ senf::detail::PacketImpl::PacketImpl(size_type size, byte initValue) - : refcount_(0), data_(size,initValue), annotations_(AnnotationIndexerBase::maxAnnotations) -{} + : refcount_(0), data_(size,initValue) +{ + ::memset(simpleAnnotations_, 0, sizeof(simpleAnnotations_)); +} -// rerference/memory management +// 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() @@ -196,28 +222,14 @@ prefix_ senf::detail::PacketImpl::size_type senf::detail::PacketImpl::capacity() return data_.capacity(); } -prefix_ void senf::detail::PacketImpl::dumpAnnotations(std::ostream & os) -{ - AnnotationIndexerBase::dump(this, os); -} - -// This function has a problem being inlined. Somehow, often when calling this, the size of the -// resulting inlined code would be huge? +// Annotations -prefix_ void senf::detail::PacketImpl::release(refcount_t n) +prefix_ void * senf::detail::PacketImpl::annotation(AnnotationRegistry::key_type key) { - 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 decrenebt refcount_ when *not* caling delete - if (refcount_ == n) - delete this; - else - refcount_ -= n; + return key >= 0 ? & simpleAnnotations_[key] : complexAnnotation(key); } - -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::detail::PacketImpl::Guard prefix_ senf::detail::PacketImpl::Guard::Guard(PacketImpl * impl) @@ -231,7 +243,7 @@ prefix_ senf::detail::PacketImpl::Guard::~Guard() p->release(); } -///////////////////////////////cci.e/////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_