author | Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
Wed, 02 Jan 2008 11:08:11 +0100 | |
changeset 2234 | c1af59565992 |
parent 2233 | b359c83c5fbe |
child 2235 | fb93067a3c2e |
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" |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
25 |
#include "trace-resolver.h" |
1504
36ecc970ba96
checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents:
1420
diff
changeset
|
26 |
#include "log.h" |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
27 |
#include <vector> |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
28 |
|
1504
36ecc970ba96
checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents:
1420
diff
changeset
|
29 |
NS_LOG_COMPONENT_DEFINE ("Object"); |
1374
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
30 |
|
2233
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
31 |
/********************************************************************* |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
32 |
* Helper code |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
33 |
*********************************************************************/ |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
34 |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
35 |
namespace { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
36 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
37 |
class IidManager : public ns3::UidManager |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
38 |
{}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
39 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
40 |
class IidTree |
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 |
public: |
2234
c1af59565992
remove some remnants from the iid-a-variable era.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2233
diff
changeset
|
43 |
void SetParent (uint16_t child, uint16_t parent); |
712
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
44 |
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
|
45 |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
46 |
private: |
2234
c1af59565992
remove some remnants from the iid-a-variable era.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2233
diff
changeset
|
47 |
std::vector<uint16_t> m_parents; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
48 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
49 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
50 |
void |
2234
c1af59565992
remove some remnants from the iid-a-variable era.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2233
diff
changeset
|
51 |
IidTree::SetParent (uint16_t child, uint16_t parent) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
52 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
53 |
m_parents.resize (child+1); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
54 |
m_parents[child] = parent; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
55 |
} |
712
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
56 |
uint16_t |
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
57 |
IidTree::LookupParent (uint16_t child) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
58 |
{ |
718 | 59 |
NS_ASSERT (child < m_parents.size ()); |
2234
c1af59565992
remove some remnants from the iid-a-variable era.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2233
diff
changeset
|
60 |
return m_parents[child]; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
61 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
62 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
63 |
} // anonymous namespace |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
64 |
|
2233
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
65 |
/********************************************************************* |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
66 |
* The InterfaceId TraceResolver |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
67 |
*********************************************************************/ |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
68 |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
69 |
namespace ns3 { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
70 |
|
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
71 |
class InterfaceIdTraceResolver : public TraceResolver |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
72 |
{ |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
73 |
public: |
1383 | 74 |
InterfaceIdTraceResolver (Ptr<const Object> aggregate); |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
75 |
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
|
76 |
virtual void Disconnect (std::string path, CallbackBase const &cb); |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
77 |
virtual void CollectSources (std::string path, const TraceContext &context, |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
78 |
SourceCollection *collection); |
1420
3feedd3e4f5f
rename ConnectPrinterToAll to TraceAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1419
diff
changeset
|
79 |
virtual void TraceAll (std::ostream &os, const TraceContext &context); |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
80 |
private: |
1383 | 81 |
Ptr<const Object> ParseForInterface (std::string path); |
82 |
Ptr<const Object> m_aggregate; |
|
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
83 |
}; |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
84 |
|
1383 | 85 |
InterfaceIdTraceResolver::InterfaceIdTraceResolver (Ptr<const Object> aggregate) |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
86 |
: m_aggregate (aggregate) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
87 |
{} |
1383 | 88 |
Ptr<const Object> |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
89 |
InterfaceIdTraceResolver::ParseForInterface (std::string path) |
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 |
std::string element = GetElement (path); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
92 |
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
|
93 |
if (dollar_pos != 0) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
94 |
{ |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
95 |
return 0; |
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 |
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
|
98 |
InterfaceId interfaceId = InterfaceId::LookupByName (interfaceName); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
99 |
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
|
100 |
return interface; |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
101 |
} |
2231
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
102 |
void |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
103 |
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
|
104 |
{ |
1383 | 105 |
Ptr<const Object> interface = ParseForInterface (path); |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
106 |
if (interface != 0) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
107 |
{ |
1368
e75dc1a2a5fb
add TraceResolver::PrintAvailable method
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1358
diff
changeset
|
108 |
interface->GetTraceResolver ()->Connect (GetSubpath (path), cb, context); |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
109 |
} |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
110 |
} |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
111 |
void |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
112 |
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
|
113 |
{ |
1383 | 114 |
Ptr<const Object> interface = ParseForInterface (path); |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
115 |
if (interface != 0) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
116 |
{ |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
117 |
interface->TraceDisconnect (GetSubpath (path), cb); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
118 |
} |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
119 |
} |
1368
e75dc1a2a5fb
add TraceResolver::PrintAvailable method
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1358
diff
changeset
|
120 |
void |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
121 |
InterfaceIdTraceResolver::CollectSources (std::string path, const TraceContext &context, |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
122 |
SourceCollection *collection) |
1368
e75dc1a2a5fb
add TraceResolver::PrintAvailable method
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1358
diff
changeset
|
123 |
{ |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
124 |
m_aggregate->DoCollectSources (path, context, collection); |
1368
e75dc1a2a5fb
add TraceResolver::PrintAvailable method
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1358
diff
changeset
|
125 |
} |
1419
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
126 |
void |
1420
3feedd3e4f5f
rename ConnectPrinterToAll to TraceAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1419
diff
changeset
|
127 |
InterfaceIdTraceResolver::TraceAll (std::ostream &os, const TraceContext &context) |
1419
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
128 |
{ |
1420
3feedd3e4f5f
rename ConnectPrinterToAll to TraceAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1419
diff
changeset
|
129 |
m_aggregate->DoTraceAll (os, context); |
1419
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
130 |
} |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
131 |
|
2233
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
132 |
/********************************************************************* |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
133 |
* The InterfaceId class |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
134 |
*********************************************************************/ |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
135 |
|
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
136 |
|
712
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
137 |
InterfaceId::InterfaceId (uint16_t iid) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
138 |
: m_iid (iid) |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
139 |
{} |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
140 |
InterfaceId::~InterfaceId () |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
141 |
{} |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
142 |
InterfaceId |
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
143 |
InterfaceId::LookupByName (std::string name) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
144 |
{ |
712
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
145 |
uint32_t uid = Singleton<IidManager>::Get ()->LookupByName (name); |
718 | 146 |
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
|
147 |
return InterfaceId (uid); |
699
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 |
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
150 |
InterfaceId::LookupParent (InterfaceId iid) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
151 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
152 |
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
|
153 |
} |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
154 |
std::string |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
155 |
InterfaceId::GetName (void) const |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
156 |
{ |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
157 |
std::string name = Singleton<IidManager>::Get ()->LookupByUid (m_iid); |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
158 |
return name; |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
159 |
} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
160 |
|
2234
c1af59565992
remove some remnants from the iid-a-variable era.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2233
diff
changeset
|
161 |
bool operator == (InterfaceId a, InterfaceId b) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
162 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
163 |
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
|
164 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
165 |
|
2234
c1af59565992
remove some remnants from the iid-a-variable era.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2233
diff
changeset
|
166 |
bool operator != (InterfaceId a, InterfaceId b) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
167 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
168 |
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
|
169 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
170 |
|
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
171 |
InterfaceId |
2234
c1af59565992
remove some remnants from the iid-a-variable era.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2233
diff
changeset
|
172 |
MakeInterfaceId (std::string name, InterfaceId parent) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
173 |
{ |
712
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
174 |
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
|
175 |
NS_ASSERT (uid <= 0xffff); |
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
176 |
InterfaceId iid = uid; |
2234
c1af59565992
remove some remnants from the iid-a-variable era.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2233
diff
changeset
|
177 |
Singleton<IidTree>::Get ()->SetParent (iid.m_iid, parent.m_iid); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
178 |
return iid; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
179 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
180 |
|
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
181 |
InterfaceId |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
182 |
MakeObjectInterfaceId (void) |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
183 |
{ |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
184 |
InterfaceId iid = Singleton<IidManager>::Get ()->Allocate ("Object"); |
2234
c1af59565992
remove some remnants from the iid-a-variable era.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2233
diff
changeset
|
185 |
Singleton<IidTree>::Get ()->SetParent (iid.m_iid, iid.m_iid); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
186 |
return iid; |
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 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
189 |
|
2233
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
190 |
/********************************************************************* |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
191 |
* The Object implementation |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
192 |
*********************************************************************/ |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
193 |
|
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
194 |
|
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
195 |
InterfaceId |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
196 |
Object::iid (void) |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
197 |
{ |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
198 |
static InterfaceId iid = MakeObjectInterfaceId (); |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
199 |
return iid; |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
200 |
} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
201 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
202 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
203 |
Object::Object () |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
204 |
: m_count (1), |
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
205 |
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
|
206 |
m_disposed (false), |
1374
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
207 |
m_collecting (false), |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
208 |
m_next (this) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
209 |
{} |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
210 |
Object::~Object () |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
211 |
{ |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
212 |
m_next = 0; |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
213 |
} |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
214 |
Ptr<Object> |
709
b5c7825babf3
make QueryInterface const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
708
diff
changeset
|
215 |
Object::DoQueryInterface (InterfaceId iid) const |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
216 |
{ |
1534
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
217 |
NS_ASSERT (CheckLoose ()); |
709
b5c7825babf3
make QueryInterface const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
708
diff
changeset
|
218 |
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
|
219 |
do { |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
220 |
NS_ASSERT (currentObject != 0); |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
221 |
InterfaceId cur = currentObject->m_iid; |
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
222 |
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
|
223 |
{ |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
224 |
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
|
225 |
} |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
226 |
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
|
227 |
{ |
709
b5c7825babf3
make QueryInterface const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
708
diff
changeset
|
228 |
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
|
229 |
} |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
230 |
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
|
231 |
} while (currentObject != this); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
232 |
return 0; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
233 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
234 |
void |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
235 |
Object::Dispose (void) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
236 |
{ |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
237 |
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
|
238 |
do { |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
239 |
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
|
240 |
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
|
241 |
current->DoDispose (); |
713
c3c745a80610
add a m_disposed field and check it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
712
diff
changeset
|
242 |
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
|
243 |
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
|
244 |
} while (current != this); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
245 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
246 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
247 |
void |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
248 |
Object::AddInterface (Ptr<Object> o) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
249 |
{ |
718 | 250 |
NS_ASSERT (!m_disposed); |
251 |
NS_ASSERT (!o->m_disposed); |
|
1534
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
252 |
NS_ASSERT (CheckLoose ()); |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
253 |
NS_ASSERT (o->CheckLoose ()); |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
254 |
Object *other = PeekPointer (o); |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
255 |
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
|
256 |
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
|
257 |
other->m_next = next; |
1534
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
258 |
NS_ASSERT (CheckLoose ()); |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
259 |
NS_ASSERT (o->CheckLoose ()); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
260 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
261 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
262 |
void |
1383 | 263 |
Object::TraceConnect (std::string path, const CallbackBase &cb) const |
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
264 |
{ |
1534
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
265 |
NS_ASSERT (CheckLoose ()); |
1368
e75dc1a2a5fb
add TraceResolver::PrintAvailable method
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1358
diff
changeset
|
266 |
GetTraceResolver ()->Connect (path, cb, TraceContext ()); |
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
267 |
} |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
268 |
void |
1383 | 269 |
Object::TraceDisconnect (std::string path, const CallbackBase &cb) const |
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
270 |
{ |
1534
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
271 |
NS_ASSERT (CheckLoose ()); |
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
272 |
GetTraceResolver ()->Disconnect (path, cb); |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
273 |
} |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
274 |
|
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
275 |
void |
708
e8cac905d541
port ComponentManager to Object from Interface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
706
diff
changeset
|
276 |
Object::SetInterfaceId (InterfaceId iid) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
277 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
278 |
NS_ASSERT (Check ()); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
279 |
m_iid = iid; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
280 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
281 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
282 |
void |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
283 |
Object::DoDispose (void) |
713
c3c745a80610
add a m_disposed field and check it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
712
diff
changeset
|
284 |
{ |
c3c745a80610
add a m_disposed field and check it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
712
diff
changeset
|
285 |
NS_ASSERT (!m_disposed); |
c3c745a80610
add a m_disposed field and check it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
712
diff
changeset
|
286 |
} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
287 |
|
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
288 |
Ptr<TraceResolver> |
1383 | 289 |
Object::GetTraceResolver (void) const |
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
290 |
{ |
1534
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
291 |
NS_ASSERT (CheckLoose ()); |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
292 |
Ptr<InterfaceIdTraceResolver> resolver = |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
293 |
Create<InterfaceIdTraceResolver> (this); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
294 |
return resolver; |
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
295 |
} |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
296 |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
297 |
bool |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
298 |
Object::Check (void) const |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
299 |
{ |
701
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
300 |
return (m_count > 0); |
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
301 |
} |
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
302 |
|
1534
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
303 |
/* In some cases, when an event is scheduled against a subclass of |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
304 |
* Object, and if no one owns a reference directly to this object, the |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
305 |
* object is alive, has a refcount of zero and the method ran when the |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
306 |
* event expires runs against the raw pointer which means that we are |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
307 |
* manipulating an object with a refcount of zero. So, instead we |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
308 |
* check the aggregate reference count. |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
309 |
*/ |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
310 |
bool |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
311 |
Object::CheckLoose (void) const |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
312 |
{ |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
313 |
uint32_t refcount = 0; |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
314 |
const Object *current = this; |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
315 |
do |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
316 |
{ |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
317 |
refcount += current->m_count; |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
318 |
current = current->m_next; |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
319 |
} |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
320 |
while (current != this); |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
321 |
|
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
322 |
return (refcount > 0); |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
323 |
} |
6b7a4e88c422
Make Object::QueryInterface and AddInterface check for the aggregate refcount instead of the object refcount, reason explained in a comment near Object::CheckLoose. Add the same check also to TraceConnect/Disconnect and GetTraceResolver.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents:
1504
diff
changeset
|
324 |
|
701
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
325 |
void |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
326 |
Object::MaybeDelete (void) const |
701
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
327 |
{ |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
328 |
// 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
|
329 |
// Object has a non-zero count. |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
330 |
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
|
331 |
do { |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
332 |
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
|
333 |
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
|
334 |
{ |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
335 |
return; |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
336 |
} |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
337 |
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
|
338 |
} 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
|
339 |
|
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
340 |
// 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
|
341 |
// 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
|
342 |
current = this; |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
343 |
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
|
344 |
do { |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
345 |
NS_ASSERT (current != 0); |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
346 |
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
|
347 |
delete current; |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
348 |
current = next; |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
349 |
} while (current != end); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
350 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
351 |
|
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
352 |
void |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
353 |
Object::DoCollectSources (std::string path, const TraceContext &context, |
1383 | 354 |
TraceResolver::SourceCollection *collection) const |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
355 |
{ |
1383 | 356 |
const Object *current; |
1374
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
357 |
current = this; |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
358 |
do { |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
359 |
if (current->m_collecting) |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
360 |
{ |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
361 |
return; |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
362 |
} |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
363 |
current = current->m_next; |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
364 |
} while (current != this); |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
365 |
|
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
366 |
m_collecting = true; |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
367 |
|
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
368 |
current = this->m_next; |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
369 |
while (current != this) |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
370 |
{ |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
371 |
NS_ASSERT (current != 0); |
1504
36ecc970ba96
checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents:
1420
diff
changeset
|
372 |
NS_LOG_LOGIC ("collect current=" << current); |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
373 |
InterfaceId cur = current->m_iid; |
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
374 |
while (cur != Object::iid ()) |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
375 |
{ |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
376 |
std::string name = cur.GetName (); |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
377 |
std::string fullpath = path; |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
378 |
fullpath.append ("/$"); |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
379 |
fullpath.append (name); |
1504
36ecc970ba96
checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents:
1420
diff
changeset
|
380 |
NS_LOG_LOGIC("collect: " << fullpath); |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
381 |
current->GetTraceResolver ()->CollectSources (fullpath, context, collection); |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
382 |
cur = InterfaceId::LookupParent (cur); |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
383 |
} |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
384 |
current = current->m_next; |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
385 |
} |
1374
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
386 |
|
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
387 |
m_collecting = false; |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
388 |
} |
1419
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
389 |
void |
1420
3feedd3e4f5f
rename ConnectPrinterToAll to TraceAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1419
diff
changeset
|
390 |
Object::DoTraceAll (std::ostream &os, const TraceContext &context) const |
1419
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
391 |
{ |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
392 |
const Object *current; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
393 |
current = this; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
394 |
do { |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
395 |
if (current->m_collecting) |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
396 |
{ |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
397 |
return; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
398 |
} |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
399 |
current = current->m_next; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
400 |
} while (current != this); |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
401 |
|
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
402 |
m_collecting = true; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
403 |
|
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
404 |
current = this->m_next; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
405 |
while (current != this) |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
406 |
{ |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
407 |
NS_ASSERT (current != 0); |
1420
3feedd3e4f5f
rename ConnectPrinterToAll to TraceAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1419
diff
changeset
|
408 |
current->GetTraceResolver ()->TraceAll (os, context); |
1419
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
409 |
current = current->m_next; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
410 |
} |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
411 |
|
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
412 |
m_collecting = false; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
413 |
} |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
414 |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
415 |
} // namespace ns3 |
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 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
418 |
#ifdef RUN_SELF_TESTS |
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 |
#include "test.h" |
1358
2170807697a7
move includes down to where they are really needed
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1357
diff
changeset
|
421 |
#include "sv-trace-source.h" |
2170807697a7
move includes down to where they are really needed
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1357
diff
changeset
|
422 |
#include "composite-trace-resolver.h" |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
423 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
424 |
namespace { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
425 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
426 |
class BaseA : public ns3::Object |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
427 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
428 |
public: |
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
429 |
static ns3::InterfaceId iid (void) { |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
430 |
static ns3::InterfaceId iid = ns3::MakeInterfaceId ("BaseA", Object::iid ()); |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
431 |
return iid; |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
432 |
} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
433 |
BaseA () |
2230
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
434 |
{} |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
435 |
void BaseGenerateTrace (int16_t v) |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
436 |
{ m_source = v; } |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
437 |
virtual void Dispose (void) {} |
1406
ac5372d16b5f
add missing const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1386
diff
changeset
|
438 |
virtual ns3::Ptr<ns3::TraceResolver> GetTraceResolver (void) const |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
439 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
440 |
ns3::Ptr<ns3::CompositeTraceResolver> resolver = |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
441 |
ns3::Create<ns3::CompositeTraceResolver> (); |
1379
f323d2dcdaf6
document trace source signatures
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1374
diff
changeset
|
442 |
resolver->AddSource ("basea-x", ns3::TraceDoc ("test source"), m_source); |
1386
f2ee41c3e788
avoid method naming ambiguity in CompositeTraceResolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1383
diff
changeset
|
443 |
resolver->SetParentResolver (Object::GetTraceResolver ()); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
444 |
return resolver; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
445 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
446 |
ns3::SVTraceSource<int16_t> m_source; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
447 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
448 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
449 |
class DerivedA : public BaseA |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
450 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
451 |
public: |
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
452 |
static ns3::InterfaceId iid (void) { |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
453 |
static ns3::InterfaceId iid = ns3::MakeInterfaceId ("DerivedA", BaseA::iid ()); |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
454 |
return iid; |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
455 |
} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
456 |
DerivedA (int v) |
2230
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
457 |
{} |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
458 |
void DerivedGenerateTrace (int16_t v) |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
459 |
{ m_sourceDerived = v; } |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
460 |
virtual void Dispose (void) { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
461 |
BaseA::Dispose (); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
462 |
} |
1406
ac5372d16b5f
add missing const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1386
diff
changeset
|
463 |
virtual ns3::Ptr<ns3::TraceResolver> GetTraceResolver (void) const |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
464 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
465 |
ns3::Ptr<ns3::CompositeTraceResolver> resolver = |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
466 |
ns3::Create<ns3::CompositeTraceResolver> (); |
1379
f323d2dcdaf6
document trace source signatures
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1374
diff
changeset
|
467 |
resolver->AddSource ("deriveda-x", ns3::TraceDoc ("test source"), m_sourceDerived); |
1386
f2ee41c3e788
avoid method naming ambiguity in CompositeTraceResolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1383
diff
changeset
|
468 |
resolver->SetParentResolver (BaseA::GetTraceResolver ()); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
469 |
return resolver; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
470 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
471 |
ns3::SVTraceSource<int16_t> m_sourceDerived; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
472 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
473 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
474 |
class BaseB : public ns3::Object |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
475 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
476 |
public: |
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
477 |
static ns3::InterfaceId iid (void) { |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
478 |
static ns3::InterfaceId iid = ns3::MakeInterfaceId ("BaseB", Object::iid ()); |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
479 |
return iid; |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
480 |
} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
481 |
BaseB () |
2230
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
482 |
{} |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
483 |
void BaseGenerateTrace (int16_t v) |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
484 |
{ m_source = v; } |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
485 |
virtual void Dispose (void) {} |
1406
ac5372d16b5f
add missing const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1386
diff
changeset
|
486 |
virtual ns3::Ptr<ns3::TraceResolver> GetTraceResolver (void) const |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
487 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
488 |
ns3::Ptr<ns3::CompositeTraceResolver> resolver = |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
489 |
ns3::Create<ns3::CompositeTraceResolver> (); |
1379
f323d2dcdaf6
document trace source signatures
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1374
diff
changeset
|
490 |
resolver->AddSource ("baseb-x", ns3::TraceDoc ("test source"), m_source); |
1386
f2ee41c3e788
avoid method naming ambiguity in CompositeTraceResolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1383
diff
changeset
|
491 |
resolver->SetParentResolver (Object::GetTraceResolver ()); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
492 |
return resolver; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
493 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
494 |
ns3::SVTraceSource<int16_t> m_source; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
495 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
496 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
497 |
class DerivedB : public BaseB |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
498 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
499 |
public: |
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
500 |
static ns3::InterfaceId iid (void) { |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
501 |
static ns3::InterfaceId iid = ns3::MakeInterfaceId ("DerivedB", BaseB::iid ()); |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
502 |
return iid; |
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
503 |
} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
504 |
DerivedB (int v) |
2230
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
505 |
{} |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
506 |
void DerivedGenerateTrace (int16_t v) |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
507 |
{ m_sourceDerived = v; } |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
508 |
virtual void Dispose (void) { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
509 |
BaseB::Dispose (); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
510 |
} |
1406
ac5372d16b5f
add missing const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1386
diff
changeset
|
511 |
virtual ns3::Ptr<ns3::TraceResolver> GetTraceResolver (void) const |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
512 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
513 |
ns3::Ptr<ns3::CompositeTraceResolver> resolver = |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
514 |
ns3::Create<ns3::CompositeTraceResolver> (); |
1379
f323d2dcdaf6
document trace source signatures
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1374
diff
changeset
|
515 |
resolver->AddSource ("derivedb-x", ns3::TraceDoc ("test source"), m_sourceDerived); |
1386
f2ee41c3e788
avoid method naming ambiguity in CompositeTraceResolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1383
diff
changeset
|
516 |
resolver->SetParentResolver (BaseB::GetTraceResolver ()); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
517 |
return resolver; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
518 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
519 |
ns3::SVTraceSource<int16_t> m_sourceDerived; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
520 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
521 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
522 |
} // namespace anonymous |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
523 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
524 |
namespace ns3 { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
525 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
526 |
class ObjectTest : public Test |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
527 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
528 |
public: |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
529 |
ObjectTest (); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
530 |
virtual bool RunTests (void); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
531 |
private: |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
532 |
void BaseATrace (const TraceContext &context, int64_t oldValue, int64_t newValue); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
533 |
void DerivedATrace (const TraceContext &context, int64_t oldValue, int64_t newValue); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
534 |
void BaseBTrace (const TraceContext &context, int64_t oldValue, int64_t newValue); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
535 |
void DerivedBTrace (const TraceContext &context, int64_t oldValue, int64_t newValue); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
536 |
|
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
537 |
bool m_baseATrace; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
538 |
bool m_derivedATrace; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
539 |
bool m_baseBTrace; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
540 |
bool m_derivedBTrace; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
541 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
542 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
543 |
ObjectTest::ObjectTest () |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
544 |
: Test ("Object") |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
545 |
{} |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
546 |
void |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
547 |
ObjectTest::BaseATrace (const TraceContext &context, int64_t oldValue, int64_t newValue) |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
548 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
549 |
m_baseATrace = true; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
550 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
551 |
void |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
552 |
ObjectTest::DerivedATrace (const TraceContext &context, int64_t oldValue, int64_t newValue) |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
553 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
554 |
m_derivedATrace = true; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
555 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
556 |
void |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
557 |
ObjectTest::BaseBTrace (const TraceContext &context, int64_t oldValue, int64_t newValue) |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
558 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
559 |
m_baseBTrace = true; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
560 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
561 |
void |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
562 |
ObjectTest::DerivedBTrace (const TraceContext &context, int64_t oldValue, int64_t newValue) |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
563 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
564 |
m_derivedBTrace = true; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
565 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
566 |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
567 |
bool |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
568 |
ObjectTest::RunTests (void) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
569 |
{ |
1349
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
570 |
bool result = true; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
571 |
|
2230
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
572 |
Ptr<BaseA> baseA = CreateObject<BaseA> (); |
2231
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
573 |
NS_TEST_ASSERT_EQUAL (baseA->QueryInterface<BaseA> (), baseA); |
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
574 |
NS_TEST_ASSERT_EQUAL (baseA->QueryInterface<BaseA> (DerivedA::iid ()), 0); |
2231
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
575 |
NS_TEST_ASSERT_EQUAL (baseA->QueryInterface<DerivedA> (), 0); |
2230
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
576 |
baseA = CreateObject<DerivedA> (10); |
2231
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
577 |
NS_TEST_ASSERT_EQUAL (baseA->QueryInterface<BaseA> (), baseA); |
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
578 |
NS_TEST_ASSERT_EQUAL (baseA->QueryInterface<BaseA> (DerivedA::iid ()), baseA); |
2231
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
579 |
NS_TEST_ASSERT_UNEQUAL (baseA->QueryInterface<DerivedA> (), 0); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
580 |
|
2230
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
581 |
baseA = CreateObject<BaseA> (); |
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
582 |
Ptr<BaseB> baseB = CreateObject<BaseB> (); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
583 |
Ptr<BaseB> baseBCopy = baseB; |
703
f96426fb9826
rename ::Add to ::AddInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
702
diff
changeset
|
584 |
baseA->AddInterface (baseB); |
2231
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
585 |
NS_TEST_ASSERT_UNEQUAL (baseA->QueryInterface<BaseA> (), 0); |
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
586 |
NS_TEST_ASSERT_EQUAL (baseA->QueryInterface<DerivedA> (), 0); |
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
587 |
NS_TEST_ASSERT_UNEQUAL (baseA->QueryInterface<BaseB> (), 0); |
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
588 |
NS_TEST_ASSERT_EQUAL (baseA->QueryInterface<DerivedB> (), 0); |
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
589 |
NS_TEST_ASSERT_UNEQUAL (baseB->QueryInterface<BaseB> (), 0); |
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
590 |
NS_TEST_ASSERT_EQUAL (baseB->QueryInterface<DerivedB> (), 0); |
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
591 |
NS_TEST_ASSERT_UNEQUAL (baseB->QueryInterface<BaseA> (), 0); |
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
592 |
NS_TEST_ASSERT_EQUAL (baseB->QueryInterface<DerivedA> (), 0); |
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
593 |
NS_TEST_ASSERT_UNEQUAL (baseBCopy->QueryInterface<BaseA> (), 0); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
594 |
|
2230
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
595 |
baseA = CreateObject<DerivedA> (1); |
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
596 |
baseB = CreateObject<DerivedB> (1); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
597 |
baseBCopy = baseB; |
703
f96426fb9826
rename ::Add to ::AddInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
702
diff
changeset
|
598 |
baseA->AddInterface (baseB); |
2231
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
599 |
NS_TEST_ASSERT_UNEQUAL (baseA->QueryInterface<DerivedB> (), 0); |
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
600 |
NS_TEST_ASSERT_UNEQUAL (baseA->QueryInterface<BaseB> (), 0); |
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
601 |
NS_TEST_ASSERT_UNEQUAL (baseB->QueryInterface<DerivedA> (), 0); |
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
602 |
NS_TEST_ASSERT_UNEQUAL (baseB->QueryInterface<BaseA> (), 0); |
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
603 |
NS_TEST_ASSERT_UNEQUAL (baseBCopy->QueryInterface<DerivedA> (), 0); |
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
604 |
NS_TEST_ASSERT_UNEQUAL (baseBCopy->QueryInterface<BaseA> (), 0); |
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
605 |
NS_TEST_ASSERT_UNEQUAL (baseB->QueryInterface<DerivedB> (), 0); |
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
606 |
NS_TEST_ASSERT_UNEQUAL (baseB->QueryInterface<BaseB> (), 0) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
607 |
|
2230
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
608 |
baseA = CreateObject<BaseA> (); |
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
609 |
baseB = CreateObject<BaseB> (); |
703
f96426fb9826
rename ::Add to ::AddInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
702
diff
changeset
|
610 |
baseA->AddInterface (baseB); |
701
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
611 |
baseA = 0; |
2231
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
612 |
baseA = baseB->QueryInterface<BaseA> (); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
613 |
|
2230
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
614 |
baseA = CreateObject<BaseA> (); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
615 |
baseA->TraceConnect ("/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
616 |
m_baseATrace = false; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
617 |
baseA->BaseGenerateTrace (1); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
618 |
NS_TEST_ASSERT (m_baseATrace); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
619 |
baseA->TraceDisconnect ("/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
620 |
|
2230
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
621 |
baseB = CreateObject<BaseB> (); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
622 |
baseB->TraceConnect ("/baseb-x", MakeCallback (&ObjectTest::BaseBTrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
623 |
m_baseBTrace = false; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
624 |
baseB->BaseGenerateTrace (2); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
625 |
NS_TEST_ASSERT (m_baseBTrace); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
626 |
baseB->TraceDisconnect ("/baseb-x", MakeCallback (&ObjectTest::BaseBTrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
627 |
|
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
628 |
baseA->AddInterface (baseB); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
629 |
|
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
630 |
baseA->TraceConnect ("/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
631 |
m_baseATrace = false; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
632 |
baseA->BaseGenerateTrace (3); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
633 |
NS_TEST_ASSERT (m_baseATrace); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
634 |
baseA->TraceDisconnect ("/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
635 |
|
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
636 |
baseA->TraceConnect ("/$BaseB/baseb-x", MakeCallback (&ObjectTest::BaseBTrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
637 |
m_baseBTrace = false; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
638 |
baseB->BaseGenerateTrace (4); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
639 |
NS_TEST_ASSERT (m_baseBTrace); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
640 |
baseA->TraceDisconnect ("/$BaseB/baseb-x", MakeCallback (&ObjectTest::BaseBTrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
641 |
m_baseBTrace = false; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
642 |
baseB->BaseGenerateTrace (5); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
643 |
NS_TEST_ASSERT (!m_baseBTrace); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
644 |
|
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
645 |
baseB->TraceConnect ("/$BaseA/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
646 |
m_baseATrace = false; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
647 |
baseA->BaseGenerateTrace (6); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
648 |
NS_TEST_ASSERT (m_baseATrace); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
649 |
baseB->TraceDisconnect ("/$BaseA/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
650 |
|
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
651 |
baseA->TraceConnect ("/$BaseA/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
652 |
m_baseATrace = false; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
653 |
baseA->BaseGenerateTrace (7); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
654 |
NS_TEST_ASSERT (m_baseATrace); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
655 |
baseA->TraceDisconnect ("/$BaseA/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
656 |
|
1357
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
657 |
Ptr<DerivedA> derivedA; |
2230
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
658 |
derivedA = CreateObject<DerivedA> (1); |
9f13ac3291e0
add CreateObject<> to instanciate subclasses of the Object base class. Replaces Create<>.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1781
diff
changeset
|
659 |
baseB = CreateObject<BaseB> (); |
1357
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
660 |
derivedA->AddInterface (baseB); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
661 |
baseB->TraceConnect ("/$DerivedA/deriveda-x", MakeCallback (&ObjectTest::DerivedATrace, this)); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
662 |
baseB->TraceConnect ("/$DerivedA/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
663 |
m_derivedATrace = false; |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
664 |
m_baseATrace = false; |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
665 |
derivedA->DerivedGenerateTrace (8); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
666 |
derivedA->BaseGenerateTrace (9); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
667 |
NS_TEST_ASSERT (m_derivedATrace); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
668 |
NS_TEST_ASSERT (m_baseATrace); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
669 |
baseB->TraceDisconnect ("/$DerivedA/deriveda-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
670 |
baseB->TraceDisconnect ("/$DerivedA/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
671 |
|
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
672 |
baseB->TraceConnect ("/$DerivedA/*", MakeCallback (&ObjectTest::DerivedATrace, this)); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
673 |
m_derivedATrace = false; |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
674 |
derivedA->DerivedGenerateTrace (10); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
675 |
NS_TEST_ASSERT (m_derivedATrace); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
676 |
// here, we have connected the derived trace sink to all |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
677 |
// trace sources, including the base trace source. |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
678 |
m_derivedATrace = false; |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
679 |
derivedA->BaseGenerateTrace (11); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
680 |
NS_TEST_ASSERT (m_derivedATrace); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
681 |
baseB->TraceDisconnect ("/$DerivedA/*", MakeCallback (&ObjectTest::BaseATrace, this)); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
682 |
|
1349
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
683 |
return result; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
684 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
685 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
686 |
static ObjectTest g_interfaceObjectTests; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
687 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
688 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
689 |
} // namespace ns3 |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
690 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
691 |
#endif /* RUN_SELF_TESTS */ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
692 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
693 |