X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketRegistry.ih;h=af16278686f7eaa4c79eab77ba88513878d1eb50;hb=c45c112ae88196ea8da9c5a9efb0e167196744d2;hp=77d75981835fbb323637666c4b6835f25f30af5f;hpb=1cf24483a4b520177bfa539d9601749be6aef2ce;p=senf.git

diff --git a/Packets/PacketRegistry.ih b/Packets/PacketRegistry.ih
index 77d7598..af16278 100644
--- a/Packets/PacketRegistry.ih
+++ b/Packets/PacketRegistry.ih
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+//     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -23,19 +23,36 @@
 /** \file
     \brief PacketRegistry internal header */
 
-#ifndef IH_PacketRegistryImpl_
-#define IH_PacketRegistryImpl_ 1
+#ifndef IH_SENF_Packets_PacketRegistry_
+#define IH_SENF_Packets_PacketRegistry_ 1
 
 // Custom includes
+#include <ext/functional>
 #include <boost/intrusive_ptr.hpp>
-#include "typeidvalue.hh"
+#include <boost/iterator/transform_iterator.hpp>
+#include "../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
+
+    /** \brief Internal: Registry entry implementation for a specific packet type
+
         \internal
      */
     template <class PacketType>
@@ -43,6 +60,27 @@ namespace detail {
         : public PkReg_Entry
     {
         virtual Packet::factory_t factory() const;
+        virtual std::string name() const;
+    };
+
+    /** \brief Internal: Registry implementation base-class and registry of registries
+
+        \internal
+     */
+    class PacketRegistryImplBase
+        : private boost::noncopyable
+    {
+    public:
+        virtual ~PacketRegistryImplBase();
+
+        static void dump(std::ostream & os);
+
+    protected:
+        typedef std::map<std::string, PacketRegistryImplBase*>  RegistryMap;
+        static RegistryMap & registries();
+
+    private:
+        virtual void v_dump(std::ostream & os) = 0;
     };
 
     /** \brief Internal: Singleton class implementing the packet registry.
@@ -50,26 +88,30 @@ namespace detail {
         \internal
      */
     template <class KeyType>
-    class PacketRegistryImpl 
-        : private boost::noncopyable
+    class PacketRegistryImpl
+        : public PacketRegistryImplBase
     {
     public:
+        typedef KeyType key_t;
+        typedef PkReg_Entry Entry;
+
+    private:
+        typedef boost::intrusive_ptr<Entry> Entry_ptr;
+        typedef std::map<key_t, Entry_ptr> PacketMap;
+        typedef std::map<senf::TypeIdValue, key_t> ReversePacketMap;
+
+    public:
         ///////////////////////////////////////////////////////////////////////////
         // Types
 
-        typedef KeyType key_t;
-
-        typedef PkReg_Entry Entry;
+        typedef boost::transform_iterator< ::__gnu_cxx::select1st<typename PacketMap::value_type>,
+                                           typename PacketMap::const_iterator > iterator;
 
         ///////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
         ///@{
 
-        // default default constructor
-        // no copy constructor
-        // no copy assignment
-        // default destructor
-        // no conversion constructors
+        PacketRegistryImpl(std::string const & name);
 
         ///@}
         ///////////////////////////////////////////////////////////////////////////
@@ -83,12 +125,13 @@ namespace detail {
         Entry const & lookup(key_t key);
         Entry const * lookup(key_t key, bool);
 
+        iterator begin() const;
+        iterator end() const;
+
     protected:
 
     private:
-        typedef boost::intrusive_ptr<Entry> Entry_ptr;
-        typedef std::map<key_t, Entry_ptr> PacketMap;
-        typedef std::map<senf::TypeIdValue, key_t> ReversePacketMap;
+        virtual void v_dump(std::ostream & os);
 
         PacketMap registry_;
         ReversePacketMap reverseRegistry_;