X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketRegistry.ct;h=ab0de44ea45a80d859b34f0485efc207d3db5dc3;hb=c45c112ae88196ea8da9c5a9efb0e167196744d2;hp=ab97835f3d7718cde3c869b2ebdd2e76c7ba6efb;hpb=51044eb18f034c1a059ffe2fb109a422c1cbe251;p=senf.git

diff --git a/Packets/PacketRegistry.ct b/Packets/PacketRegistry.ct
index ab97835..ab0de44 100644
--- a/Packets/PacketRegistry.ct
+++ b/Packets/PacketRegistry.ct
@@ -1,8 +1,8 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institute for Open Communication Systems (FOKUS) 
-// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+// 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
@@ -28,10 +28,14 @@
 // Custom includes
 #include "../Utils/senfassert.hh"
 #include <iostream>
+#include "../Utils/TypeInfo.hh"
 
 #define prefix_
 ///////////////////////////////ct.p////////////////////////////////////////
 
+///////////////////////////////////////////////////////////////////////////
+// senf::detail::PkReg_EntryImpl<PacketType>
+
 template <class PacketType>
 prefix_ senf::PacketInterpreterBase::factory_t senf::detail::PkReg_EntryImpl<PacketType>::factory()
     const
@@ -39,11 +43,32 @@ prefix_ senf::PacketInterpreterBase::factory_t senf::detail::PkReg_EntryImpl<Pac
     return PacketType::factory();
 }
 
+template <class PacketType>
+prefix_ std::string senf::detail::PkReg_EntryImpl<PacketType>::name()
+    const
+{
+    return prettyName(typeid(PacketType));
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::PacketRegistry<Tag>
+
+template <class Tag>
+prefix_ typename senf::PacketRegistry<Tag>::Registry &
+senf::PacketRegistry<Tag>::registry()
+{
+    static Registry registry (prettyName(typeid(Tag)));
+    return registry;
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::detail::PacketRegistryImpl<KeyType>:
+
 template <class KeyType>
 template <class PacketType>
 prefix_ void senf::detail::PacketRegistryImpl<KeyType>::registerPacket(key_t key)
 {
-#ifdef SENF_NO_DEBUG
+#ifndef SENF_DEBUG
     registry_.insert(std::make_pair(key, Entry_ptr(new detail::PkReg_EntryImpl<PacketType>())));
     reverseRegistry_.insert(std::make_pair(senf::typeIdValue<PacketType>(), key));
 #else
@@ -100,12 +125,13 @@ senf::detail::PacketRegistryImpl<KeyType>::lookup(key_t key, bool)
     return i->second.get();
 }
 
-template <class Tag>
-prefix_ typename senf::PacketRegistry<Tag>::Registry &
-senf::PacketRegistry<Tag>::registry()
+template <class KeyType>
+prefix_ void senf::detail::PacketRegistryImpl<KeyType>::v_dump(std::ostream & os)
 {
-    static Registry registry;
-    return registry;
+    typename PacketMap::const_iterator i (registry_.begin());
+    typename PacketMap::const_iterator const i_end (registry_.end());
+    for (; i != i_end; ++i)
+        os << i->first << " " << i->second->name() << "\n";
 }
 
 ///////////////////////////////ct.e////////////////////////////////////////