///////////////////////////////cc.p////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
-// senf::detail::PacketImpl
+// senf::detail::AnnotationIndexerBase
+
+unsigned senf::detail::AnnotationIndexerBase::maxAnnotations (0);
-// 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::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_ void senf::detail::PacketImpl::release(refcount_t n)
+prefix_ senf::detail::PacketImpl::~PacketImpl()
{
- 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;
+ // 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