author | Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
Sun, 12 Aug 2007 18:43:15 +0200 | |
changeset 1349 | 11562f6b73aa |
parent 1346 | 47de68729c86 |
child 1351 | 0a6aaa6acbd3 |
permissions | -rw-r--r-- |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1 |
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
2 |
/* |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
3 |
* Copyright (c) 2007 INRIA, Gustavo Carneiro |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
4 |
* |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
5 |
* This program is free software; you can redistribute it and/or modify |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
6 |
* it under the terms of the GNU General Public License version 2 as |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
8 |
* |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
9 |
* This program is distributed in the hope that it will be useful, |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
12 |
* GNU General Public License for more details. |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
13 |
* |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
14 |
* You should have received a copy of the GNU General Public License |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
15 |
* along with this program; if not, write to the Free Software |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
16 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
17 |
* |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
18 |
* Authors: Gustavo Carneiro <gjcarneiro@gmail.com>, |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
19 |
* Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
20 |
*/ |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
21 |
#include "object.h" |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
22 |
#include "assert.h" |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
23 |
#include "singleton.h" |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
24 |
#include "uid-manager.h" |
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
25 |
#include "empty-trace-resolver.h" |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
26 |
#include <vector> |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
27 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
28 |
namespace { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
29 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
30 |
class IidManager : public ns3::UidManager |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
31 |
{}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
32 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
33 |
class IidTree |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
34 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
35 |
public: |
712
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
36 |
void SetParent (uint16_t child, const uint16_t *parent); |
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
37 |
uint16_t LookupParent (uint16_t child); |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
38 |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
39 |
private: |
712
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
40 |
std::vector<const uint16_t *> m_parents; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
41 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
42 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
43 |
void |
712
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
44 |
IidTree::SetParent (uint16_t child, const uint16_t *parent) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
45 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
46 |
m_parents.resize (child+1); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
47 |
m_parents[child] = parent; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
48 |
} |
712
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
49 |
uint16_t |
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
50 |
IidTree::LookupParent (uint16_t child) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
51 |
{ |
718 | 52 |
NS_ASSERT (child < m_parents.size ()); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
53 |
return *(m_parents[child]); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
54 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
55 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
56 |
} // anonymous namespace |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
57 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
58 |
namespace ns3 { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
59 |
|
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
60 |
class InterfaceIdTraceResolver : public TraceResolver |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
61 |
{ |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
62 |
public: |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
63 |
InterfaceIdTraceResolver (Ptr<Object> aggregate); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
64 |
virtual void Connect (std::string path, CallbackBase const &cb, const TraceContext &context); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
65 |
virtual void Disconnect (std::string path, CallbackBase const &cb); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
66 |
private: |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
67 |
Ptr<Object> ParseForInterface (std::string path); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
68 |
Ptr<Object> m_aggregate; |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
69 |
}; |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
70 |
|
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
71 |
InterfaceIdTraceResolver::InterfaceIdTraceResolver (Ptr<Object> aggregate) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
72 |
: m_aggregate (aggregate) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
73 |
{} |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
74 |
Ptr<Object> |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
75 |
InterfaceIdTraceResolver::ParseForInterface (std::string path) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
76 |
{ |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
77 |
std::string element = GetElement (path); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
78 |
std::string::size_type dollar_pos = element.find ("$"); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
79 |
if (dollar_pos != 0) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
80 |
{ |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
81 |
return 0; |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
82 |
} |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
83 |
std::string interfaceName = element.substr (1, std::string::npos); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
84 |
InterfaceId interfaceId = InterfaceId::LookupByName (interfaceName); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
85 |
Ptr<Object> interface = m_aggregate->QueryInterface<Object> (interfaceId); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
86 |
return interface; |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
87 |
} |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
88 |
void |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
89 |
InterfaceIdTraceResolver::Connect (std::string path, CallbackBase const &cb, const TraceContext &context) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
90 |
{ |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
91 |
Ptr<Object> interface = ParseForInterface (path); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
92 |
if (interface != 0) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
93 |
{ |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
94 |
interface->TraceConnect (GetSubpath (path), cb, context); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
95 |
} |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
96 |
} |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
97 |
void |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
98 |
InterfaceIdTraceResolver::Disconnect (std::string path, CallbackBase const &cb) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
99 |
{ |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
100 |
Ptr<Object> interface = ParseForInterface (path); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
101 |
if (interface != 0) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
102 |
{ |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
103 |
interface->TraceDisconnect (GetSubpath (path), cb); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
104 |
} |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
105 |
} |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
106 |
|
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
107 |
|
712
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
108 |
InterfaceId::InterfaceId (uint16_t iid) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
109 |
: m_iid (iid) |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
110 |
{} |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
111 |
InterfaceId::~InterfaceId () |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
112 |
{} |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
113 |
InterfaceId |
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
114 |
InterfaceId::LookupByName (std::string name) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
115 |
{ |
712
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
116 |
uint32_t uid = Singleton<IidManager>::Get ()->LookupByName (name); |
718 | 117 |
NS_ASSERT (uid != 0 && uid <= 0xffff); |
712
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
118 |
return InterfaceId (uid); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
119 |
} |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
120 |
InterfaceId |
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
121 |
InterfaceId::LookupParent (InterfaceId iid) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
122 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
123 |
return Singleton<IidTree>::Get ()->LookupParent (iid.m_iid); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
124 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
125 |
|
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
126 |
bool operator == (const InterfaceId &a, const InterfaceId &b) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
127 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
128 |
return a.m_iid == b.m_iid; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
129 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
130 |
|
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
131 |
bool operator != (const InterfaceId &a, const InterfaceId &b) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
132 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
133 |
return a.m_iid != b.m_iid; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
134 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
135 |
|
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
136 |
InterfaceId |
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
137 |
MakeInterfaceId (std::string name, const InterfaceId &parent) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
138 |
{ |
712
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
139 |
uint32_t uid = Singleton<IidManager>::Get ()->Allocate (name); |
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
140 |
NS_ASSERT (uid <= 0xffff); |
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
141 |
InterfaceId iid = uid; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
142 |
Singleton<IidTree>::Get ()->SetParent (iid.m_iid, &parent.m_iid); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
143 |
return iid; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
144 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
145 |
|
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
146 |
InterfaceId |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
147 |
MakeObjectInterfaceId (void) |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
148 |
{ |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
149 |
InterfaceId iid = Singleton<IidManager>::Get ()->Allocate ("Object"); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
150 |
Singleton<IidTree>::Get ()->SetParent (iid.m_iid, &iid.m_iid); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
151 |
return iid; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
152 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
153 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
154 |
|
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
155 |
const InterfaceId Object::iid = MakeObjectInterfaceId (); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
156 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
157 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
158 |
Object::Object () |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
159 |
: m_count (1), |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
160 |
m_iid (Object::iid), |
713
c3c745a80610
add a m_disposed field and check it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
712
diff
changeset
|
161 |
m_disposed (false), |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
162 |
m_next (this) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
163 |
{} |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
164 |
Object::~Object () |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
165 |
{ |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
166 |
m_next = 0; |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
167 |
} |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
168 |
Ptr<Object> |
709
b5c7825babf3
make QueryInterface const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
708
diff
changeset
|
169 |
Object::DoQueryInterface (InterfaceId iid) const |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
170 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
171 |
NS_ASSERT (Check ()); |
709
b5c7825babf3
make QueryInterface const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
708
diff
changeset
|
172 |
const Object *currentObject = this; |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
173 |
do { |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
174 |
NS_ASSERT (currentObject != 0); |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
175 |
InterfaceId cur = currentObject->m_iid; |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
176 |
while (cur != iid && cur != Object::iid) |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
177 |
{ |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
178 |
cur = InterfaceId::LookupParent (cur); |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
179 |
} |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
180 |
if (cur == iid) |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
181 |
{ |
709
b5c7825babf3
make QueryInterface const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
708
diff
changeset
|
182 |
return const_cast<Object *> (currentObject); |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
183 |
} |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
184 |
currentObject = currentObject->m_next; |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
185 |
} while (currentObject != this); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
186 |
return 0; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
187 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
188 |
void |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
189 |
Object::Dispose (void) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
190 |
{ |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
191 |
Object *current = this; |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
192 |
do { |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
193 |
NS_ASSERT (current != 0); |
713
c3c745a80610
add a m_disposed field and check it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
712
diff
changeset
|
194 |
NS_ASSERT (!current->m_disposed); |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
195 |
current->DoDispose (); |
713
c3c745a80610
add a m_disposed field and check it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
712
diff
changeset
|
196 |
current->m_disposed = true; |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
197 |
current = current->m_next; |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
198 |
} while (current != this); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
199 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
200 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
201 |
void |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
202 |
Object::AddInterface (Ptr<Object> o) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
203 |
{ |
718 | 204 |
NS_ASSERT (!m_disposed); |
205 |
NS_ASSERT (!o->m_disposed); |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
206 |
NS_ASSERT (Check ()); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
207 |
NS_ASSERT (o->Check ()); |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
208 |
Object *other = PeekPointer (o); |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
209 |
Object *next = m_next; |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
210 |
m_next = other->m_next; |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
211 |
other->m_next = next; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
212 |
NS_ASSERT (Check ()); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
213 |
NS_ASSERT (o->Check ()); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
214 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
215 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
216 |
void |
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
217 |
Object::TraceConnect (std::string path, const CallbackBase &cb) |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
218 |
{ |
1340
a8d774560c2b
remove const keyword and add a TraceConnect method which takes a TraceContext argument
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1336
diff
changeset
|
219 |
TraceConnect (path, cb, TraceContext ()); |
a8d774560c2b
remove const keyword and add a TraceConnect method which takes a TraceContext argument
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1336
diff
changeset
|
220 |
} |
a8d774560c2b
remove const keyword and add a TraceConnect method which takes a TraceContext argument
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1336
diff
changeset
|
221 |
void |
a8d774560c2b
remove const keyword and add a TraceConnect method which takes a TraceContext argument
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1336
diff
changeset
|
222 |
Object::TraceConnect (std::string path, const CallbackBase &cb, const TraceContext &context) |
a8d774560c2b
remove const keyword and add a TraceConnect method which takes a TraceContext argument
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1336
diff
changeset
|
223 |
{ |
a8d774560c2b
remove const keyword and add a TraceConnect method which takes a TraceContext argument
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1336
diff
changeset
|
224 |
GetTraceResolver ()->Connect (path, cb, context); |
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
225 |
} |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
226 |
void |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
227 |
Object::TraceDisconnect (std::string path, const CallbackBase &cb) |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
228 |
{ |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
229 |
GetTraceResolver ()->Disconnect (path, cb); |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
230 |
} |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
231 |
|
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
232 |
|
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
233 |
void |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
234 |
Object::SetInterfaceId (InterfaceId iid) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
235 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
236 |
NS_ASSERT (Check ()); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
237 |
m_iid = iid; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
238 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
239 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
240 |
void |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
241 |
Object::DoDispose (void) |
713
c3c745a80610
add a m_disposed field and check it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
712
diff
changeset
|
242 |
{ |
c3c745a80610
add a m_disposed field and check it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
712
diff
changeset
|
243 |
NS_ASSERT (!m_disposed); |
c3c745a80610
add a m_disposed field and check it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
712
diff
changeset
|
244 |
} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
245 |
|
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
246 |
Ptr<TraceResolver> |
1340
a8d774560c2b
remove const keyword and add a TraceConnect method which takes a TraceContext argument
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1336
diff
changeset
|
247 |
Object::GetTraceResolver (void) |
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
248 |
{ |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
249 |
Ptr<InterfaceIdTraceResolver> resolver = |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
250 |
Create<InterfaceIdTraceResolver> (this); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
251 |
return resolver; |
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
252 |
} |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
253 |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
254 |
bool |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
255 |
Object::Check (void) const |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
256 |
{ |
701
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
257 |
return (m_count > 0); |
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
258 |
} |
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
259 |
|
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
260 |
void |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
261 |
Object::MaybeDelete (void) const |
701
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
262 |
{ |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
263 |
// First, check if any of the attached |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
264 |
// Object has a non-zero count. |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
265 |
const Object *current = this; |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
266 |
do { |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
267 |
NS_ASSERT (current != 0); |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
268 |
if (current->m_count != 0) |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
269 |
{ |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
270 |
return; |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
271 |
} |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
272 |
current = current->m_next; |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
273 |
} while (current != this); |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
274 |
|
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
275 |
// all attached objects have a zero count so, |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
276 |
// we can delete all attached objects. |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
277 |
current = this; |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
278 |
const Object *end = this; |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
279 |
do { |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
280 |
NS_ASSERT (current != 0); |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
281 |
Object *next = current->m_next; |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
282 |
delete current; |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
283 |
current = next; |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
284 |
} while (current != end); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
285 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
286 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
287 |
} // namespace ns3 |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
288 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
289 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
290 |
#ifdef RUN_SELF_TESTS |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
291 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
292 |
#include "test.h" |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
293 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
294 |
namespace { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
295 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
296 |
class BaseA : public ns3::Object |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
297 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
298 |
public: |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
299 |
static const ns3::InterfaceId iid; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
300 |
BaseA () |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
301 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
302 |
SetInterfaceId (BaseA::iid); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
303 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
304 |
virtual void Dispose (void) {} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
305 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
306 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
307 |
class DerivedA : public BaseA |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
308 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
309 |
public: |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
310 |
static const ns3::InterfaceId iid; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
311 |
DerivedA (int v) |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
312 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
313 |
SetInterfaceId (DerivedA::iid); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
314 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
315 |
virtual void Dispose (void) { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
316 |
BaseA::Dispose (); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
317 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
318 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
319 |
|
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
320 |
const ns3::InterfaceId BaseA::iid = |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
321 |
ns3::MakeInterfaceId ("BaseA", Object::iid); |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
322 |
const ns3::InterfaceId DerivedA::iid = |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
323 |
ns3::MakeInterfaceId ("DerivedA", BaseA::iid);; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
324 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
325 |
class BaseB : public ns3::Object |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
326 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
327 |
public: |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
328 |
static const ns3::InterfaceId iid; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
329 |
BaseB () |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
330 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
331 |
SetInterfaceId (BaseB::iid); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
332 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
333 |
virtual void Dispose (void) {} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
334 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
335 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
336 |
class DerivedB : public BaseB |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
337 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
338 |
public: |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
339 |
static const ns3::InterfaceId iid; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
340 |
DerivedB (int v) |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
341 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
342 |
SetInterfaceId (DerivedB::iid); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
343 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
344 |
virtual void Dispose (void) { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
345 |
BaseB::Dispose (); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
346 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
347 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
348 |
|
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
349 |
const ns3::InterfaceId BaseB::iid = |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
350 |
ns3::MakeInterfaceId ("BaseB", Object::iid); |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
351 |
const ns3::InterfaceId DerivedB::iid = |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
352 |
ns3::MakeInterfaceId ("DerivedB", BaseB::iid);; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
353 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
354 |
} // namespace anonymous |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
355 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
356 |
namespace ns3 { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
357 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
358 |
class ObjectTest : public Test |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
359 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
360 |
public: |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
361 |
ObjectTest (); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
362 |
virtual bool RunTests (void); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
363 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
364 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
365 |
ObjectTest::ObjectTest () |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
366 |
: Test ("Object") |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
367 |
{} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
368 |
bool |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
369 |
ObjectTest::RunTests (void) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
370 |
{ |
1349
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
371 |
bool result = true; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
372 |
|
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
718
diff
changeset
|
373 |
Ptr<BaseA> baseA = Create<BaseA> (); |
1349
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
374 |
NS_TEST_ASSERT_EQUAL (baseA->QueryInterface<BaseA> (BaseA::iid), baseA); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
375 |
NS_TEST_ASSERT_EQUAL (baseA->QueryInterface<BaseA> (DerivedA::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
376 |
NS_TEST_ASSERT_EQUAL (baseA->QueryInterface<DerivedA> (DerivedA::iid), 0); |
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
718
diff
changeset
|
377 |
baseA = Create<DerivedA> (10); |
1349
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
378 |
NS_TEST_ASSERT_EQUAL (baseA->QueryInterface<BaseA> (BaseA::iid), baseA); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
379 |
NS_TEST_ASSERT_EQUAL (baseA->QueryInterface<BaseA> (DerivedA::iid), baseA); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
380 |
NS_TEST_ASSERT_UNEQUAL (baseA->QueryInterface<DerivedA> (DerivedA::iid), 0); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
381 |
|
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
718
diff
changeset
|
382 |
baseA = Create<BaseA> (); |
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
718
diff
changeset
|
383 |
Ptr<BaseB> baseB = Create<BaseB> (); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
384 |
Ptr<BaseB> baseBCopy = baseB; |
703
f96426fb9826
rename ::Add to ::AddInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
702
diff
changeset
|
385 |
baseA->AddInterface (baseB); |
1349
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
386 |
NS_TEST_ASSERT_UNEQUAL (baseA->QueryInterface<BaseA> (BaseA::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
387 |
NS_TEST_ASSERT_EQUAL (baseA->QueryInterface<DerivedA> (DerivedA::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
388 |
NS_TEST_ASSERT_UNEQUAL (baseA->QueryInterface<BaseB> (BaseB::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
389 |
NS_TEST_ASSERT_EQUAL (baseA->QueryInterface<DerivedB> (DerivedB::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
390 |
NS_TEST_ASSERT_UNEQUAL (baseB->QueryInterface<BaseB> (BaseB::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
391 |
NS_TEST_ASSERT_EQUAL (baseB->QueryInterface<DerivedB> (DerivedB::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
392 |
NS_TEST_ASSERT_UNEQUAL (baseB->QueryInterface<BaseA> (BaseA::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
393 |
NS_TEST_ASSERT_EQUAL (baseB->QueryInterface<DerivedA> (DerivedA::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
394 |
NS_TEST_ASSERT_UNEQUAL (baseBCopy->QueryInterface<BaseA> (BaseA::iid), 0); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
395 |
|
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
718
diff
changeset
|
396 |
baseA = Create<DerivedA> (1); |
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
718
diff
changeset
|
397 |
baseB = Create<DerivedB> (1); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
398 |
baseBCopy = baseB; |
703
f96426fb9826
rename ::Add to ::AddInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
702
diff
changeset
|
399 |
baseA->AddInterface (baseB); |
1349
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
400 |
NS_TEST_ASSERT_UNEQUAL (baseA->QueryInterface<DerivedB> (DerivedB::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
401 |
NS_TEST_ASSERT_UNEQUAL (baseA->QueryInterface<BaseB> (BaseB::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
402 |
NS_TEST_ASSERT_UNEQUAL (baseB->QueryInterface<DerivedA> (DerivedA::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
403 |
NS_TEST_ASSERT_UNEQUAL (baseB->QueryInterface<BaseA> (BaseA::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
404 |
NS_TEST_ASSERT_UNEQUAL (baseBCopy->QueryInterface<DerivedA> (DerivedA::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
405 |
NS_TEST_ASSERT_UNEQUAL (baseBCopy->QueryInterface<BaseA> (BaseA::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
406 |
NS_TEST_ASSERT_UNEQUAL (baseB->QueryInterface<DerivedB> (DerivedB::iid), 0); |
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
407 |
NS_TEST_ASSERT_UNEQUAL (baseB->QueryInterface<BaseB> (BaseB::iid), 0) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
408 |
|
732
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
718
diff
changeset
|
409 |
baseA = Create<BaseA> (); |
df256f32b6ae
rename MakeNewObject to Create
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
718
diff
changeset
|
410 |
baseB = Create<BaseB> (); |
703
f96426fb9826
rename ::Add to ::AddInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
702
diff
changeset
|
411 |
baseA->AddInterface (baseB); |
701
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
412 |
baseA = 0; |
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
413 |
baseA = baseB->QueryInterface<BaseA> (BaseA::iid); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
414 |
|
1349
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
415 |
return result; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
416 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
417 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
418 |
static ObjectTest g_interfaceObjectTests; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
419 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
420 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
421 |
} // namespace ns3 |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
422 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
423 |
#endif /* RUN_SELF_TESTS */ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
424 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
425 |