author | Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
Wed, 20 Feb 2008 20:24:52 +0100 | |
changeset 2435 | 3128175f5866 |
parent 2433 | 3a98e1db7f80 |
child 2436 | 23415bac7eaf |
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" |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
24 |
#include "trace-resolver.h" |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
25 |
#include "value.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> |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
28 |
#include <sstream> |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
29 |
|
1504
36ecc970ba96
checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents:
1420
diff
changeset
|
30 |
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
|
31 |
|
2233
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
32 |
/********************************************************************* |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
33 |
* Helper code |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
34 |
*********************************************************************/ |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
35 |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
36 |
namespace { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
37 |
|
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
38 |
class IidManager |
699
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 |
public: |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
41 |
IidManager (); |
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
42 |
uint16_t AllocateUid (std::string name); |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
43 |
void SetParent (uint16_t uid, uint16_t parent); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
44 |
void SetTypeName (uint16_t uid, std::string typeName); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
45 |
void SetGroupName (uint16_t uid, std::string groupName); |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
46 |
void AddConstructor (uint16_t uid, ns3::CallbackBase callback, uint32_t nArguments); |
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
47 |
uint16_t GetUid (std::string name) const; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
48 |
std::string GetName (uint16_t uid) const; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
49 |
uint16_t GetParent (uint16_t uid) const; |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
50 |
std::string GetTypeName (uint16_t uid) const; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
51 |
std::string GetGroupName (uint16_t uid) const; |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
52 |
ns3::CallbackBase GetConstructor (uint16_t uid, uint32_t nArguments); |
2241
daef67e18b79
add InterfaceId::HasConstructor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2240
diff
changeset
|
53 |
bool HasConstructor (uint16_t uid); |
2239
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
54 |
uint32_t GetRegisteredN (void); |
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
55 |
uint16_t GetRegistered (uint32_t i); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
56 |
void AddParameter (uint16_t uid, |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
57 |
std::string name, |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
58 |
std::string help, |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
59 |
uint32_t flags, |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
60 |
ns3::Attribute initialValue, |
2435
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
61 |
ns3::Ptr<const ns3::Accessor> spec, |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
62 |
ns3::Ptr<const ns3::AttributeChecker> checker); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
63 |
uint32_t GetParametersN (uint16_t uid) const; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
64 |
std::string GetParameterName (uint16_t uid, uint32_t i) const; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
65 |
uint32_t GetParameterFlags (uint16_t uid, uint32_t i) const; |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
66 |
ns3::Attribute GetParameterInitialValue (uint16_t uid, uint32_t i) const; |
2435
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
67 |
ns3::Ptr<const ns3::Accessor> GetParameterAccessor (uint16_t uid, uint32_t i) const; |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
68 |
ns3::Ptr<const ns3::AttributeChecker> GetParameterChecker (uint16_t uid, uint32_t i) const; |
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
69 |
private: |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
70 |
struct ConstructorInformation { |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
71 |
ns3::CallbackBase cb; |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
72 |
uint32_t nArguments; |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
73 |
}; |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
74 |
struct ParameterInformation { |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
75 |
std::string name; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
76 |
std::string help; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
77 |
uint32_t flags; |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
78 |
ns3::Attribute initialValue; |
2435
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
79 |
ns3::Ptr<const ns3::Accessor> param; |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
80 |
ns3::Ptr<const ns3::AttributeChecker> checker; |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
81 |
}; |
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
82 |
struct IidInformation { |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
83 |
std::string name; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
84 |
uint16_t parent; |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
85 |
std::string typeName; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
86 |
std::string groupName; |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
87 |
std::vector<struct ConstructorInformation> constructors; |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
88 |
std::vector<struct ParameterInformation> parameters; |
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
89 |
}; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
90 |
typedef std::vector<struct IidInformation>::const_iterator Iterator; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
91 |
|
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
92 |
struct IidManager::IidInformation *LookupInformation (uint16_t uid) const; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
93 |
|
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
94 |
std::vector<struct IidInformation> m_information; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
95 |
}; |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
96 |
|
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
97 |
IidManager::IidManager () |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
98 |
{} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
99 |
|
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
100 |
uint16_t |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
101 |
IidManager::AllocateUid (std::string name) |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
102 |
{ |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
103 |
uint16_t j = 1; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
104 |
for (Iterator i = m_information.begin (); i != m_information.end (); i++) |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
105 |
{ |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
106 |
if (i->name == name) |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
107 |
{ |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
108 |
NS_FATAL_ERROR ("Trying to allocate twice the same uid: " << name); |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
109 |
return 0; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
110 |
} |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
111 |
j++; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
112 |
} |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
113 |
struct IidInformation information; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
114 |
information.name = name; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
115 |
information.parent = 0; |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
116 |
information.typeName = ""; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
117 |
information.groupName = ""; |
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
118 |
m_information.push_back (information); |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
119 |
uint32_t uid = m_information.size (); |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
120 |
NS_ASSERT (uid <= 0xffff); |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
121 |
return uid; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
122 |
} |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
123 |
|
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
124 |
struct IidManager::IidInformation * |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
125 |
IidManager::LookupInformation (uint16_t uid) const |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
126 |
{ |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
127 |
NS_ASSERT (uid <= m_information.size ()); |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
128 |
return const_cast<struct IidInformation *> (&m_information[uid-1]); |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
129 |
} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
130 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
131 |
void |
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
132 |
IidManager::SetParent (uint16_t uid, uint16_t parent) |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
133 |
{ |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
134 |
NS_ASSERT (parent <= m_information.size ()); |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
135 |
struct IidInformation *information = LookupInformation (uid); |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
136 |
information->parent = parent; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
137 |
} |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
138 |
void |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
139 |
IidManager::SetTypeName (uint16_t uid, std::string typeName) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
140 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
141 |
struct IidInformation *information = LookupInformation (uid); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
142 |
information->typeName = typeName; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
143 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
144 |
void |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
145 |
IidManager::SetGroupName (uint16_t uid, std::string groupName) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
146 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
147 |
struct IidInformation *information = LookupInformation (uid); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
148 |
information->groupName = groupName; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
149 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
150 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
151 |
void |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
152 |
IidManager::AddConstructor (uint16_t uid, ns3::CallbackBase callback, uint32_t nArguments) |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
153 |
{ |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
154 |
struct IidInformation *information = LookupInformation (uid); |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
155 |
struct ConstructorInformation constructor; |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
156 |
constructor.cb = callback; |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
157 |
constructor.nArguments = nArguments; |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
158 |
for (std::vector<struct ConstructorInformation>::const_iterator i = information->constructors.begin (); |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
159 |
i != information->constructors.end (); i++) |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
160 |
{ |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
161 |
if (i->nArguments == nArguments) |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
162 |
{ |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
163 |
NS_FATAL_ERROR ("registered two constructors on the same type with the same number of arguments."); |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
164 |
break; |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
165 |
} |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
166 |
} |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
167 |
information->constructors.push_back (constructor); |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
168 |
} |
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
169 |
|
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
170 |
uint16_t |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
171 |
IidManager::GetUid (std::string name) const |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
172 |
{ |
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
173 |
uint32_t j = 1; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
174 |
for (Iterator i = m_information.begin (); i != m_information.end (); i++) |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
175 |
{ |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
176 |
if (i->name == name) |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
177 |
{ |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
178 |
NS_ASSERT (j <= 0xffff); |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
179 |
return j; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
180 |
} |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
181 |
j++; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
182 |
} |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
183 |
return 0; |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
184 |
} |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
185 |
std::string |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
186 |
IidManager::GetName (uint16_t uid) const |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
187 |
{ |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
188 |
struct IidInformation *information = LookupInformation (uid); |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
189 |
return information->name; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
190 |
} |
712
0708bee3dbf3
use a 16 bit interface id
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
711
diff
changeset
|
191 |
uint16_t |
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
192 |
IidManager::GetParent (uint16_t uid) const |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
193 |
{ |
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
194 |
struct IidInformation *information = LookupInformation (uid); |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
195 |
return information->parent; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
196 |
} |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
197 |
std::string |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
198 |
IidManager::GetTypeName (uint16_t uid) const |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
199 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
200 |
struct IidInformation *information = LookupInformation (uid); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
201 |
return information->typeName; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
202 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
203 |
std::string |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
204 |
IidManager::GetGroupName (uint16_t uid) const |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
205 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
206 |
struct IidInformation *information = LookupInformation (uid); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
207 |
return information->groupName; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
208 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
209 |
|
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
210 |
ns3::CallbackBase |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
211 |
IidManager::GetConstructor (uint16_t uid, uint32_t nArguments) |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
212 |
{ |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
213 |
struct IidInformation *information = LookupInformation (uid); |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
214 |
for (std::vector<struct ConstructorInformation>::const_iterator i = information->constructors.begin (); |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
215 |
i != information->constructors.end (); i++) |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
216 |
{ |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
217 |
if (i->nArguments == nArguments) |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
218 |
{ |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
219 |
return i->cb; |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
220 |
} |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
221 |
} |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
222 |
NS_FATAL_ERROR ("Requested constructor with "<<nArguments<<" arguments not found"); |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
223 |
return ns3::CallbackBase (); |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
224 |
} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
225 |
|
2241
daef67e18b79
add InterfaceId::HasConstructor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2240
diff
changeset
|
226 |
bool |
daef67e18b79
add InterfaceId::HasConstructor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2240
diff
changeset
|
227 |
IidManager::HasConstructor (uint16_t uid) |
daef67e18b79
add InterfaceId::HasConstructor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2240
diff
changeset
|
228 |
{ |
daef67e18b79
add InterfaceId::HasConstructor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2240
diff
changeset
|
229 |
struct IidInformation *information = LookupInformation (uid); |
daef67e18b79
add InterfaceId::HasConstructor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2240
diff
changeset
|
230 |
return !information->constructors.empty (); |
daef67e18b79
add InterfaceId::HasConstructor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2240
diff
changeset
|
231 |
} |
daef67e18b79
add InterfaceId::HasConstructor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2240
diff
changeset
|
232 |
|
2239
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
233 |
uint32_t |
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
234 |
IidManager::GetRegisteredN (void) |
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
235 |
{ |
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
236 |
return m_information.size (); |
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
237 |
} |
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
238 |
uint16_t |
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
239 |
IidManager::GetRegistered (uint32_t i) |
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
240 |
{ |
2247
56b3591fa3b0
use NS_OBJECT_ENSURE_REGISTERED and fix off-by-one in IidManager::GetRegistered
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2243
diff
changeset
|
241 |
return i + 1; |
2239
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
242 |
} |
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
243 |
|
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
244 |
void |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
245 |
IidManager::AddParameter (uint16_t uid, |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
246 |
std::string name, |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
247 |
std::string help, |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
248 |
uint32_t flags, |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
249 |
ns3::Attribute initialValue, |
2435
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
250 |
ns3::Ptr<const ns3::Accessor> spec, |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
251 |
ns3::Ptr<const ns3::AttributeChecker> checker) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
252 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
253 |
struct IidInformation *information = LookupInformation (uid); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
254 |
for (std::vector<struct ParameterInformation>::const_iterator j = information->parameters.begin (); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
255 |
j != information->parameters.end (); j++) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
256 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
257 |
if (j->name == name) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
258 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
259 |
NS_FATAL_ERROR ("Registered the same parameter twice name=\""<<name<<"\" in TypeId=\""<<information->name<<"\""); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
260 |
return; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
261 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
262 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
263 |
struct ParameterInformation param; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
264 |
param.name = name; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
265 |
param.help = help; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
266 |
param.flags = flags; |
2424
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
267 |
param.initialValue = initialValue; |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
268 |
param.param = spec; |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
269 |
param.checker = checker; |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
270 |
information->parameters.push_back (param); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
271 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
272 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
273 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
274 |
uint32_t |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
275 |
IidManager::GetParametersN (uint16_t uid) const |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
276 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
277 |
struct IidInformation *information = LookupInformation (uid); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
278 |
return information->parameters.size (); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
279 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
280 |
std::string |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
281 |
IidManager::GetParameterName (uint16_t uid, uint32_t i) const |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
282 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
283 |
struct IidInformation *information = LookupInformation (uid); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
284 |
NS_ASSERT (i < information->parameters.size ()); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
285 |
return information->parameters[i].name; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
286 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
287 |
uint32_t |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
288 |
IidManager::GetParameterFlags (uint16_t uid, uint32_t i) const |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
289 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
290 |
struct IidInformation *information = LookupInformation (uid); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
291 |
NS_ASSERT (i < information->parameters.size ()); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
292 |
return information->parameters[i].flags; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
293 |
} |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
294 |
ns3::Attribute |
2424
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
295 |
IidManager::GetParameterInitialValue (uint16_t uid, uint32_t i) const |
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
296 |
{ |
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
297 |
struct IidInformation *information = LookupInformation (uid); |
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
298 |
NS_ASSERT (i < information->parameters.size ()); |
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
299 |
return information->parameters[i].initialValue; |
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
300 |
} |
2435
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
301 |
ns3::Ptr<const ns3::Accessor> |
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
302 |
IidManager::GetParameterAccessor (uint16_t uid, uint32_t i) const |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
303 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
304 |
struct IidInformation *information = LookupInformation (uid); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
305 |
NS_ASSERT (i < information->parameters.size ()); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
306 |
return information->parameters[i].param; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
307 |
} |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
308 |
ns3::Ptr<const ns3::AttributeChecker> |
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
309 |
IidManager::GetParameterChecker (uint16_t uid, uint32_t i) const |
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
310 |
{ |
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
311 |
struct IidInformation *information = LookupInformation (uid); |
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
312 |
NS_ASSERT (i < information->parameters.size ()); |
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
313 |
return information->parameters[i].checker; |
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
314 |
} |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
315 |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
316 |
} // anonymous namespace |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
317 |
|
2233
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
318 |
/********************************************************************* |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
319 |
* The TypeId TraceResolver |
2233
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
320 |
*********************************************************************/ |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
321 |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
322 |
namespace ns3 { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
323 |
|
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
324 |
class TypeIdTraceResolver : public TraceResolver |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
325 |
{ |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
326 |
public: |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
327 |
TypeIdTraceResolver (Ptr<const Object> aggregate); |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
328 |
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
|
329 |
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
|
330 |
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
|
331 |
SourceCollection *collection); |
1420
3feedd3e4f5f
rename ConnectPrinterToAll to TraceAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1419
diff
changeset
|
332 |
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
|
333 |
private: |
1383 | 334 |
Ptr<const Object> ParseForInterface (std::string path); |
335 |
Ptr<const Object> m_aggregate; |
|
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
336 |
}; |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
337 |
|
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
338 |
TypeIdTraceResolver::TypeIdTraceResolver (Ptr<const Object> aggregate) |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
339 |
: m_aggregate (aggregate) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
340 |
{} |
1383 | 341 |
Ptr<const Object> |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
342 |
TypeIdTraceResolver::ParseForInterface (std::string path) |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
343 |
{ |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
344 |
std::string element = GetElement (path); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
345 |
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
|
346 |
if (dollar_pos != 0) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
347 |
{ |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
348 |
return 0; |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
349 |
} |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
350 |
std::string interfaceName = element.substr (1, std::string::npos); |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
351 |
TypeId interfaceId = TypeId::LookupByName (interfaceName); |
2257
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
352 |
Ptr<Object> interface = m_aggregate->GetObject<Object> (interfaceId); |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
353 |
return interface; |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
354 |
} |
2231
a5b898c1ee2c
fix bug 122: get rid of duplicate argument to QueryInterface
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2230
diff
changeset
|
355 |
void |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
356 |
TypeIdTraceResolver::Connect (std::string path, CallbackBase const &cb, const TraceContext &context) |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
357 |
{ |
1383 | 358 |
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
|
359 |
if (interface != 0) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
360 |
{ |
1368
e75dc1a2a5fb
add TraceResolver::PrintAvailable method
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1358
diff
changeset
|
361 |
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
|
362 |
} |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
363 |
} |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
364 |
void |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
365 |
TypeIdTraceResolver::Disconnect (std::string path, CallbackBase const &cb) |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
366 |
{ |
1383 | 367 |
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
|
368 |
if (interface != 0) |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
369 |
{ |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
370 |
interface->TraceDisconnect (GetSubpath (path), cb); |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
371 |
} |
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
372 |
} |
1368
e75dc1a2a5fb
add TraceResolver::PrintAvailable method
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1358
diff
changeset
|
373 |
void |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
374 |
TypeIdTraceResolver::CollectSources (std::string path, const TraceContext &context, |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
375 |
SourceCollection *collection) |
1368
e75dc1a2a5fb
add TraceResolver::PrintAvailable method
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1358
diff
changeset
|
376 |
{ |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
377 |
m_aggregate->DoCollectSources (path, context, collection); |
1368
e75dc1a2a5fb
add TraceResolver::PrintAvailable method
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1358
diff
changeset
|
378 |
} |
1419
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
379 |
void |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
380 |
TypeIdTraceResolver::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
|
381 |
{ |
1420
3feedd3e4f5f
rename ConnectPrinterToAll to TraceAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1419
diff
changeset
|
382 |
m_aggregate->DoTraceAll (os, context); |
1419
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
383 |
} |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
384 |
|
2233
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
385 |
/********************************************************************* |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
386 |
* The TypeId class |
2233
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
387 |
*********************************************************************/ |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
388 |
|
2394
bc7abfdb0748
add a default constructor for the TypeId class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2382
diff
changeset
|
389 |
TypeId::TypeId () |
bc7abfdb0748
add a default constructor for the TypeId class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2382
diff
changeset
|
390 |
: m_tid (0) |
bc7abfdb0748
add a default constructor for the TypeId class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2382
diff
changeset
|
391 |
{} |
bc7abfdb0748
add a default constructor for the TypeId class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2382
diff
changeset
|
392 |
|
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
393 |
TypeId::TypeId (std::string name) |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
394 |
{ |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
395 |
uint16_t uid = Singleton<IidManager>::Get ()->AllocateUid (name); |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
396 |
NS_ASSERT (uid != 0); |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
397 |
m_tid = uid; |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
398 |
} |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
399 |
|
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
400 |
|
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
401 |
TypeId::TypeId (uint16_t tid) |
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
402 |
: m_tid (tid) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
403 |
{} |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
404 |
TypeId::~TypeId () |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
405 |
{} |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
406 |
TypeId |
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
407 |
TypeId::LookupByName (std::string name) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
408 |
{ |
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
409 |
uint16_t uid = Singleton<IidManager>::Get ()->GetUid (name); |
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
410 |
NS_ASSERT (uid != 0); |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
411 |
return TypeId (uid); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
412 |
} |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
413 |
bool |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
414 |
TypeId::LookupParameterByFullName (std::string fullName, struct TypeId::ParameterInfo *info) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
415 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
416 |
std::string::size_type pos = fullName.find ("::"); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
417 |
if (pos == std::string::npos) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
418 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
419 |
return 0; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
420 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
421 |
std::string tidName = fullName.substr (0, pos); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
422 |
std::string paramName = fullName.substr (pos+2, fullName.size () - (pos+2)); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
423 |
TypeId tid = LookupByName (tidName); |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
424 |
return tid.LookupParameterByName (paramName, info); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
425 |
} |
2239
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
426 |
uint32_t |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
427 |
TypeId::GetRegisteredN (void) |
2239
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
428 |
{ |
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
429 |
return Singleton<IidManager>::Get ()->GetRegisteredN (); |
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
430 |
} |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
431 |
TypeId |
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
432 |
TypeId::GetRegistered (uint32_t i) |
2239
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
433 |
{ |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
434 |
return TypeId (Singleton<IidManager>::Get ()->GetRegistered (i)); |
2239
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
435 |
} |
b500773d7eae
add support to browse the list of existing InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2238
diff
changeset
|
436 |
|
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
437 |
bool |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
438 |
TypeId::LookupParameterByName (std::string name, struct TypeId::ParameterInfo *info) const |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
439 |
{ |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
440 |
TypeId tid = TypeId (0); |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
441 |
TypeId nextTid = *this; |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
442 |
do { |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
443 |
tid = nextTid; |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
444 |
for (uint32_t i = 0; i < GetParametersN (); i++) |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
445 |
{ |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
446 |
std::string paramName = GetParameterName (i); |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
447 |
if (paramName == name) |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
448 |
{ |
2435
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
449 |
info->spec = GetParameterAccessor (i); |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
450 |
info->flags = GetParameterFlags (i); |
2424
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
451 |
info->initialValue = tid.GetParameterInitialValue (i); |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
452 |
info->checker = tid.GetParameterChecker (i); |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
453 |
return true; |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
454 |
} |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
455 |
} |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
456 |
nextTid = tid.GetParent (); |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
457 |
} while (nextTid != tid); |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
458 |
return false; |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
459 |
} |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
460 |
bool |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
461 |
TypeId::LookupParameterByPosition (uint32_t i, struct TypeId::ParameterInfo *info) const |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
462 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
463 |
uint32_t cur = 0; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
464 |
TypeId tid = TypeId (0); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
465 |
TypeId nextTid = *this; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
466 |
do { |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
467 |
tid = nextTid; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
468 |
for (uint32_t j = 0; j < tid.GetParametersN (); j++) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
469 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
470 |
if (cur == i) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
471 |
{ |
2435
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
472 |
info->spec = tid.GetParameterAccessor (j); |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
473 |
info->flags = tid.GetParameterFlags (j); |
2424
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
474 |
info->initialValue = tid.GetParameterInitialValue (j); |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
475 |
info->checker = tid.GetParameterChecker (j); |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
476 |
return true; |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
477 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
478 |
cur++; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
479 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
480 |
nextTid = tid.GetParent (); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
481 |
} while (nextTid != tid); |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
482 |
return false; |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
483 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
484 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
485 |
|
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
486 |
TypeId |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
487 |
TypeId::SetParent (TypeId tid) |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
488 |
{ |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
489 |
Singleton<IidManager>::Get ()->SetParent (m_tid, tid.m_tid); |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
490 |
return *this; |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
491 |
} |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
492 |
TypeId |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
493 |
TypeId::SetGroupName (std::string groupName) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
494 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
495 |
Singleton<IidManager>::Get ()->SetGroupName (m_tid, groupName); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
496 |
return *this; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
497 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
498 |
TypeId |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
499 |
TypeId::SetTypeName (std::string typeName) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
500 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
501 |
Singleton<IidManager>::Get ()->SetTypeName (m_tid, typeName); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
502 |
return *this; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
503 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
504 |
TypeId |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
505 |
TypeId::GetParent (void) const |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
506 |
{ |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
507 |
uint16_t parent = Singleton<IidManager>::Get ()->GetParent (m_tid); |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
508 |
return TypeId (parent); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
509 |
} |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
510 |
std::string |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
511 |
TypeId::GetGroupName (void) const |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
512 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
513 |
std::string groupName = Singleton<IidManager>::Get ()->GetGroupName (m_tid); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
514 |
return groupName; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
515 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
516 |
std::string |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
517 |
TypeId::GetTypeName (void) const |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
518 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
519 |
std::string typeName = Singleton<IidManager>::Get ()->GetTypeName (m_tid); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
520 |
return typeName; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
521 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
522 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
523 |
std::string |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
524 |
TypeId::GetName (void) const |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
525 |
{ |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
526 |
std::string name = Singleton<IidManager>::Get ()->GetName (m_tid); |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
527 |
return name; |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
528 |
} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
529 |
|
2241
daef67e18b79
add InterfaceId::HasConstructor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2240
diff
changeset
|
530 |
bool |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
531 |
TypeId::HasConstructor (void) const |
2241
daef67e18b79
add InterfaceId::HasConstructor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2240
diff
changeset
|
532 |
{ |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
533 |
bool hasConstructor = Singleton<IidManager>::Get ()->HasConstructor (m_tid); |
2241
daef67e18b79
add InterfaceId::HasConstructor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2240
diff
changeset
|
534 |
return hasConstructor; |
daef67e18b79
add InterfaceId::HasConstructor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2240
diff
changeset
|
535 |
} |
daef67e18b79
add InterfaceId::HasConstructor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2240
diff
changeset
|
536 |
|
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
537 |
void |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
538 |
TypeId::DoAddConstructor (CallbackBase cb, uint32_t nArguments) |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
539 |
{ |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
540 |
Singleton<IidManager>::Get ()->AddConstructor (m_tid, cb, nArguments); |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
541 |
} |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
542 |
|
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
543 |
TypeId |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
544 |
TypeId::AddParameter (std::string name, |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
545 |
std::string help, |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
546 |
Attribute initialValue, |
2435
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
547 |
Ptr<const Accessor> param, |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
548 |
Ptr<const AttributeChecker> checker) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
549 |
{ |
2432
b946f13bc8cb
PARAM -> ATTR
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2427
diff
changeset
|
550 |
Singleton<IidManager>::Get ()->AddParameter (m_tid, name, help, ATTR_SGC, initialValue, param, checker); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
551 |
return *this; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
552 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
553 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
554 |
TypeId |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
555 |
TypeId::AddParameter (std::string name, |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
556 |
std::string help, |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
557 |
uint32_t flags, |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
558 |
Attribute initialValue, |
2435
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
559 |
Ptr<const Accessor> param, |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
560 |
Ptr<const AttributeChecker> checker) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
561 |
{ |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
562 |
Singleton<IidManager>::Get ()->AddParameter (m_tid, name, help, flags, initialValue, param, checker); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
563 |
return *this; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
564 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
565 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
566 |
|
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
567 |
CallbackBase |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
568 |
TypeId::LookupConstructor (uint32_t nArguments) const |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
569 |
{ |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
570 |
CallbackBase constructor = Singleton<IidManager>::Get ()->GetConstructor (m_tid, nArguments); |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
571 |
return constructor; |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
572 |
} |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
573 |
|
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
574 |
Ptr<Object> |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
575 |
TypeId::CreateObject (void) const |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
576 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
577 |
return CreateObject (Parameters ()); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
578 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
579 |
Ptr<Object> |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
580 |
TypeId::CreateObject (const Parameters ¶meters) const |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
581 |
{ |
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
582 |
CallbackBase cb = LookupConstructor (0); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
583 |
Callback<Ptr<Object>,const Parameters &> realCb; |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
584 |
realCb.Assign (cb); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
585 |
Ptr<Object> object = realCb (parameters); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
586 |
return object; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
587 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
588 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
589 |
uint32_t |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
590 |
TypeId::GetParametersN (void) const |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
591 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
592 |
uint32_t n = Singleton<IidManager>::Get ()->GetParametersN (m_tid); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
593 |
return n; |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
594 |
} |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
595 |
std::string |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
596 |
TypeId::GetParameterName (uint32_t i) const |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
597 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
598 |
std::string name = Singleton<IidManager>::Get ()->GetParameterName (m_tid, i); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
599 |
return name; |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
600 |
} |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
601 |
std::string |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
602 |
TypeId::GetParameterFullName (uint32_t i) const |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
603 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
604 |
return GetName () + "::" + GetParameterName (i); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
605 |
} |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
606 |
Attribute |
2424
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
607 |
TypeId::GetParameterInitialValue (uint32_t i) const |
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
608 |
{ |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
609 |
Attribute value = Singleton<IidManager>::Get ()->GetParameterInitialValue (m_tid, i); |
2424
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
610 |
return value; |
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
611 |
} |
2435
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
612 |
Ptr<const Accessor> |
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
613 |
TypeId::GetParameterAccessor (uint32_t i) const |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
614 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
615 |
// Used exclusively by the Object class. |
2435
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
616 |
Ptr<const Accessor> param = Singleton<IidManager>::Get ()->GetParameterAccessor (m_tid, i); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
617 |
return param; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
618 |
} |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
619 |
uint32_t |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
620 |
TypeId::GetParameterFlags (uint32_t i) const |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
621 |
{ |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
622 |
// Used exclusively by the Object class. |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
623 |
uint32_t flags = Singleton<IidManager>::Get ()->GetParameterFlags (m_tid, i); |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
624 |
return flags; |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
625 |
} |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
626 |
Ptr<const AttributeChecker> |
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
627 |
TypeId::GetParameterChecker (uint32_t i) const |
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
628 |
{ |
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
629 |
// Used exclusively by the Object class. |
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
630 |
Ptr<const AttributeChecker> checker = Singleton<IidManager>::Get ()->GetParameterChecker (m_tid, i); |
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
631 |
return checker; |
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
632 |
} |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
633 |
|
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
634 |
|
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
635 |
bool operator == (TypeId a, TypeId b) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
636 |
{ |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
637 |
return a.m_tid == b.m_tid; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
638 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
639 |
|
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
640 |
bool operator != (TypeId a, TypeId b) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
641 |
{ |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
642 |
return a.m_tid != b.m_tid; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
643 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
644 |
|
2233
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
645 |
/********************************************************************* |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
646 |
* The Parameters container implementation |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
647 |
*********************************************************************/ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
648 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
649 |
Parameters::Parameters () |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
650 |
{} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
651 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
652 |
Parameters::Parameters (const Parameters &o) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
653 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
654 |
for (Params::const_iterator i = o.m_parameters.begin (); i != o.m_parameters.end (); i++) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
655 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
656 |
struct Param param; |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
657 |
param.checker = i->checker; |
2374
570f3c6c6142
make Ptr<T> convertible to a Value.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2372
diff
changeset
|
658 |
param.value = i->value.Copy (); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
659 |
m_parameters.push_back (param); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
660 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
661 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
662 |
Parameters & |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
663 |
Parameters::operator = (const Parameters &o) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
664 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
665 |
Reset (); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
666 |
for (Params::const_iterator i = o.m_parameters.begin (); i != o.m_parameters.end (); i++) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
667 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
668 |
struct Param param; |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
669 |
param.checker = i->checker; |
2374
570f3c6c6142
make Ptr<T> convertible to a Value.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2372
diff
changeset
|
670 |
param.value = i->value.Copy (); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
671 |
m_parameters.push_back (param); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
672 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
673 |
return *this; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
674 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
675 |
Parameters::~Parameters () |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
676 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
677 |
Reset (); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
678 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
679 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
680 |
bool |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
681 |
Parameters::Set (std::string name, Attribute value) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
682 |
{ |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
683 |
struct TypeId::ParameterInfo info; |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
684 |
TypeId::LookupParameterByFullName (name, &info); |
2424
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
685 |
bool ok = DoSet (&info, value); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
686 |
return ok; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
687 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
688 |
void |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
689 |
Parameters::SetWithTid (TypeId tid, std::string name, Attribute value) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
690 |
{ |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
691 |
struct TypeId::ParameterInfo info; |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
692 |
tid.LookupParameterByName (name, &info); |
2424
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
693 |
DoSet (&info, value); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
694 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
695 |
void |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
696 |
Parameters::SetWithTid (TypeId tid, uint32_t position, Attribute value) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
697 |
{ |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
698 |
struct TypeId::ParameterInfo info; |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
699 |
tid.LookupParameterByPosition (position, &info); |
2424
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
700 |
DoSet (&info, value); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
701 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
702 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
703 |
void |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
704 |
Parameters::DoSetOne (Ptr<const AttributeChecker> checker, Attribute value) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
705 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
706 |
// get rid of any previous value stored in this |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
707 |
// vector of values. |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
708 |
for (Params::iterator k = m_parameters.begin (); k != m_parameters.end (); k++) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
709 |
{ |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
710 |
if (k->checker == checker) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
711 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
712 |
m_parameters.erase (k); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
713 |
break; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
714 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
715 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
716 |
// store the new value. |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
717 |
struct Param p; |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
718 |
p.checker = checker; |
2374
570f3c6c6142
make Ptr<T> convertible to a Value.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2372
diff
changeset
|
719 |
p.value = value.Copy (); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
720 |
m_parameters.push_back (p); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
721 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
722 |
bool |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
723 |
Parameters::DoSet (struct TypeId::ParameterInfo *info, Attribute value) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
724 |
{ |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
725 |
if (info->checker == 0) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
726 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
727 |
return false; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
728 |
} |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
729 |
bool ok = info->checker->Check (value); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
730 |
if (!ok) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
731 |
{ |
2421
00ef5829bbe8
get rid of Value::ConvertFrom method.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2420
diff
changeset
|
732 |
// attempt to convert to string. |
2424
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
733 |
const StringValue *str = value.DynCast<const StringValue *> (); |
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
734 |
if (str == 0) |
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
735 |
{ |
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
736 |
return false; |
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
737 |
} |
2421
00ef5829bbe8
get rid of Value::ConvertFrom method.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2420
diff
changeset
|
738 |
// attempt to convert back to value. |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
739 |
Attribute v = info->initialValue.Copy (); |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
740 |
ok = v.DeserializeFromString (str->Get (), info->checker); |
2397
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
741 |
if (!ok) |
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
742 |
{ |
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
743 |
return false; |
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
744 |
} |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
745 |
ok = info->checker->Check (v); |
2421
00ef5829bbe8
get rid of Value::ConvertFrom method.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2420
diff
changeset
|
746 |
if (!ok) |
00ef5829bbe8
get rid of Value::ConvertFrom method.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2420
diff
changeset
|
747 |
{ |
00ef5829bbe8
get rid of Value::ConvertFrom method.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2420
diff
changeset
|
748 |
return false; |
00ef5829bbe8
get rid of Value::ConvertFrom method.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2420
diff
changeset
|
749 |
} |
00ef5829bbe8
get rid of Value::ConvertFrom method.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2420
diff
changeset
|
750 |
value = v; |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
751 |
} |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
752 |
DoSetOne (info->checker, value); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
753 |
return true; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
754 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
755 |
void |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
756 |
Parameters::Reset (void) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
757 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
758 |
m_parameters.clear (); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
759 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
760 |
Parameters * |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
761 |
Parameters::GetGlobal (void) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
762 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
763 |
return Singleton<Parameters>::Get (); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
764 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
765 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
766 |
std::string |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
767 |
Parameters::LookupParameterFullNameByChecker (Ptr<const AttributeChecker> checker) const |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
768 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
769 |
for (uint32_t i = 0; i < TypeId::GetRegisteredN (); i++) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
770 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
771 |
TypeId tid = TypeId::GetRegistered (i); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
772 |
for (uint32_t j = 0; j < tid.GetParametersN (); j++) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
773 |
{ |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
774 |
if (checker == tid.GetParameterChecker (j)) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
775 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
776 |
return tid.GetParameterFullName (j); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
777 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
778 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
779 |
} |
2435
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
780 |
NS_FATAL_ERROR ("Could not find requested Accessor."); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
781 |
// quiet compiler. |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
782 |
return ""; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
783 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
784 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
785 |
std::string |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
786 |
Parameters::SerializeToString (void) const |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
787 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
788 |
std::ostringstream oss; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
789 |
for (Params::const_iterator i = m_parameters.begin (); i != m_parameters.end (); i++) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
790 |
{ |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
791 |
std::string name = LookupParameterFullNameByChecker (i->checker); |
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
792 |
oss << name << "=" << i->value.SerializeToString (i->checker); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
793 |
if (i != m_parameters.end ()) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
794 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
795 |
oss << "|"; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
796 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
797 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
798 |
return oss.str (); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
799 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
800 |
bool |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
801 |
Parameters::DeserializeFromString (std::string str) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
802 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
803 |
Reset (); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
804 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
805 |
std::string::size_type cur; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
806 |
cur = 0; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
807 |
do { |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
808 |
std::string::size_type equal = str.find ("=", cur); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
809 |
if (equal == std::string::npos) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
810 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
811 |
// XXX: invalid parameter. |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
812 |
break; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
813 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
814 |
else |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
815 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
816 |
std::string name = str.substr (cur, equal-cur); |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
817 |
struct TypeId::ParameterInfo info; |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
818 |
if (!TypeId::LookupParameterByFullName (name, &info)) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
819 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
820 |
// XXX invalid name. |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
821 |
break; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
822 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
823 |
else |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
824 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
825 |
std::string::size_type next = str.find ("|", cur); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
826 |
std::string value; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
827 |
if (next == std::string::npos) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
828 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
829 |
value = str.substr (equal+1, str.size () - (equal+1)); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
830 |
cur = str.size (); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
831 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
832 |
else |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
833 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
834 |
value = str.substr (equal+1, next - (equal+1)); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
835 |
cur++; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
836 |
} |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
837 |
Attribute val = info.initialValue.Copy (); |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
838 |
bool ok = val.DeserializeFromString (value, info.checker); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
839 |
if (!ok) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
840 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
841 |
// XXX invalid value |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
842 |
break; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
843 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
844 |
else |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
845 |
{ |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
846 |
DoSetOne (info.checker, val); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
847 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
848 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
849 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
850 |
} while (cur != str.size ()); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
851 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
852 |
return true; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
853 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
854 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
855 |
|
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
856 |
/********************************************************************* |
2233
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
857 |
* The Object implementation |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
858 |
*********************************************************************/ |
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
859 |
|
2247
56b3591fa3b0
use NS_OBJECT_ENSURE_REGISTERED and fix off-by-one in IidManager::GetRegistered
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2243
diff
changeset
|
860 |
NS_OBJECT_ENSURE_REGISTERED (Object); |
56b3591fa3b0
use NS_OBJECT_ENSURE_REGISTERED and fix off-by-one in IidManager::GetRegistered
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2243
diff
changeset
|
861 |
|
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
862 |
static TypeId |
2238
05affd9d0dc1
get rid of MakeInterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2237
diff
changeset
|
863 |
GetObjectIid (void) |
05affd9d0dc1
get rid of MakeInterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2237
diff
changeset
|
864 |
{ |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
865 |
TypeId tid = TypeId ("Object"); |
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
866 |
tid.SetParent (tid); |
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
867 |
return tid; |
2238
05affd9d0dc1
get rid of MakeInterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2237
diff
changeset
|
868 |
} |
2233
b359c83c5fbe
add some separation markers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2232
diff
changeset
|
869 |
|
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
870 |
TypeId |
2251
04963d8cca51
iid (void) -> GetTypeId (void)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2250
diff
changeset
|
871 |
Object::GetTypeId (void) |
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
872 |
{ |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
873 |
static TypeId tid = GetObjectIid (); |
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
874 |
return tid; |
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
875 |
} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
876 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
877 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
878 |
Object::Object () |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
879 |
: m_count (1), |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
880 |
m_tid (Object::GetTypeId ()), |
713
c3c745a80610
add a m_disposed field and check it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
712
diff
changeset
|
881 |
m_disposed (false), |
1374
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
882 |
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
|
883 |
m_next (this) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
884 |
{} |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
885 |
Object::~Object () |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
886 |
{ |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
887 |
m_next = 0; |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
888 |
} |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
889 |
void |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
890 |
Object::Construct (const Parameters ¶meters) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
891 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
892 |
// loop over the inheritance tree back to the Object base class. |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
893 |
TypeId tid = m_tid; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
894 |
do { |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
895 |
// loop over all parameters in object type |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
896 |
NS_LOG_DEBUG ("construct tid="<<tid.GetName ()<<", params="<<tid.GetParametersN ()); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
897 |
for (uint32_t i = 0; i < tid.GetParametersN (); i++) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
898 |
{ |
2435
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
899 |
Ptr<const Accessor> paramSpec = tid.GetParameterAccessor (i); |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
900 |
Attribute initial = tid.GetParameterInitialValue (i); |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
901 |
Ptr<const AttributeChecker> checker = tid.GetParameterChecker (i); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
902 |
NS_LOG_DEBUG ("try to construct \""<< tid.GetName ()<<"::"<< |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
903 |
tid.GetParameterName (i)<<"\""); |
2432
b946f13bc8cb
PARAM -> ATTR
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2427
diff
changeset
|
904 |
if (!(tid.GetParameterFlags (i) & TypeId::ATTR_CONSTRUCT)) |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
905 |
{ |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
906 |
continue; |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
907 |
} |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
908 |
bool found = false; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
909 |
// is this parameter stored in this Parameters instance ? |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
910 |
for (Parameters::Params::const_iterator j = parameters.m_parameters.begin (); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
911 |
j != parameters.m_parameters.end (); j++) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
912 |
{ |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
913 |
if (j->checker == checker) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
914 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
915 |
// We have a matching parameter value. |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
916 |
DoSet (paramSpec, initial, checker, j->value); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
917 |
NS_LOG_DEBUG ("construct \""<< tid.GetName ()<<"::"<< |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
918 |
tid.GetParameterName (i)<<"\""); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
919 |
found = true; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
920 |
break; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
921 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
922 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
923 |
if (!found) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
924 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
925 |
// is this parameter stored in the global instance instance ? |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
926 |
for (Parameters::Params::const_iterator j = Parameters::GetGlobal ()->m_parameters.begin (); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
927 |
j != Parameters::GetGlobal ()->m_parameters.end (); j++) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
928 |
{ |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
929 |
if (j->checker == checker) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
930 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
931 |
// We have a matching parameter value. |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
932 |
DoSet (paramSpec, initial, checker, j->value); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
933 |
NS_LOG_DEBUG ("construct \""<< tid.GetName ()<<"::"<< |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
934 |
tid.GetParameterName (i)<<"\" from global"); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
935 |
found = true; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
936 |
break; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
937 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
938 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
939 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
940 |
if (!found) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
941 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
942 |
// No matching parameter value so we set the default value. |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
943 |
paramSpec->Set (this, initial); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
944 |
NS_LOG_DEBUG ("construct \""<< tid.GetName ()<<"::"<< |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
945 |
tid.GetParameterName (i)<<"\" from local"); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
946 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
947 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
948 |
tid = tid.GetParent (); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
949 |
} while (tid != Object::GetTypeId ()); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
950 |
NotifyConstructionCompleted (); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
951 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
952 |
bool |
2435
3128175f5866
ParamSpec -> Accessor
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
953 |
Object::DoSet (Ptr<const Accessor> spec, Attribute initialValue, |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
954 |
Ptr<const AttributeChecker> checker, Attribute value) |
2397
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
955 |
{ |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
956 |
bool ok = checker->Check (value); |
2397
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
957 |
if (!ok) |
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
958 |
{ |
2421
00ef5829bbe8
get rid of Value::ConvertFrom method.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2420
diff
changeset
|
959 |
// attempt to convert to string |
2424
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
960 |
const StringValue *str = value.DynCast<const StringValue *> (); |
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
961 |
if (str == 0) |
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
962 |
{ |
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
963 |
return false; |
217a447122a6
split initial value from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2423
diff
changeset
|
964 |
} |
2421
00ef5829bbe8
get rid of Value::ConvertFrom method.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2420
diff
changeset
|
965 |
// attempt to convert back from string. |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
966 |
Attribute v = initialValue.Copy (); |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
967 |
ok = v.DeserializeFromString (str->Get (), checker); |
2421
00ef5829bbe8
get rid of Value::ConvertFrom method.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2420
diff
changeset
|
968 |
if (!ok) |
00ef5829bbe8
get rid of Value::ConvertFrom method.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2420
diff
changeset
|
969 |
{ |
00ef5829bbe8
get rid of Value::ConvertFrom method.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2420
diff
changeset
|
970 |
return false; |
00ef5829bbe8
get rid of Value::ConvertFrom method.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2420
diff
changeset
|
971 |
} |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
972 |
ok = checker->Check (v); |
2397
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
973 |
if (!ok) |
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
974 |
{ |
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
975 |
return false; |
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
976 |
} |
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
977 |
value = v; |
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
978 |
} |
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
979 |
ok = spec->Set (this, value); |
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
980 |
return ok; |
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
981 |
} |
45cd59c6ddf8
add automatic conversion from string to PValue.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2394
diff
changeset
|
982 |
bool |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
983 |
Object::Set (std::string name, Attribute value) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
984 |
{ |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
985 |
struct TypeId::ParameterInfo info; |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
986 |
if (!m_tid.LookupParameterByName (name, &info)) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
987 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
988 |
return false; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
989 |
} |
2432
b946f13bc8cb
PARAM -> ATTR
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2427
diff
changeset
|
990 |
if (!(info.flags & TypeId::ATTR_SET)) |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
991 |
{ |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
992 |
return false; |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
993 |
} |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
994 |
return DoSet (info.spec, info.initialValue, info.checker, value); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
995 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
996 |
bool |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
997 |
Object::Get (std::string name, std::string &value) const |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
998 |
{ |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
999 |
struct TypeId::ParameterInfo info; |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
1000 |
if (!m_tid.LookupParameterByName (name, &info)) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1001 |
{ |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1002 |
return false; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1003 |
} |
2432
b946f13bc8cb
PARAM -> ATTR
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2427
diff
changeset
|
1004 |
if (!(info.flags & TypeId::ATTR_GET)) |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
1005 |
{ |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
1006 |
return false; |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
1007 |
} |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
1008 |
Attribute v = info.initialValue.Copy (); |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
1009 |
bool ok = info.spec->Get (this, v); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1010 |
if (ok) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1011 |
{ |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2426
diff
changeset
|
1012 |
value = v.SerializeToString (info.checker); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1013 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1014 |
return ok; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1015 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1016 |
|
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
1017 |
Attribute |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1018 |
Object::Get (std::string name) const |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1019 |
{ |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
1020 |
struct TypeId::ParameterInfo info; |
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
1021 |
if (!m_tid.LookupParameterByName (name, &info)) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1022 |
{ |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
1023 |
return Attribute (); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1024 |
} |
2432
b946f13bc8cb
PARAM -> ATTR
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2427
diff
changeset
|
1025 |
if (!(info.flags & TypeId::ATTR_GET)) |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
1026 |
{ |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
1027 |
return Attribute (); |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
1028 |
} |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
1029 |
Attribute value = info.initialValue.Copy (); |
2382
b05c2d0bcd23
enforce TypeId::PARAM_* flags
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2380
diff
changeset
|
1030 |
bool ok = info.spec->Get (this, value); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1031 |
if (!ok) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1032 |
{ |
2433
3a98e1db7f80
PValue -> Attribute
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2432
diff
changeset
|
1033 |
return Attribute (); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1034 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1035 |
return value; |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1036 |
} |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1037 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1038 |
Ptr<Object> |
2257
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1039 |
Object::DoGetObject (TypeId tid) const |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1040 |
{ |
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
|
1041 |
NS_ASSERT (CheckLoose ()); |
709
b5c7825babf3
make QueryInterface const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
708
diff
changeset
|
1042 |
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
|
1043 |
do { |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
1044 |
NS_ASSERT (currentObject != 0); |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
1045 |
TypeId cur = currentObject->m_tid; |
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
1046 |
while (cur != tid && cur != Object::GetTypeId ()) |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
1047 |
{ |
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
1048 |
cur = cur.GetParent (); |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
1049 |
} |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
1050 |
if (cur == tid) |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
1051 |
{ |
709
b5c7825babf3
make QueryInterface const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
708
diff
changeset
|
1052 |
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
|
1053 |
} |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
1054 |
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
|
1055 |
} while (currentObject != this); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1056 |
return 0; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1057 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1058 |
void |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1059 |
Object::Dispose (void) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1060 |
{ |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1061 |
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
|
1062 |
do { |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
1063 |
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
|
1064 |
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
|
1065 |
current->DoDispose (); |
713
c3c745a80610
add a m_disposed field and check it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
712
diff
changeset
|
1066 |
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
|
1067 |
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
|
1068 |
} while (current != this); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1069 |
} |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1070 |
void |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1071 |
Object::NotifyConstructionCompleted (void) |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1072 |
{} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1073 |
void |
2258
666099a753e0
AddInterface -> AggregateObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2257
diff
changeset
|
1074 |
Object::AggregateObject (Ptr<Object> o) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1075 |
{ |
718 | 1076 |
NS_ASSERT (!m_disposed); |
1077 |
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
|
1078 |
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
|
1079 |
NS_ASSERT (o->CheckLoose ()); |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1080 |
Object *other = PeekPointer (o); |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1081 |
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
|
1082 |
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
|
1083 |
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
|
1084 |
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
|
1085 |
NS_ASSERT (o->CheckLoose ()); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1086 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1087 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1088 |
void |
1383 | 1089 |
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
|
1090 |
{ |
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
|
1091 |
NS_ASSERT (CheckLoose ()); |
1368
e75dc1a2a5fb
add TraceResolver::PrintAvailable method
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1358
diff
changeset
|
1092 |
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
|
1093 |
} |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
1094 |
void |
1383 | 1095 |
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
|
1096 |
{ |
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
|
1097 |
NS_ASSERT (CheckLoose ()); |
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
1098 |
GetTraceResolver ()->Disconnect (path, cb); |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
1099 |
} |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
1100 |
|
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
1101 |
void |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
1102 |
Object::SetTypeId (TypeId tid) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1103 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1104 |
NS_ASSERT (Check ()); |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
1105 |
m_tid = tid; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1106 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1107 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1108 |
void |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1109 |
Object::DoDispose (void) |
713
c3c745a80610
add a m_disposed field and check it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
712
diff
changeset
|
1110 |
{ |
c3c745a80610
add a m_disposed field and check it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
712
diff
changeset
|
1111 |
NS_ASSERT (!m_disposed); |
c3c745a80610
add a m_disposed field and check it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
712
diff
changeset
|
1112 |
} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1113 |
|
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
1114 |
Ptr<TraceResolver> |
1383 | 1115 |
Object::GetTraceResolver (void) const |
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
1116 |
{ |
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
|
1117 |
NS_ASSERT (CheckLoose ()); |
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
1118 |
Ptr<TypeIdTraceResolver> resolver = |
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
1119 |
Create<TypeIdTraceResolver> (this); |
1346
47de68729c86
an untested interface id trace resolver
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1340
diff
changeset
|
1120 |
return resolver; |
1336
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
1121 |
} |
de5a133ece8a
add Object::TraceConnect, TraceDisconnect, and GetTraceResolver methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
732
diff
changeset
|
1122 |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1123 |
bool |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1124 |
Object::Check (void) const |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1125 |
{ |
701
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
1126 |
return (m_count > 0); |
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
1127 |
} |
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
1128 |
|
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
|
1129 |
/* 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
|
1130 |
* 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
|
1131 |
* 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
|
1132 |
* 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
|
1133 |
* 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
|
1134 |
* 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
|
1135 |
*/ |
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
|
1136 |
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
|
1137 |
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
|
1138 |
{ |
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
|
1139 |
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
|
1140 |
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
|
1141 |
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
|
1142 |
{ |
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
|
1143 |
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
|
1144 |
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
|
1145 |
} |
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
|
1146 |
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
|
1147 |
|
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
|
1148 |
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
|
1149 |
} |
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
|
1150 |
|
701
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
1151 |
void |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1152 |
Object::MaybeDelete (void) const |
701
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
1153 |
{ |
702
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
1154 |
// 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
|
1155 |
// Object has a non-zero count. |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1156 |
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
|
1157 |
do { |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
1158 |
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
|
1159 |
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
|
1160 |
{ |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
1161 |
return; |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
1162 |
} |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
1163 |
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
|
1164 |
} 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
|
1165 |
|
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
1166 |
// 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
|
1167 |
// 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
|
1168 |
current = this; |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1169 |
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
|
1170 |
do { |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
1171 |
NS_ASSERT (current != 0); |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1172 |
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
|
1173 |
delete current; |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
1174 |
current = next; |
829df6703988
yet another optimization to cut even more on memory allocations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
701
diff
changeset
|
1175 |
} while (current != end); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1176 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1177 |
|
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1178 |
void |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1179 |
Object::DoCollectSources (std::string path, const TraceContext &context, |
1383 | 1180 |
TraceResolver::SourceCollection *collection) const |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1181 |
{ |
1383 | 1182 |
const Object *current; |
1374
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
1183 |
current = this; |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
1184 |
do { |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
1185 |
if (current->m_collecting) |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
1186 |
{ |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
1187 |
return; |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
1188 |
} |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
1189 |
current = current->m_next; |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
1190 |
} while (current != this); |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
1191 |
|
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
1192 |
m_collecting = true; |
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
1193 |
|
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
1194 |
current = this->m_next; |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1195 |
while (current != this) |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1196 |
{ |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1197 |
NS_ASSERT (current != 0); |
1504
36ecc970ba96
checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents:
1420
diff
changeset
|
1198 |
NS_LOG_LOGIC ("collect current=" << current); |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
1199 |
TypeId cur = current->m_tid; |
2251
04963d8cca51
iid (void) -> GetTypeId (void)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2250
diff
changeset
|
1200 |
while (cur != Object::GetTypeId ()) |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1201 |
{ |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1202 |
std::string name = cur.GetName (); |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1203 |
std::string fullpath = path; |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1204 |
fullpath.append ("/$"); |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1205 |
fullpath.append (name); |
1504
36ecc970ba96
checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents:
1420
diff
changeset
|
1206 |
NS_LOG_LOGIC("collect: " << fullpath); |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1207 |
current->GetTraceResolver ()->CollectSources (fullpath, context, collection); |
2235
fb93067a3c2e
rewrite interface id metadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2234
diff
changeset
|
1208 |
cur = cur.GetParent (); |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1209 |
} |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1210 |
current = current->m_next; |
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1211 |
} |
1374
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
1212 |
|
77468496f7e0
avoid problems with recursive use of Object::DoCollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1372
diff
changeset
|
1213 |
m_collecting = false; |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1214 |
} |
1419
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1215 |
void |
1420
3feedd3e4f5f
rename ConnectPrinterToAll to TraceAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1419
diff
changeset
|
1216 |
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
|
1217 |
{ |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1218 |
const Object *current; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1219 |
current = this; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1220 |
do { |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1221 |
if (current->m_collecting) |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1222 |
{ |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1223 |
return; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1224 |
} |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1225 |
current = current->m_next; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1226 |
} while (current != this); |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1227 |
|
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1228 |
m_collecting = true; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1229 |
|
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1230 |
current = this->m_next; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1231 |
while (current != this) |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1232 |
{ |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1233 |
NS_ASSERT (current != 0); |
1420
3feedd3e4f5f
rename ConnectPrinterToAll to TraceAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1419
diff
changeset
|
1234 |
current->GetTraceResolver ()->TraceAll (os, context); |
1419
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1235 |
current = current->m_next; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1236 |
} |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1237 |
|
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1238 |
m_collecting = false; |
ac2a81821ab5
add support for NodeList::ConnectPrinterToAll
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1406
diff
changeset
|
1239 |
} |
1371
bebf690257c9
replace TraceResolver::PrintAvailable with TraceResolver::CollectSources
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1368
diff
changeset
|
1240 |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1241 |
} // namespace ns3 |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1242 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1243 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1244 |
#ifdef RUN_SELF_TESTS |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1245 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1246 |
#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
|
1247 |
#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
|
1248 |
#include "composite-trace-resolver.h" |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1249 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1250 |
namespace { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1251 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1252 |
class BaseA : public ns3::Object |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1253 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1254 |
public: |
2251
04963d8cca51
iid (void) -> GetTypeId (void)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2250
diff
changeset
|
1255 |
static ns3::TypeId GetTypeId (void) { |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
1256 |
static ns3::TypeId tid = ns3::TypeId ("BaseA") |
2251
04963d8cca51
iid (void) -> GetTypeId (void)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2250
diff
changeset
|
1257 |
.SetParent (Object::GetTypeId ()) |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
1258 |
.AddConstructor<BaseA> (); |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
1259 |
return tid; |
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
1260 |
} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1261 |
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
|
1262 |
{} |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1263 |
void BaseGenerateTrace (int16_t v) |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1264 |
{ m_source = v; } |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1265 |
virtual void Dispose (void) {} |
1406
ac5372d16b5f
add missing const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1386
diff
changeset
|
1266 |
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
|
1267 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1268 |
ns3::Ptr<ns3::CompositeTraceResolver> resolver = |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1269 |
ns3::Create<ns3::CompositeTraceResolver> (); |
1379
f323d2dcdaf6
document trace source signatures
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1374
diff
changeset
|
1270 |
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
|
1271 |
resolver->SetParentResolver (Object::GetTraceResolver ()); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1272 |
return resolver; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1273 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1274 |
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
|
1275 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1276 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1277 |
class DerivedA : public BaseA |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1278 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1279 |
public: |
2251
04963d8cca51
iid (void) -> GetTypeId (void)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2250
diff
changeset
|
1280 |
static ns3::TypeId GetTypeId (void) { |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
1281 |
static ns3::TypeId tid = ns3::TypeId ("DerivedA") |
2251
04963d8cca51
iid (void) -> GetTypeId (void)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2250
diff
changeset
|
1282 |
.SetParent (BaseA::GetTypeId ()) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1283 |
.AddConstructor<DerivedA> (); |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
1284 |
return tid; |
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
1285 |
} |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1286 |
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
|
1287 |
{} |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1288 |
void DerivedGenerateTrace (int16_t v) |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1289 |
{ m_sourceDerived = v; } |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1290 |
virtual void Dispose (void) { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1291 |
BaseA::Dispose (); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1292 |
} |
1406
ac5372d16b5f
add missing const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1386
diff
changeset
|
1293 |
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
|
1294 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1295 |
ns3::Ptr<ns3::CompositeTraceResolver> resolver = |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1296 |
ns3::Create<ns3::CompositeTraceResolver> (); |
1379
f323d2dcdaf6
document trace source signatures
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1374
diff
changeset
|
1297 |
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
|
1298 |
resolver->SetParentResolver (BaseA::GetTraceResolver ()); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1299 |
return resolver; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1300 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1301 |
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
|
1302 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1303 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1304 |
class BaseB : public ns3::Object |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1305 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1306 |
public: |
2251
04963d8cca51
iid (void) -> GetTypeId (void)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2250
diff
changeset
|
1307 |
static ns3::TypeId GetTypeId (void) { |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
1308 |
static ns3::TypeId tid = ns3::TypeId ("BaseB") |
2251
04963d8cca51
iid (void) -> GetTypeId (void)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2250
diff
changeset
|
1309 |
.SetParent (Object::GetTypeId ()) |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
1310 |
.AddConstructor<BaseB> (); |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
1311 |
return tid; |
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
1312 |
} |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1313 |
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
|
1314 |
{} |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1315 |
void BaseGenerateTrace (int16_t v) |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1316 |
{ m_source = v; } |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1317 |
virtual void Dispose (void) {} |
1406
ac5372d16b5f
add missing const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1386
diff
changeset
|
1318 |
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
|
1319 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1320 |
ns3::Ptr<ns3::CompositeTraceResolver> resolver = |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1321 |
ns3::Create<ns3::CompositeTraceResolver> (); |
1379
f323d2dcdaf6
document trace source signatures
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1374
diff
changeset
|
1322 |
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
|
1323 |
resolver->SetParentResolver (Object::GetTraceResolver ()); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1324 |
return resolver; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1325 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1326 |
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
|
1327 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1328 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1329 |
class DerivedB : public BaseB |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1330 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1331 |
public: |
2251
04963d8cca51
iid (void) -> GetTypeId (void)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2250
diff
changeset
|
1332 |
static ns3::TypeId GetTypeId (void) { |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
1333 |
static ns3::TypeId tid = ns3::TypeId ("DerivedB") |
2251
04963d8cca51
iid (void) -> GetTypeId (void)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2250
diff
changeset
|
1334 |
.SetParent (BaseB::GetTypeId ()) |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1335 |
.AddConstructor<DerivedB> (); |
2252
80595448707a
iid -> tid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2251
diff
changeset
|
1336 |
return tid; |
2232
9abd038ee588
replace static const Interface iid; with static InterfaceId iid (void);
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2231
diff
changeset
|
1337 |
} |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1338 |
DerivedB () |
2243
9573a034177a
check constructor with reference arguments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2241
diff
changeset
|
1339 |
{} |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1340 |
void DerivedGenerateTrace (int16_t v) |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1341 |
{ m_sourceDerived = v; } |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1342 |
virtual void Dispose (void) { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1343 |
BaseB::Dispose (); |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1344 |
} |
1406
ac5372d16b5f
add missing const
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1386
diff
changeset
|
1345 |
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
|
1346 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1347 |
ns3::Ptr<ns3::CompositeTraceResolver> resolver = |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1348 |
ns3::Create<ns3::CompositeTraceResolver> (); |
1379
f323d2dcdaf6
document trace source signatures
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1374
diff
changeset
|
1349 |
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
|
1350 |
resolver->SetParentResolver (BaseB::GetTraceResolver ()); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1351 |
return resolver; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1352 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1353 |
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
|
1354 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1355 |
|
2247
56b3591fa3b0
use NS_OBJECT_ENSURE_REGISTERED and fix off-by-one in IidManager::GetRegistered
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2243
diff
changeset
|
1356 |
NS_OBJECT_ENSURE_REGISTERED (BaseA); |
56b3591fa3b0
use NS_OBJECT_ENSURE_REGISTERED and fix off-by-one in IidManager::GetRegistered
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2243
diff
changeset
|
1357 |
NS_OBJECT_ENSURE_REGISTERED (DerivedA); |
56b3591fa3b0
use NS_OBJECT_ENSURE_REGISTERED and fix off-by-one in IidManager::GetRegistered
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2243
diff
changeset
|
1358 |
NS_OBJECT_ENSURE_REGISTERED (BaseB); |
56b3591fa3b0
use NS_OBJECT_ENSURE_REGISTERED and fix off-by-one in IidManager::GetRegistered
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2243
diff
changeset
|
1359 |
NS_OBJECT_ENSURE_REGISTERED (DerivedB); |
56b3591fa3b0
use NS_OBJECT_ENSURE_REGISTERED and fix off-by-one in IidManager::GetRegistered
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2243
diff
changeset
|
1360 |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1361 |
} // namespace anonymous |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1362 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1363 |
namespace ns3 { |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1364 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1365 |
class ObjectTest : public Test |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1366 |
{ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1367 |
public: |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1368 |
ObjectTest (); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1369 |
virtual bool RunTests (void); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1370 |
private: |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1371 |
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
|
1372 |
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
|
1373 |
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
|
1374 |
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
|
1375 |
|
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1376 |
bool m_baseATrace; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1377 |
bool m_derivedATrace; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1378 |
bool m_baseBTrace; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1379 |
bool m_derivedBTrace; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1380 |
}; |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1381 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1382 |
ObjectTest::ObjectTest () |
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1383 |
: Test ("Object") |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1384 |
{} |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1385 |
void |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1386 |
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
|
1387 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1388 |
m_baseATrace = true; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1389 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1390 |
void |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1391 |
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
|
1392 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1393 |
m_derivedATrace = true; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1394 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1395 |
void |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1396 |
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
|
1397 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1398 |
m_baseBTrace = true; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1399 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1400 |
void |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1401 |
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
|
1402 |
{ |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1403 |
m_derivedBTrace = true; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1404 |
} |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1405 |
|
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1406 |
bool |
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1407 |
ObjectTest::RunTests (void) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1408 |
{ |
1349
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
1409 |
bool result = true; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1410 |
|
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
|
1411 |
Ptr<BaseA> baseA = CreateObject<BaseA> (); |
2257
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1412 |
NS_TEST_ASSERT_EQUAL (baseA->GetObject<BaseA> (), baseA); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1413 |
NS_TEST_ASSERT_EQUAL (baseA->GetObject<BaseA> (DerivedA::GetTypeId ()), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1414 |
NS_TEST_ASSERT_EQUAL (baseA->GetObject<DerivedA> (), 0); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1415 |
baseA = CreateObject<DerivedA> (); |
2257
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1416 |
NS_TEST_ASSERT_EQUAL (baseA->GetObject<BaseA> (), baseA); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1417 |
NS_TEST_ASSERT_EQUAL (baseA->GetObject<BaseA> (DerivedA::GetTypeId ()), baseA); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1418 |
NS_TEST_ASSERT_UNEQUAL (baseA->GetObject<DerivedA> (), 0); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1419 |
|
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
|
1420 |
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
|
1421 |
Ptr<BaseB> baseB = CreateObject<BaseB> (); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1422 |
Ptr<BaseB> baseBCopy = baseB; |
2258
666099a753e0
AddInterface -> AggregateObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2257
diff
changeset
|
1423 |
baseA->AggregateObject (baseB); |
2257
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1424 |
NS_TEST_ASSERT_UNEQUAL (baseA->GetObject<BaseA> (), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1425 |
NS_TEST_ASSERT_EQUAL (baseA->GetObject<DerivedA> (), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1426 |
NS_TEST_ASSERT_UNEQUAL (baseA->GetObject<BaseB> (), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1427 |
NS_TEST_ASSERT_EQUAL (baseA->GetObject<DerivedB> (), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1428 |
NS_TEST_ASSERT_UNEQUAL (baseB->GetObject<BaseB> (), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1429 |
NS_TEST_ASSERT_EQUAL (baseB->GetObject<DerivedB> (), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1430 |
NS_TEST_ASSERT_UNEQUAL (baseB->GetObject<BaseA> (), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1431 |
NS_TEST_ASSERT_EQUAL (baseB->GetObject<DerivedA> (), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1432 |
NS_TEST_ASSERT_UNEQUAL (baseBCopy->GetObject<BaseA> (), 0); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1433 |
|
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1434 |
baseA = CreateObject<DerivedA> (); |
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1435 |
baseB = CreateObject<DerivedB> (); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1436 |
baseBCopy = baseB; |
2258
666099a753e0
AddInterface -> AggregateObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2257
diff
changeset
|
1437 |
baseA->AggregateObject (baseB); |
2257
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1438 |
NS_TEST_ASSERT_UNEQUAL (baseA->GetObject<DerivedB> (), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1439 |
NS_TEST_ASSERT_UNEQUAL (baseA->GetObject<BaseB> (), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1440 |
NS_TEST_ASSERT_UNEQUAL (baseB->GetObject<DerivedA> (), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1441 |
NS_TEST_ASSERT_UNEQUAL (baseB->GetObject<BaseA> (), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1442 |
NS_TEST_ASSERT_UNEQUAL (baseBCopy->GetObject<DerivedA> (), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1443 |
NS_TEST_ASSERT_UNEQUAL (baseBCopy->GetObject<BaseA> (), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1444 |
NS_TEST_ASSERT_UNEQUAL (baseB->GetObject<DerivedB> (), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1445 |
NS_TEST_ASSERT_UNEQUAL (baseB->GetObject<BaseB> (), 0) |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1446 |
|
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
|
1447 |
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
|
1448 |
baseB = CreateObject<BaseB> (); |
2258
666099a753e0
AddInterface -> AggregateObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2257
diff
changeset
|
1449 |
baseA->AggregateObject (baseB); |
701
aa179c876b22
optimization suggested by gustavo
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
699
diff
changeset
|
1450 |
baseA = 0; |
2257
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1451 |
baseA = baseB->GetObject<BaseA> (); |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1452 |
|
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
|
1453 |
baseA = CreateObject<BaseA> (); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1454 |
baseA->TraceConnect ("/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1455 |
m_baseATrace = false; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1456 |
baseA->BaseGenerateTrace (1); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1457 |
NS_TEST_ASSERT (m_baseATrace); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1458 |
baseA->TraceDisconnect ("/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1459 |
|
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
|
1460 |
baseB = CreateObject<BaseB> (); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1461 |
baseB->TraceConnect ("/baseb-x", MakeCallback (&ObjectTest::BaseBTrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1462 |
m_baseBTrace = false; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1463 |
baseB->BaseGenerateTrace (2); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1464 |
NS_TEST_ASSERT (m_baseBTrace); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1465 |
baseB->TraceDisconnect ("/baseb-x", MakeCallback (&ObjectTest::BaseBTrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1466 |
|
2258
666099a753e0
AddInterface -> AggregateObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2257
diff
changeset
|
1467 |
baseA->AggregateObject (baseB); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1468 |
|
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1469 |
baseA->TraceConnect ("/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1470 |
m_baseATrace = false; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1471 |
baseA->BaseGenerateTrace (3); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1472 |
NS_TEST_ASSERT (m_baseATrace); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1473 |
baseA->TraceDisconnect ("/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1474 |
|
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1475 |
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
|
1476 |
m_baseBTrace = false; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1477 |
baseB->BaseGenerateTrace (4); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1478 |
NS_TEST_ASSERT (m_baseBTrace); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1479 |
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
|
1480 |
m_baseBTrace = false; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1481 |
baseB->BaseGenerateTrace (5); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1482 |
NS_TEST_ASSERT (!m_baseBTrace); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1483 |
|
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1484 |
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
|
1485 |
m_baseATrace = false; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1486 |
baseA->BaseGenerateTrace (6); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1487 |
NS_TEST_ASSERT (m_baseATrace); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1488 |
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
|
1489 |
|
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1490 |
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
|
1491 |
m_baseATrace = false; |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1492 |
baseA->BaseGenerateTrace (7); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1493 |
NS_TEST_ASSERT (m_baseATrace); |
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1494 |
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
|
1495 |
|
1357
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1496 |
Ptr<DerivedA> derivedA; |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1497 |
derivedA = CreateObject<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
|
1498 |
baseB = CreateObject<BaseB> (); |
2258
666099a753e0
AddInterface -> AggregateObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2257
diff
changeset
|
1499 |
derivedA->AggregateObject (baseB); |
1357
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1500 |
baseB->TraceConnect ("/$DerivedA/deriveda-x", MakeCallback (&ObjectTest::DerivedATrace, this)); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1501 |
baseB->TraceConnect ("/$DerivedA/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1502 |
m_derivedATrace = false; |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1503 |
m_baseATrace = false; |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1504 |
derivedA->DerivedGenerateTrace (8); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1505 |
derivedA->BaseGenerateTrace (9); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1506 |
NS_TEST_ASSERT (m_derivedATrace); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1507 |
NS_TEST_ASSERT (m_baseATrace); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1508 |
baseB->TraceDisconnect ("/$DerivedA/deriveda-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1509 |
baseB->TraceDisconnect ("/$DerivedA/basea-x", MakeCallback (&ObjectTest::BaseATrace, this)); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1510 |
|
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1511 |
baseB->TraceConnect ("/$DerivedA/*", MakeCallback (&ObjectTest::DerivedATrace, this)); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1512 |
m_derivedATrace = false; |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1513 |
derivedA->DerivedGenerateTrace (10); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1514 |
NS_TEST_ASSERT (m_derivedATrace); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1515 |
// here, we have connected the derived trace sink to all |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1516 |
// trace sources, including the base trace source. |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1517 |
m_derivedATrace = false; |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1518 |
derivedA->BaseGenerateTrace (11); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1519 |
NS_TEST_ASSERT (m_derivedATrace); |
b409adf30c97
more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1355
diff
changeset
|
1520 |
baseB->TraceDisconnect ("/$DerivedA/*", MakeCallback (&ObjectTest::BaseATrace, this)); |
1351
0a6aaa6acbd3
test object-based tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1349
diff
changeset
|
1521 |
|
2250
18f432098389
InterfaceId -> TypeId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2247
diff
changeset
|
1522 |
// Test the object creation code of TypeId |
2251
04963d8cca51
iid (void) -> GetTypeId (void)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2250
diff
changeset
|
1523 |
Ptr<Object> a = BaseA::GetTypeId ().CreateObject (); |
2257
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1524 |
NS_TEST_ASSERT_EQUAL (a->GetObject<BaseA> (), a); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1525 |
NS_TEST_ASSERT_EQUAL (a->GetObject<BaseA> (DerivedA::GetTypeId ()), 0); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1526 |
NS_TEST_ASSERT_EQUAL (a->GetObject<DerivedA> (), 0); |
2372
bf4efb9359c6
attempt to perform correctly automatic conversions.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1527 |
a = DerivedA::GetTypeId ().CreateObject (); |
2257
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1528 |
NS_TEST_ASSERT_EQUAL (a->GetObject<BaseA> (), a); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1529 |
NS_TEST_ASSERT_EQUAL (a->GetObject<BaseA> (DerivedA::GetTypeId ()), a); |
71a58e70c671
QueryInterface -> GetObject
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2252
diff
changeset
|
1530 |
NS_TEST_ASSERT_UNEQUAL (a->GetObject<DerivedA> (), 0); |
2237
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
1531 |
|
7745a8c76396
add 'factory' support to InterfaceId
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2235
diff
changeset
|
1532 |
|
1349
11562f6b73aa
rewrite Object tests with test.h macros
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1346
diff
changeset
|
1533 |
return result; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1534 |
} |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1535 |
|
706
8b0bf4623c9d
rename InterfaceObject to Object
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
703
diff
changeset
|
1536 |
static ObjectTest g_interfaceObjectTests; |
699
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1537 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1538 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1539 |
} // namespace ns3 |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1540 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1541 |
#endif /* RUN_SELF_TESTS */ |
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1542 |
|
956a76f5fd56
a replacement for the Interface base class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1543 |