Scheduler: Sort 'events' list by priority

[senf.git] / Packets / PacketImpl.hh

diff --git a/Packets/PacketImpl.hh b/Packets/PacketImpl.hh
index 1d1373f..92738a4 100644 (file)
--- a/Packets/PacketImpl.hh
+++ b/Packets/PacketImpl.hh
@@ -30,6 +30,7 @@
 #include <memory>
 #include <vector>
 #include <boost/utility.hpp>
+#include <boost/type_traits/is_base_of.hpp>
 #include "../Utils/pool_alloc_mixin.hh"
 #include "PacketTypes.hh"
 #include "../Utils/singleton.hh"
@@ -38,8 +39,28 @@
 ///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
+
+    struct ComplexAnnotation {};
+
 namespace detail {
 
+    struct AnnotationP
+    {
+        virtual ~AnnotationP();
+    };
+
+    template <class Annotation>
+    struct TAnnotationP
+        : public AnnotationP
+    {
+        Annotation annotation;
+    };
+
+    union AnnotationEntry {
+        AnnotationP * p;
+        unsigned long long i;
+    };
+
     struct AnnotationIndexerBase
     {
         static unsigned maxAnnotations;
@@ -54,34 +75,21 @@ namespace detail {
         AnnotationIndexer();
         unsigned index_;
         static unsigned index();
-        static bool const Small = (sizeof(Annotation) <= sizeof(void*));
-    };
-
-    struct AnnotationP
-    {
-        virtual ~AnnotationP();
-    };
-
-    template <class Annotation>
-    struct TAnnotationP
-        : public AnnotationP
-    {
-        Annotation annotation;
+        static bool const Small = (sizeof(Annotation) <= sizeof(AnnotationEntry) 
+                                   && ! boost::is_base_of<ComplexAnnotation, Annotation>::value);
     };
 
     template <class Annotation, bool Small = AnnotationIndexer<Annotation>::Small>
     struct GetAnnotation
     {
-        static Annotation & get(AnnotationP * & p);
+        static Annotation & get(AnnotationEntry & e);
     };
 
-/*
     template <class Annotation>
     struct GetAnnotation<Annotation, true>
     {
-        static Annotation & get(AnnotationP * & p);
+        static Annotation & get(AnnotationEntry & e);
     };
-*/
 
     /** \brief Internal: Packet data storage
 
@@ -171,7 +179,7 @@ namespace detail {
         raw_container data_;
         interpreter_list interpreters_;
         
-        typedef std::vector<AnnotationP*> Annotations;
+        typedef std::vector<AnnotationEntry> Annotations;
         Annotations annotations_;
 
         void eraseInterpreters(interpreter_list::iterator b, interpreter_list::iterator e);