X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketImpl.hh;h=56e261de42f596b362665de13304e2320a5fb2ad;hb=7ee689fe38d66aa3a0004d55e8708750d35adc0b;hp=489c6e2f2b95caf896a67cf5e5c1fc7114fe0b8a;hpb=d827fa2c49602de3e7d9559810408f258b5987ba;p=senf.git diff --git a/senf/Packets/PacketImpl.hh b/senf/Packets/PacketImpl.hh index 489c6e2..56e261d 100644 --- a/senf/Packets/PacketImpl.hh +++ b/senf/Packets/PacketImpl.hh @@ -30,15 +30,14 @@ #include #include #include -#include -#include -#include #include +#include #include #include //#include "PacketImpl.mpp" -///////////////////////////////hh.p//////////////////////////////////////// +#include "PacketImpl.ih" +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace senf { @@ -60,72 +59,44 @@ namespace senf { */ struct ComplexAnnotation {}; -namespace detail { - - struct AnnotationP - { - virtual ~AnnotationP(); - }; - - template - struct TAnnotationP - : public AnnotationP - { - Annotation annotation; - }; - - union AnnotationEntry { - AnnotationP * p; - unsigned long long i; - }; + /** \brief Dump annotation registry debug information + + This function will dump debug information about all registered annotations to \a os. This + information may then be used to tune the following annotation parameters for optimal + performance: + \li \c SENF_PACKET_ANNOTATION_SLOTS (define, default 8) is the number of slots available for + fast annotations + \li \c SENF_PACKET_ANNOTATION_SLOTSIZE (define, default 16) is the maximum size of a fast + annotation in bytes + + The output includes the current parameter and has the following columns: + \li \c NAME: Annotation type name + \li \c FAST: This is 'yes', if the annotation was allocated to a fast slot. Otherwise the + annotation is managed as a slow/complex annotation + \li \c COMPLEX: This is 'yes', if the annotation inherits from ComplexAnnotation + \li \c SIZE: Size of the annotation in bytes + + Fast annotations are considerable faster than complex and slow annotations. However, only + annotations which do not need constructor or destructor calls and which may be + zero-initialized (on the memory level) are legible as fast annotations. + + It is thus desirable to eliminate any complex and slow annotations, if possible. To optimize + the annotation system, you may take the following steps: + \li If there are reasonably sized non-complex annotations which are larger than the current + \c SENF_PACKET_ANNOTATION_SLOTSIZE value, increase this value accordingly + \li If there are more non-complex annotations with a size less than + \c SENF_PACKET_ANNOTATION_SLOTSIZE than there are available slots, increase \c + SENF_PACKET_ANNOTATION_SLOTS accordingly + \li If all fast annotations are smaller than \c SENF_PACKET_ANNOTATION_SLOTSIZE, you may + decrease that value accordingly + \li If there are fewer than \c SENF_PACKET_ANNOTATION_SLOTS fast annotations, you may + decrease that value accordingly - struct AnnotationIndexerBase - { - virtual ~AnnotationIndexerBase(); - virtual void v_dump(PacketImpl * p, std::ostream & os) = 0; - - static unsigned maxAnnotations; - static std::vector & small(); - static std::vector & registry(); - static void dump(PacketImpl * p, std::ostream & os); - }; - - template - struct AnnotationIndexer - : public senf::singleton< AnnotationIndexer >, - public AnnotationIndexerBase - { - AnnotationIndexer(); - virtual void v_dump(PacketImpl * p, std::ostream & os); - unsigned index_; - static unsigned index(); - static bool const Complex = boost::is_base_of::value; - static bool const Small = (sizeof(Annotation) <= sizeof(AnnotationEntry) && ! Complex); - -# if 0 // The test is difficult since it does not work with user-defined trivial constructors -# ifdef BOOST_HAS_TYPE_TRAITS_INTRINSICS - - BOOST_STATIC_ASSERT(( (boost::has_trivial_constructor::value - && boost::has_trivial_destructor::value) - || Complex )); - -# endif -# endif - }; - - template ::Small> - struct GetAnnotation - { - static Annotation & get(AnnotationEntry & e); - static void dump(AnnotationEntry & e, std::ostream & os); - }; + \see \ref packet_usage_annotation + */ + void dumpPacketAnnotationRegistry(std::ostream & os); - template - struct GetAnnotation - { - static Annotation & get(AnnotationEntry & e); - static void dump(AnnotationEntry & e, std::ostream & os); - }; +namespace detail { /** \brief Internal: Packet data storage @@ -160,8 +131,8 @@ namespace detail { // rerference/memory management - void add_ref(refcount_t n=1); - void release(refcount_t n=1); + void add_ref(); + void release(); refcount_t refcount() const; // Interpreter chain @@ -174,6 +145,7 @@ namespace detail { void appendInterpreter (PacketInterpreterBase * p); void prependInterpreter (PacketInterpreterBase * p); + void prependInterpreter (PacketInterpreterBase * p, PacketInterpreterBase * before); void truncateInterpreters (PacketInterpreterBase * p); void truncateInterpretersBackwards (PacketInterpreterBase * p); @@ -198,9 +170,10 @@ namespace detail { // Annotations template Annotation & annotation(); + + void clearAnnotations(); + void assignAnnotations(PacketImpl const & other); void dumpAnnotations(std::ostream & os); - template - void dumpAnnotation(std::ostream & os); /** \brief Internal: Keep PacketImpl instance alive @@ -217,25 +190,38 @@ namespace detail { }; private: + void eraseInterpreters(interpreter_list::iterator b, interpreter_list::iterator e); + void updateIterators(PacketData * self, difference_type pos, difference_type n); + + void * annotation(AnnotationRegistry::key_type key); // may return 0 ! + void * complexAnnotation(AnnotationRegistry::key_type key); // may return 0 ! + template + void * complexAnnotation(); + refcount_t refcount_; raw_container data_; interpreter_list interpreters_; - - typedef std::vector Annotations; - Annotations annotations_; - void eraseInterpreters(interpreter_list::iterator b, interpreter_list::iterator e); - void updateIterators(PacketData * self, difference_type pos, difference_type n); + union SimpleAnnotationSlot + { + unsigned char _ [SENF_PACKET_ANNOTATION_SLOTSIZE]; + }; + + typedef boost::ptr_vector< boost::nullable > + ComplexAnnotations; + ComplexAnnotations complexAnnotations_; + + SimpleAnnotationSlot simpleAnnotations_[SENF_PACKET_ANNOTATION_SLOTS]; }; }} -///////////////////////////////hh.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #endif #if !defined(HH_SENF_Packets_Packets__decls_) && !defined(HH_SENF_Packets_PacketImpl_i_) #define HH_SENF_Packets_PacketImpl_i_ #include "PacketImpl.cci" -//#include "PacketImpl.ct" +#include "PacketImpl.ct" #include "PacketImpl.cti" #endif @@ -249,4 +235,3 @@ namespace detail { // compile-command: "scons -u test" // comment-column: 40 // End: -