--- a/SConstruct Thu May 03 10:34:35 2007 +0200
+++ b/SConstruct Thu May 03 10:49:28 2007 +0200
@@ -25,7 +25,7 @@
'test.cc',
'random-variable.cc',
'rng-stream.cc',
- 'interface.cc',
+ 'ns-unknown.cc',
'iid-manager.cc',
])
env = Environment()
@@ -50,7 +50,7 @@
'test.h',
'random-variable.h',
'rng-stream.h',
- 'interface.h',
+ 'ns-unknown.h',
'iid-manager.h',
])
--- a/src/core/interface.cc Thu May 03 10:34:35 2007 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,346 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2007 INRIA
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
- */
-#include "interface.h"
-#include <string>
-#include <list>
-#include <stdint.h>
-#include "assert.h"
-
-namespace ns3 {
-
-class InterfaceImpl
-{
-public:
- InterfaceImpl (uint32_t iid, Interface *interface);
- ~InterfaceImpl ();
- void Ref (void);
- void RefAll (InterfaceImpl *other);
- void Unref (void);
- void UnrefAll (void);
- Interface *DoQueryInterface (uint32_t iid);
- void AddInterface (Interface *interface);
- void AddSelfInterface (uint32_t iid, Interface *interface);
-private:
- typedef std::list<std::pair<uint32_t,Interface *> > List;
- uint32_t m_ref;
- List m_list;
-};
-
-InterfaceImpl::InterfaceImpl (uint32_t iid, Interface *interface)
- : m_ref (1)
-{
- m_list.push_back (std::make_pair (iid, interface));
-}
-InterfaceImpl::~InterfaceImpl ()
-{
- for (List::const_iterator i = m_list.begin ();
- i != m_list.end (); i++)
- {
- i->second->UnrefInternal ();
- }
- m_list.clear ();
-}
-void
-InterfaceImpl::Ref (void)
-{
- m_ref++;
-}
-void
-InterfaceImpl::RefAll (InterfaceImpl *other)
-{
- m_ref += other->m_ref;
-}
-void
-InterfaceImpl::Unref (void)
-{
- m_ref--;
- if (m_ref == 0)
- {
- delete this;
- }
-}
-void
-InterfaceImpl::UnrefAll (void)
-{
- m_ref = 0;
- delete this;
-}
-Interface *
-InterfaceImpl::DoQueryInterface (uint32_t iid)
-{
- for (List::const_iterator i = m_list.begin ();
- i != m_list.end (); i++)
- {
- if (i->first == iid)
- {
- i->second->Ref ();
- return i->second;
- }
- }
- return 0;
-}
-void
-InterfaceImpl::AddInterface (Interface *interface)
-{
- for (List::const_iterator i = interface->m_impl->m_list.begin ();
- i != interface->m_impl->m_list.end (); i++)
- {
- // XXX here, we should check that we have only one
- // instance of each interface
- i->second->RefInternal ();
- m_list.push_back (std::make_pair (i->first, i->second));
- }
-}
-void
-InterfaceImpl::AddSelfInterface (uint32_t iid, Interface *interface)
-{
- interface->RefInternal ();
- m_list.push_back (std::make_pair (iid, interface));
-}
-
-
-Interface::Interface (uint32_t iid)
- : m_impl (new InterfaceImpl (iid, this)),
- m_ref (1)
-{}
-Interface::~Interface ()
-{
- m_impl = 0;
-}
-void
-Interface::Ref (void)
-{
- m_impl->Ref ();
-}
-void
-Interface::Unref (void)
-{
- m_impl->Unref ();
-}
-
-void
-Interface::RefInternal (void)
-{
- m_ref++;
-}
-
-void
-Interface::UnrefInternal (void)
-{
- NS_ASSERT (m_ref != 0);
- m_ref--;
- if (m_ref == 0)
- {
- delete this;
- }
-}
-
-Interface *
-Interface::DoQueryInterface (uint32_t iid)
-{
- return m_impl->DoQueryInterface (iid);
-}
-
-void
-Interface::AddInterface (Interface *interface)
-{
- m_impl->AddInterface (interface);
- m_impl->RefAll (interface->m_impl);
- interface->m_impl->UnrefAll ();
- interface->m_impl = m_impl;
-}
-
-void
-Interface::AddSelfInterface (uint32_t iid, Interface *interface)
-{
- m_impl->AddSelfInterface (iid, interface);
-}
-
-
-}//namespace ns3
-
-#ifdef RUN_SELF_TESTS
-
-#include "test.h"
-#include "iid-manager.h"
-
-namespace {
-
-class A : public ns3::Interface
-{
-public:
- static const uint32_t iid;
- A ()
- : Interface (A::iid)
- {}
-};
-class B : public ns3::Interface
-{
-public:
- static const uint32_t iid;
- B ()
- : Interface (B::iid)
- {}
-};
-class BaseA : public ns3::Interface
-{
-public:
- static const uint32_t iid;
- BaseA ()
- : Interface (BaseA::iid)
- {}
-};
-class BaseB : public ns3::Interface
-{
-public:
- static const uint32_t iid;
- BaseB ()
- : Interface (BaseB::iid)
- {}
-};
-class Base : public ns3::Interface
-{
-public:
- static const uint32_t iid;
- Base ()
- : Interface (Base::iid)
- {}
-};
-class Derived : public Base
-{
-public:
- static const uint32_t iid;
- Derived ()
- {
- AddSelfInterface (Derived::iid, this);
- }
-};
-
-const uint32_t A::iid = ns3::IidManager::Allocate ("A");
-const uint32_t B::iid = ns3::IidManager::Allocate ("B");
-const uint32_t BaseA::iid = ns3::IidManager::Allocate ("BaseA");
-const uint32_t BaseB::iid = ns3::IidManager::Allocate ("BaseB");
-const uint32_t Base::iid = ns3::IidManager::Allocate ("Base");
-const uint32_t Derived::iid = ns3::IidManager::Allocate ("Derived");
-
-}//namespace
-
-
-namespace ns3 {
-
-class InterfaceTest : public Test
-{
-public:
- InterfaceTest ();
- virtual bool RunTests (void);
-};
-
-InterfaceTest::InterfaceTest ()
- : Test ("Interface")
-{}
-bool
-InterfaceTest::RunTests (void)
-{
- bool ok = true;
-
- //DerivedAB *derivedAB;
-
-
- A *a = new A ();
- a->Unref ();
-
- a = new A ();
- A *a1 = a->QueryInterface<A> (A::iid);
- if (a1 == 0 || a1 != a)
- {
- ok = false;
- }
- a1->Unref ();
- a1 = a->QueryInterface<A> (A::iid);
- if (a1 == 0 || a1 != a)
- {
- ok = false;
- }
- a1->Unref ();
- a->Unref ();
-
- B *b = new B ();
- B *b1 = b->QueryInterface<B> (B::iid);
- if (b1 == 0 || b1 != b)
- {
- ok = false;
- }
- b1->Unref ();
-
- a = new A ();
- a->AddInterface (b);
- b1 = b->QueryInterface<B> (B::iid);
- if (b1 == 0 || b1 != b)
- {
- ok = false;
- }
- b1->Unref ();
- a1 = b->QueryInterface<A> (A::iid);
- if (a1 == 0 || a1 != a)
- {
- ok = false;
- }
- a1->Unref ();
- a1 = a->QueryInterface<A> (A::iid);
- if (a1 == 0 || a1 != a)
- {
- ok = false;
- }
- a1->Unref ();
- b1 = a->QueryInterface<B> (B::iid);
- if (b1 == 0 || b1 != b)
- {
- ok = false;
- }
- b1->Unref ();
-
- a->Unref ();
- b->Unref ();
-
- Derived *derived = new Derived ();
- Base *base = derived->QueryInterface<Base> (Base::iid);
- if (base == 0)
- {
- ok = false;
- }
- Derived *derived1 = base->QueryInterface<Derived> (Derived::iid);
- if (derived1 == 0 || derived1 != derived)
- {
- ok = false;
- }
- derived1->Unref ();
- base->Unref ();
- derived->Unref ();
-
- return ok;
-}
-
-
-static InterfaceTest g_interface_test;
-
-}// namespace ns3
-
-#endif /* RUN_SELF_TESTS */
--- a/src/core/interface.h Thu May 03 10:34:35 2007 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2007 INRIA
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
- */
-#ifndef INTERFACE_H
-#define INTERFACE_H
-
-#include <string>
-
-
-namespace ns3 {
-
-class InterfaceImpl;
-
-/**
- * \brief COM-like IUnknown
- *
- * This class should be used as a base class for every object which
- * wishes to provide a COM-like QueryInterface API. Multiple
- * inheritance where this base class is at the top of the dreaded
- * "diamond" shape is not allowed.
- */
-class Interface
-{
-public:
- virtual ~Interface ();
- void Ref (void);
- void Unref (void);
-
- /**
- * \param iid the Interface id of the requested interface
- */
- template <typename T>
- T *QueryInterface (uint32_t iid);
-
- /**
- * \param interface another interface
- *
- * Aggregate together the two interfaces. After this call,
- * the two interface objects are tied together: each of them
- * will be able to perform QI on each other and their lifetimes
- * will be found by the same reference count.
- */
- void AddInterface (Interface *interface);
-protected:
- /**
- * \param iid the Interface Id of the interface defined by a direct subclass
- * of this base class
- *
- * If you are a direct subclass of this class, you _must_ register
- * the name of your interface with this constructor.
- */
- Interface (uint32_t iid);
- /**
- * \param iid the Interface id of the interface
- * \param a pointer to the interface object
- *
- * If you are not a direct subclass of the ns3::Interface base class,
- * and if you want to register yourself as another accessible interface
- * (typically, your subclass has added API), you need to call
- * this method to associate an interface id to your interface.
- */
- void AddSelfInterface (uint32_t iid, Interface *interface);
-private:
- friend class InterfaceImpl;
- Interface *DoQueryInterface (uint32_t iid);
- void RefInternal (void);
- void UnrefInternal (void);
- InterfaceImpl *m_impl;
- uint32_t m_ref;
-};
-
-}//namespace ns3
-
-namespace ns3 {
-
-template <typename T>
-T *
-Interface::QueryInterface (uint32_t iid)
-{
- Interface *found = DoQueryInterface (iid);
- if (found != 0)
- {
- return dynamic_cast<T *> (found);
- }
- return 0;
-}
-
-
-}//namespace ns3
-
-#endif /* INTERFACE_H */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/core/ns-unknown.cc Thu May 03 10:49:28 2007 +0200
@@ -0,0 +1,346 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2007 INRIA
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ */
+#include "ns-unknown.h"
+#include <string>
+#include <list>
+#include <stdint.h>
+#include "assert.h"
+
+namespace ns3 {
+
+class InterfaceImpl
+{
+public:
+ InterfaceImpl (uint32_t iid, Interface *interface);
+ ~InterfaceImpl ();
+ void Ref (void);
+ void RefAll (InterfaceImpl *other);
+ void Unref (void);
+ void UnrefAll (void);
+ Interface *DoQueryInterface (uint32_t iid);
+ void AddInterface (Interface *interface);
+ void AddSelfInterface (uint32_t iid, Interface *interface);
+private:
+ typedef std::list<std::pair<uint32_t,Interface *> > List;
+ uint32_t m_ref;
+ List m_list;
+};
+
+InterfaceImpl::InterfaceImpl (uint32_t iid, Interface *interface)
+ : m_ref (1)
+{
+ m_list.push_back (std::make_pair (iid, interface));
+}
+InterfaceImpl::~InterfaceImpl ()
+{
+ for (List::const_iterator i = m_list.begin ();
+ i != m_list.end (); i++)
+ {
+ i->second->UnrefInternal ();
+ }
+ m_list.clear ();
+}
+void
+InterfaceImpl::Ref (void)
+{
+ m_ref++;
+}
+void
+InterfaceImpl::RefAll (InterfaceImpl *other)
+{
+ m_ref += other->m_ref;
+}
+void
+InterfaceImpl::Unref (void)
+{
+ m_ref--;
+ if (m_ref == 0)
+ {
+ delete this;
+ }
+}
+void
+InterfaceImpl::UnrefAll (void)
+{
+ m_ref = 0;
+ delete this;
+}
+Interface *
+InterfaceImpl::DoQueryInterface (uint32_t iid)
+{
+ for (List::const_iterator i = m_list.begin ();
+ i != m_list.end (); i++)
+ {
+ if (i->first == iid)
+ {
+ i->second->Ref ();
+ return i->second;
+ }
+ }
+ return 0;
+}
+void
+InterfaceImpl::AddInterface (Interface *interface)
+{
+ for (List::const_iterator i = interface->m_impl->m_list.begin ();
+ i != interface->m_impl->m_list.end (); i++)
+ {
+ // XXX here, we should check that we have only one
+ // instance of each interface
+ i->second->RefInternal ();
+ m_list.push_back (std::make_pair (i->first, i->second));
+ }
+}
+void
+InterfaceImpl::AddSelfInterface (uint32_t iid, Interface *interface)
+{
+ interface->RefInternal ();
+ m_list.push_back (std::make_pair (iid, interface));
+}
+
+
+Interface::Interface (uint32_t iid)
+ : m_impl (new InterfaceImpl (iid, this)),
+ m_ref (1)
+{}
+Interface::~Interface ()
+{
+ m_impl = 0;
+}
+void
+Interface::Ref (void)
+{
+ m_impl->Ref ();
+}
+void
+Interface::Unref (void)
+{
+ m_impl->Unref ();
+}
+
+void
+Interface::RefInternal (void)
+{
+ m_ref++;
+}
+
+void
+Interface::UnrefInternal (void)
+{
+ NS_ASSERT (m_ref != 0);
+ m_ref--;
+ if (m_ref == 0)
+ {
+ delete this;
+ }
+}
+
+Interface *
+Interface::DoQueryInterface (uint32_t iid)
+{
+ return m_impl->DoQueryInterface (iid);
+}
+
+void
+Interface::AddInterface (Interface *interface)
+{
+ m_impl->AddInterface (interface);
+ m_impl->RefAll (interface->m_impl);
+ interface->m_impl->UnrefAll ();
+ interface->m_impl = m_impl;
+}
+
+void
+Interface::AddSelfInterface (uint32_t iid, Interface *interface)
+{
+ m_impl->AddSelfInterface (iid, interface);
+}
+
+
+}//namespace ns3
+
+#ifdef RUN_SELF_TESTS
+
+#include "test.h"
+#include "iid-manager.h"
+
+namespace {
+
+class A : public ns3::Interface
+{
+public:
+ static const uint32_t iid;
+ A ()
+ : Interface (A::iid)
+ {}
+};
+class B : public ns3::Interface
+{
+public:
+ static const uint32_t iid;
+ B ()
+ : Interface (B::iid)
+ {}
+};
+class BaseA : public ns3::Interface
+{
+public:
+ static const uint32_t iid;
+ BaseA ()
+ : Interface (BaseA::iid)
+ {}
+};
+class BaseB : public ns3::Interface
+{
+public:
+ static const uint32_t iid;
+ BaseB ()
+ : Interface (BaseB::iid)
+ {}
+};
+class Base : public ns3::Interface
+{
+public:
+ static const uint32_t iid;
+ Base ()
+ : Interface (Base::iid)
+ {}
+};
+class Derived : public Base
+{
+public:
+ static const uint32_t iid;
+ Derived ()
+ {
+ AddSelfInterface (Derived::iid, this);
+ }
+};
+
+const uint32_t A::iid = ns3::IidManager::Allocate ("A");
+const uint32_t B::iid = ns3::IidManager::Allocate ("B");
+const uint32_t BaseA::iid = ns3::IidManager::Allocate ("BaseA");
+const uint32_t BaseB::iid = ns3::IidManager::Allocate ("BaseB");
+const uint32_t Base::iid = ns3::IidManager::Allocate ("Base");
+const uint32_t Derived::iid = ns3::IidManager::Allocate ("Derived");
+
+}//namespace
+
+
+namespace ns3 {
+
+class InterfaceTest : public Test
+{
+public:
+ InterfaceTest ();
+ virtual bool RunTests (void);
+};
+
+InterfaceTest::InterfaceTest ()
+ : Test ("Interface")
+{}
+bool
+InterfaceTest::RunTests (void)
+{
+ bool ok = true;
+
+ //DerivedAB *derivedAB;
+
+
+ A *a = new A ();
+ a->Unref ();
+
+ a = new A ();
+ A *a1 = a->QueryInterface<A> (A::iid);
+ if (a1 == 0 || a1 != a)
+ {
+ ok = false;
+ }
+ a1->Unref ();
+ a1 = a->QueryInterface<A> (A::iid);
+ if (a1 == 0 || a1 != a)
+ {
+ ok = false;
+ }
+ a1->Unref ();
+ a->Unref ();
+
+ B *b = new B ();
+ B *b1 = b->QueryInterface<B> (B::iid);
+ if (b1 == 0 || b1 != b)
+ {
+ ok = false;
+ }
+ b1->Unref ();
+
+ a = new A ();
+ a->AddInterface (b);
+ b1 = b->QueryInterface<B> (B::iid);
+ if (b1 == 0 || b1 != b)
+ {
+ ok = false;
+ }
+ b1->Unref ();
+ a1 = b->QueryInterface<A> (A::iid);
+ if (a1 == 0 || a1 != a)
+ {
+ ok = false;
+ }
+ a1->Unref ();
+ a1 = a->QueryInterface<A> (A::iid);
+ if (a1 == 0 || a1 != a)
+ {
+ ok = false;
+ }
+ a1->Unref ();
+ b1 = a->QueryInterface<B> (B::iid);
+ if (b1 == 0 || b1 != b)
+ {
+ ok = false;
+ }
+ b1->Unref ();
+
+ a->Unref ();
+ b->Unref ();
+
+ Derived *derived = new Derived ();
+ Base *base = derived->QueryInterface<Base> (Base::iid);
+ if (base == 0)
+ {
+ ok = false;
+ }
+ Derived *derived1 = base->QueryInterface<Derived> (Derived::iid);
+ if (derived1 == 0 || derived1 != derived)
+ {
+ ok = false;
+ }
+ derived1->Unref ();
+ base->Unref ();
+ derived->Unref ();
+
+ return ok;
+}
+
+
+static InterfaceTest g_interface_test;
+
+}// namespace ns3
+
+#endif /* RUN_SELF_TESTS */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/core/ns-unknown.h Thu May 03 10:49:28 2007 +0200
@@ -0,0 +1,108 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2007 INRIA
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ */
+#ifndef INTERFACE_H
+#define INTERFACE_H
+
+#include <string>
+
+
+namespace ns3 {
+
+class InterfaceImpl;
+
+/**
+ * \brief COM-like IUnknown
+ *
+ * This class should be used as a base class for every object which
+ * wishes to provide a COM-like QueryInterface API. Multiple
+ * inheritance where this base class is at the top of the dreaded
+ * "diamond" shape is not allowed.
+ */
+class Interface
+{
+public:
+ virtual ~Interface ();
+ void Ref (void);
+ void Unref (void);
+
+ /**
+ * \param iid the Interface id of the requested interface
+ */
+ template <typename T>
+ T *QueryInterface (uint32_t iid);
+
+ /**
+ * \param interface another interface
+ *
+ * Aggregate together the two interfaces. After this call,
+ * the two interface objects are tied together: each of them
+ * will be able to perform QI on each other and their lifetimes
+ * will be found by the same reference count.
+ */
+ void AddInterface (Interface *interface);
+protected:
+ /**
+ * \param iid the Interface Id of the interface defined by a direct subclass
+ * of this base class
+ *
+ * If you are a direct subclass of this class, you _must_ register
+ * the name of your interface with this constructor.
+ */
+ Interface (uint32_t iid);
+ /**
+ * \param iid the Interface id of the interface
+ * \param a pointer to the interface object
+ *
+ * If you are not a direct subclass of the ns3::Interface base class,
+ * and if you want to register yourself as another accessible interface
+ * (typically, your subclass has added API), you need to call
+ * this method to associate an interface id to your interface.
+ */
+ void AddSelfInterface (uint32_t iid, Interface *interface);
+private:
+ friend class InterfaceImpl;
+ Interface *DoQueryInterface (uint32_t iid);
+ void RefInternal (void);
+ void UnrefInternal (void);
+ InterfaceImpl *m_impl;
+ uint32_t m_ref;
+};
+
+}//namespace ns3
+
+namespace ns3 {
+
+template <typename T>
+T *
+Interface::QueryInterface (uint32_t iid)
+{
+ Interface *found = DoQueryInterface (iid);
+ if (found != 0)
+ {
+ return dynamic_cast<T *> (found);
+ }
+ return 0;
+}
+
+
+}//namespace ns3
+
+#endif /* INTERFACE_H */