// $Id$
//
-// Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Copyright (C) 2006
+// 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"
+#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 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 OtherPacket>
-prefix_ void satcom::pkf::impl::PacketRegistryImpl<KeyType>::registerPacket(key_t key)
+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( registry_.insert(std::make_pair(
- key, Entry_ptr(new impl::PkReg_EntryImpl<OtherPacket>()))).second );
+ 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( reverseRegistry_.insert(
- std::make_pair(satcom::lib::typeIdValue<OtherPacket>(), key)).second );
+ SENF_ASSERT( isNew );
+#endif
}
template <class KeyType>
-prefix_ typename satcom::pkf::impl::PacketRegistryImpl<KeyType>::key_t
-satcom::pkf::impl::PacketRegistryImpl<KeyType>::key(satcom::lib::TypeIdValue const & type)
+prefix_ typename senf::detail::PacketRegistryImpl<KeyType>::key_t
+senf::detail::PacketRegistryImpl<KeyType>::key(senf::TypeIdValue const & type)
{
typename ReversePacketMap::iterator i (reverseRegistry_.find(type));
if (i==reverseRegistry_.end())
- throw PacketTypeNotRegistered();
+ throw PacketTypeNotRegisteredException();
return i->second;
}
-template <class OtherPacket>
-prefix_ void
-satcom::pkf::impl::PkReg_EntryImpl<OtherPacket>::registerInterpreter(Packet const * p,
- Packet::iterator b,
- Packet::iterator e)
+template <class KeyType>
+prefix_ boost::optional<typename senf::detail::PacketRegistryImpl<KeyType>::key_t>
+senf::detail::PacketRegistryImpl<KeyType>::key(senf::TypeIdValue const & type, bool)
{
- p->template registerInterpreter<OtherPacket>(b,e);
+ typename ReversePacketMap::iterator i (reverseRegistry_.find(type));
+ if (i==reverseRegistry_.end())
+ return boost::optional<key_t>();
+ return i->second;
}
-template <class OtherPacket>
-prefix_ satcom::pkf::Packet::ptr
-satcom::pkf::impl::PkReg_EntryImpl<OtherPacket>::reinterpret(Packet * p)
+template <class KeyType>
+prefix_ typename senf::detail::PacketRegistryImpl<KeyType>::Entry const &
+senf::detail::PacketRegistryImpl<KeyType>::lookup(key_t key)
{
- return p->template reinterpret<OtherPacket>();
+ typename PacketMap::iterator i (registry_.find(key));
+ if (i==registry_.end())
+ throw PacketTypeNotRegisteredException();
+ return *(i->second);
}
template <class KeyType>
-prefix_ typename satcom::pkf::impl::PacketRegistryImpl<KeyType>::Entry *
-satcom::pkf::impl::PacketRegistryImpl<KeyType>::lookup(key_t key)
+prefix_ typename senf::detail::PacketRegistryImpl<KeyType>::Entry const *
+senf::detail::PacketRegistryImpl<KeyType>::lookup(key_t key, bool)
{
typename PacketMap::iterator i (registry_.find(key));
if (i==registry_.end())
- return &impl::pkreg_dataEntry;
+ return 0;
return i->second.get();
}
-template <class Tag>
-template <class InputIterator>
-prefix_ satcom::pkf::Packet::ptr
-satcom::pkf::PacketRegistry<Tag>::create(typename Tag::key_t key, InputIterator b,
- InputIterator e)
-{
- Packet::ptr p (Packet::create<DataPacket>(b,e));
- return registry().lookup(key)->reinterpret(p.get());
-}
-
-template <class Tag>
-prefix_ typename satcom::pkf::PacketRegistry<Tag>::Registry &
-satcom::pkf::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////////////////////////////////////////
\f
// Local Variables:
// mode: c++
-// c-file-style: "satcom"
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
// End:
projects / senf.git / blobdiff