Packets/80221Bundle: set messageId on finalize

[senf.git] / Packets / PacketImpl.cc

diff --git a/Packets/PacketImpl.cc b/Packets/PacketImpl.cc
index 5b5e12f..5b0ad43 100644 (file)
--- a/Packets/PacketImpl.cc
+++ b/Packets/PacketImpl.cc
@@ -33,8 +33,19 @@
 #define prefix_
 ///////////////////////////////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
 
@@ -47,23 +58,8 @@ prefix_ senf::detail::PacketImpl::~PacketImpl()
     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)
-            delete *i;
-}
-
-// This function has a problem being inlined. Somehow, often when calling this, the size of the 
-// resulting inlined code would be huge. Need to further debug this.
-
-prefix_ void senf::detail::PacketImpl::release(refcount_t n)
-{
-    SENF_ASSERT(refcount_ >= n);
-    // 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;
+        if (! *small && i->p)
+            delete i->p;
 }
 
 // interpreter chain