X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketImpl.cc;h=f9c598f8de604be939e66a61799768e88bf56d08;hb=961cf85a6abf2b5f0a7958bbfcd8f72e7b32721b;hp=5b0ad43ae37df6e16a4c5e1444e44d22beac8cf1;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/PacketImpl.cc b/senf/Packets/PacketImpl.cc
index 5b0ad43..f9c598f 100644
--- a/senf/Packets/PacketImpl.cc
+++ b/senf/Packets/PacketImpl.cc
@@ -23,10 +23,14 @@
 /** \file
     \brief PacketImpl non-inline non-template implementation */
 
-//#include "PacketImpl.ih"
+#include "PacketImpl.ih"
 
 // Custom includes
 #include <iterator>
+#include <map>
+#include <string>
+#include <boost/format.hpp>
+#include <senf/Utils/String.hh>
 #include "Packets.hh"
 
 //#include "PacketImpl.mpp"
@@ -34,19 +38,6 @@
 ///////////////////////////////cc.p////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::detail::AnnotationIndexerBase
-
-unsigned senf::detail::AnnotationIndexerBase::maxAnnotations (0);
-
-prefix_ void senf::detail::AnnotationIndexerBase::dump(PacketImpl * p, std::ostream & os)
-{
-    for(std::vector<AnnotationIndexerBase*>::const_iterator 
-            i (registry().begin()), i_end (registry().end());
-        i != i_end; ++i)
-        (*i)->v_dump(p,os);
-}
-
-///////////////////////////////////////////////////////////////////////////
 // senf::detail::PacketImpl
 
 prefix_ senf::detail::PacketImpl::~PacketImpl()
@@ -54,12 +45,6 @@ prefix_ senf::detail::PacketImpl::~PacketImpl()
     // We increment refcount_ to ensure, release() won't call delete again
     ++refcount_;
     eraseInterpreters(interpreters_.begin(), interpreters_.end());
-    Annotations::const_iterator  i (annotations_.begin());
-    Annotations::const_iterator const i_end (annotations_.end());
-    std::vector<bool>::iterator small (AnnotationIndexerBase::small().begin());
-    for (; i != i_end; ++i, ++small)
-        if (! *small && i->p)
-            delete i->p;
 }
 
 // interpreter chain
@@ -76,6 +61,14 @@ prefix_ void senf::detail::PacketImpl::prependInterpreter(PacketInterpreterBase
     p->assignImpl(this);
 }
 
+prefix_ void senf::detail::PacketImpl::prependInterpreter(PacketInterpreterBase * p,
+                                                          PacketInterpreterBase * before)
+{
+    interpreter_list::iterator i (interpreter_list::current(*before));
+    interpreters_.insert(i, *p);
+    p->assignImpl(this);
+}
+
 // Data container
 
 prefix_ void senf::detail::PacketImpl::clear(PacketData * self)
@@ -115,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.
@@ -130,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;
@@ -138,7 +131,54 @@ prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, differ
         // else pos is after the packet and we don't need to change anything ...
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+// Annotations
+
+prefix_ void senf::detail::PacketImpl::dumpAnnotations(std::ostream & os)
+{
+    for (AnnotationRegistry::iterator i (AnnotationRegistry::instance().begin());
+         i != AnnotationRegistry::instance().end(); ++i) {
+        void * antn (annotation(*i));
+        if (antn)
+            AnnotationRegistry::instance().dump(*i, os, antn);
+    }
+}
+
+prefix_ void * senf::detail::PacketImpl::complexAnnotation(AnnotationRegistry::key_type key)
+{
+    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();
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::detail::AnnotationRegistry
+
+prefix_ void senf::detail::AnnotationRegistry::dumpRegistrations(std::ostream & os)
+{
+    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 % "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
+            % nm
+            % (key >= 0 ? "yes" : "no")
+            % (isComplex(key) ? "yes" : "no")
+            % size(key);
+    }
+}
+
+prefix_ void senf::dumpPacketAnnotationRegistry(std::ostream & os)
+{
+    senf::detail::AnnotationRegistry::instance().dumpRegistrations(os);
+}
+
+/////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 //#include "PacketImpl.mpp"