// $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
// Free Software Foundation, Inc.,
// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-// Definition of non-inline template funPacketRegistry.ons
+/** \file
+ \brief PacketRegistry non-inline template implementation */
#include "PacketRegistry.ih"
// 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
{
- return PacketInterpreter<PacketType>::factory();
+ 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)
{
+#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
bool isUnique (
registry_.insert(
std::make_pair(key, Entry_ptr(new detail::PkReg_EntryImpl<PacketType>()))).second);
// If this assertion fails, a Packet was registered with an already known key
- BOOST_ASSERT( isUnique );
+ SENF_ASSERT( isUnique );
bool isNew (
reverseRegistry_.insert(
std::make_pair(senf::typeIdValue<PacketType>(), key)).second);
// If this assertion fails, the same Packet was registered with two different keys
- BOOST_ASSERT( isNew );
+ SENF_ASSERT( isNew );
+#endif
}
template <class KeyType>
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////////////////////////////////////////