X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketRegistry.ih;h=746281d251d21302312e25409c1f49923425605d;hb=7ee689fe38d66aa3a0004d55e8708750d35adc0b;hp=169d2757e3de344d8ff4f42620a30c7d200fa4c7;hpb=1c55e269cfd07c017fe592a04d1ec86fdc7f4b37;p=senf.git

diff --git a/senf/Packets/PacketRegistry.ih b/senf/Packets/PacketRegistry.ih
index 169d275..746281d 100644
--- a/senf/Packets/PacketRegistry.ih
+++ b/senf/Packets/PacketRegistry.ih
@@ -27,41 +27,25 @@
 #define IH_SENF_Packets_PacketRegistry_ 1
 
 // Custom includes
-#include <ext/functional>
 #include <limits>
+#include <boost/multi_index_container.hpp>
+#include <boost/multi_index/ordered_index.hpp>
+#include <boost/multi_index/composite_key.hpp>
+#include <boost/multi_index/member.hpp>
+#include <boost/multi_index/mem_fun.hpp>
 #include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <boost/utility.hpp> // for boost::noncopyable
 #include <senf/Utils/TypeIdValue.hh>
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
-
-    /** \brief Registry entry
-
-        Value returned by a registry lookup
-     */
-    struct PkReg_Entry
-        : public intrusive_refcount
-    {
-        virtual ~PkReg_Entry();
-        virtual Packet::factory_t factory() const = 0;
-                                        ///< Get factory of the registered packet type
-        virtual std::string name() const = 0;
-    };
-
 namespace detail {
 
-    /** \brief Internal: Registry entry implementation for a specific packet type
-
-        \internal
-     */
-    template <class PacketType>
-    struct PkReg_EntryImpl
-        : public PkReg_Entry
+    struct TypeInfoCompare
     {
-        virtual Packet::factory_t factory() const;
-        virtual std::string name() const;
+        bool operator()(std::type_info const & a, std::type_info const & b) const
+            { return a.before(b); }
     };
 
     /** \brief Internal: Registry implementation base-class and registry of registries
@@ -97,31 +81,77 @@ namespace detail {
     {
     public:
         typedef KeyType key_t;
-        typedef PkReg_Entry Entry;
+
+        struct Entry : public intrusive_refcount
+        {
+            typedef boost::intrusive_ptr<Entry> ptr;
+
+            Entry(KeyType const & key_, int priority_);
+            virtual ~Entry();
+
+            virtual Packet::factory_t factory() const = 0;
+
+            virtual std::string name() const = 0;
+            virtual std::type_info const & type() const = 0;
+
+            KeyType key;
+            int priority;
+        };
 
     private:
-        typedef boost::intrusive_ptr<Entry> Entry_ptr;
-        typedef std::map<key_t, Entry_ptr> PacketMap;
-        typedef std::map<senf::TypeIdValue, key_t> ReversePacketMap;
+        struct ByKey {};
+        struct ByType {};
+
+        struct RegistryIndices
+            : public boost::multi_index::indexed_by<
+                boost::multi_index::ordered_unique<
+                    boost::multi_index::tag<ByKey>,
+                    boost::multi_index::composite_key<
+                        Entry,
+                        boost::multi_index::member<Entry,KeyType,&Entry::key>,
+                        boost::multi_index::member<Entry,int,&Entry::priority> >,
+                    boost::multi_index::composite_key_compare<
+                        std::less<KeyType>,
+                        std::greater<int> > >,
+                boost::multi_index::ordered_unique<
+                    boost::multi_index::tag<ByType>,
+                    boost::multi_index::mem_fun<Entry const,std::type_info const &,&Entry::type>,
+                    TypeInfoCompare> >
+        {};
+
+        typedef boost::multi_index_container<typename Entry::ptr, RegistryIndices> Registry;
+
+        template <class PacketType>
+        struct EntryImpl : public Entry
+        {
+            EntryImpl(KeyType const & key, int priority);
+
+            virtual Packet::factory_t factory() const;
+            virtual std::string name() const;
+            virtual std::type_info const & type() const;
+        };
 
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-/////////////////////////////////////////////////////////////////////////////////////////
         // Types
 
-        typedef boost::transform_iterator< ::__gnu_cxx::select1st<typename PacketMap::value_type>,
-                                           typename PacketMap::const_iterator > iterator;
+        typedef typename Registry::template index<ByKey>::type::const_iterator iterator;
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-/////////////////////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         PacketRegistryImpl(std::string const & name);
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-/////////////////////////////////////////////////////////////////////////////////////////
+
+        template <class PacketType>
+        void registerPacket(key_t key, int priority=0);
 
         template <class PacketType>
-        void registerPacket(key_t key);
+        void unregisterPacket();
+        void unregisterPacket(key_t key, int priority=0);
 
         key_t key(senf::TypeIdValue const & type);
         boost::optional<key_t> key(senf::TypeIdValue const & type, bool);
@@ -139,8 +169,7 @@ namespace detail {
         virtual void v_dump(std::ostream & os) const;
         virtual void v_clear();
 
-        PacketMap registry_;
-        ReversePacketMap reverseRegistry_;
+        Registry registry_;
     };
 
     template <class KeyType, bool is_integral=std::numeric_limits<KeyType>::is_integer>
@@ -157,7 +186,7 @@ namespace detail {
 
 }}
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif