///////////////////////////////cci.p///////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
-// senf::detail::AnnotationIndexerBase
+// senf::detail::AnnotationRegistry
-prefix_ senf::detail::AnnotationIndexerBase::~AnnotationIndexerBase()
-{}
+prefix_ void senf::detail::AnnotationRegistry::dump(key_type key, std::ostream & os,
+ void * annotation)
+ const
+{
+ Registry::const_iterator i (registry_.find(key));
+ if (i != registry_.end()) {
+ os << fieldName(i->second->v_name());
+ i->second->v_dump(os, annotation);
+ os << "\n";
+ }
+}
-prefix_ std::vector<bool> & senf::detail::AnnotationIndexerBase::small()
+prefix_ std::string senf::detail::AnnotationRegistry::name(key_type key)
+ const
{
- static std::vector<bool> smalls;
- return smalls;
+ Registry::const_iterator i (registry_.find(key));
+ return i == registry_.end() ? "" : i->second->v_name();
}
-prefix_ std::vector<senf::detail::AnnotationIndexerBase*> &
-senf::detail::AnnotationIndexerBase::registry()
+prefix_ bool senf::detail::AnnotationRegistry::isComplex(key_type key)
+ const
{
- static std::vector<AnnotationIndexerBase*> reg;
- return reg;
+ Registry::const_iterator i (registry_.find(key));
+ return i != registry_.end() && i->second->v_isComplex();
}
-///////////////////////////////////////////////////////////////////////////
-// senf::detail::AnnotationP
+prefix_ unsigned senf::detail::AnnotationRegistry::size(key_type key)
+ const
+{
+ Registry::const_iterator i (registry_.find(key));
+ return i == registry_.end() ? 0 : i->second->v_size();
+}
+
+prefix_ senf::detail::AnnotationRegistry::iterator senf::detail::AnnotationRegistry::begin()
+ const
+{
+ return boost::make_transform_iterator(index_.begin(),
+ __gnu_cxx::select2nd<Index::value_type>());
+}
+
+prefix_ senf::detail::AnnotationRegistry::iterator senf::detail::AnnotationRegistry::end()
+ const
+{
+ return boost::make_transform_iterator(index_.end(),
+ __gnu_cxx::select2nd<Index::value_type>());
+}
-prefix_ senf::detail::AnnotationP::~AnnotationP()
+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:
// 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()
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);
- // 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