X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketImpl.cc;h=f9c598f8de604be939e66a61799768e88bf56d08;hb=961cf85a6abf2b5f0a7958bbfcd8f72e7b32721b;hp=4bb7eeef925b0ea100d330b9f13946a17a18e343;hpb=943a6b0973f66bc699c6e7b404da256145e93acf;p=senf.git diff --git a/senf/Packets/PacketImpl.cc b/senf/Packets/PacketImpl.cc index 4bb7eee..f9c598f 100644 --- a/senf/Packets/PacketImpl.cc +++ b/senf/Packets/PacketImpl.cc @@ -27,6 +27,8 @@ // Custom includes #include +#include +#include #include #include #include "Packets.hh" @@ -106,7 +108,7 @@ prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, differ // b) 'self' // c) Those that come afterwards // For a), the change must be inside the packet since 'self' must be within those packets - // For b), the change must also be within since that's the packet we are changeing + // For b), the change must also be within since that's the packet we are changing // For c), the change must be outside the packet (we don't allow an upper packet to mess with // the the data owned by a packet further down the chain). It can be before or after the // packet. @@ -121,7 +123,7 @@ prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, differ interpreter_list::iterator const i_end (interpreters_.end()); if (++i != i_end) if (pos <= difference_type(i->begin_)) - // pos is before the packet, it must then be before all futher packets ... + // pos is before the packet, it must then be before all further packets ... for (; i != i_end; ++i) { i->begin_ += n; i->end_ += n; @@ -133,26 +135,20 @@ prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, differ prefix_ void senf::detail::PacketImpl::dumpAnnotations(std::ostream & os) { - for (AnnotationRegistry::key_t key (AnnotationRegistry::instance().keyBegin()); - key != AnnotationRegistry::instance().keyEnd(); ++key) { - void * antn (annotation(key)); + for (AnnotationRegistry::iterator i (AnnotationRegistry::instance().begin()); + i != AnnotationRegistry::instance().end(); ++i) { + void * antn (annotation(*i)); if (antn) - AnnotationRegistry::instance().dump(key, os, antn); + AnnotationRegistry::instance().dump(*i, os, antn); } } -prefix_ void * senf::detail::PacketImpl::complexAnnotation(AnnotationRegistry::key_t key) +prefix_ void * senf::detail::PacketImpl::complexAnnotation(AnnotationRegistry::key_type key) { - SENF_ASSERT( key<0, "complexAnnotation called with invalid key"); -#ifdef SENF_PACKET_NO_COMPLEX_ANNOTATIONS - return 0; -#else - while (complexAnnotations_.size() < ComplexAnnotations::size_type(-key)) - complexAnnotations_.push_back(0); - if (complexAnnotations_.is_null(-key-1)) - return 0; - return complexAnnotations_[-key-1].get(); -#endif + SENF_ASSERT( key < 0, "complexAnnotation called with invalid key"); + return (ComplexAnnotations::size_type(-key-1) >= complexAnnotations_.size() + || complexAnnotations_.is_null(-key-1)) + ? 0 : complexAnnotations_[-key-1].get(); } /////////////////////////////////////////////////////////////////////////// @@ -160,21 +156,21 @@ prefix_ void * senf::detail::PacketImpl::complexAnnotation(AnnotationRegistry::k prefix_ void senf::detail::AnnotationRegistry::dumpRegistrations(std::ostream & os) { -#ifdef SENF_DEBUG - boost::format fmt ("%4.4s %-56.56s %-7.7s %5d\n"); + boost::format fmt ("%-56.56s %-4.4s %-7.7s %5d\n"); os << "SENF_PACKET_ANNOTATION_SLOTS = " << SENF_PACKET_ANNOTATION_SLOTS << "\n" << "SENF_PACKET_ANNOTATION_SLOTSIZE = " << SENF_PACKET_ANNOTATION_SLOTSIZE << "\n"; - os << fmt % "SLOT" % "TYPE" % "COMPLEX" % "SIZE"; - for (key_t key (keyBegin()); key != keyEnd(); ++key) { - std::string nm (name(key)); + os << fmt % "TYPE" % "FAST" % "COMPLEX" % "SIZE"; + + for (Index::const_iterator i (index_.begin()), i_end (index_.end()); i != i_end; ++i) { + key_type key (i->second); + std::string nm (i->first); if (nm.size() > 56) nm.erase(nm.begin(), nm.begin()+nm.size()-32); os << fmt - % (key >= 0 ? senf::str(key) : "") % nm + % (key >= 0 ? "yes" : "no") % (isComplex(key) ? "yes" : "no") % size(key); } -#endif } prefix_ void senf::dumpPacketAnnotationRegistry(std::ostream & os)