author | Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
Fri, 06 Oct 2006 13:37:25 +0200 | |
changeset 122 | 6b8f1eda5c57 |
parent 111 | ad64f88919b5 |
child 131 | f4fb87e77034 |
permissions | -rw-r--r-- |
110
9ac6d63bfe33
fix emacs tab mode (reported by george)
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
95
diff
changeset
|
1 |
/* -*- Mode:C++; c-basic-offset:4; tab-width:4; indent-tabs-mode:nil -*- */ |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
2 |
/* |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
3 |
* Copyright (c) 2006 INRIA |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
4 |
* All rights reserved. |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
5 |
* |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
6 |
* This program is free software; you can redistribute it and/or modify |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
7 |
* it under the terms of the GNU General Public License version 2 as |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
8 |
* published by the Free Software Foundation; |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
9 |
* |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
10 |
* This program is distributed in the hope that it will be useful, |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
11 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
12 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
13 |
* GNU General Public License for more details. |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
14 |
* |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
16 |
* along with this program; if not, write to the Free Software |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
17 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
18 |
* |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
19 |
* Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
20 |
*/ |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
21 |
#include "tags.h" |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
22 |
#include <string.h> |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
23 |
|
16
99e833adbb46
change yans namespace to ns3
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
14
diff
changeset
|
24 |
namespace ns3 { |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
25 |
|
93
6318b8cbf212
implement new tag identification scheme
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
90
diff
changeset
|
26 |
bool TagRegistry::m_sorted; |
6318b8cbf212
implement new tag identification scheme
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
90
diff
changeset
|
27 |
TagRegistry::TagsData TagRegistry::m_registry; |
6318b8cbf212
implement new tag identification scheme
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
90
diff
changeset
|
28 |
|
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
29 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
30 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
31 |
TagRegistry::Record (std::string uuid, PrettyPrinter prettyPrinter) |
93
6318b8cbf212
implement new tag identification scheme
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
90
diff
changeset
|
32 |
{ |
111
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
33 |
assert (!m_sorted); |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
34 |
m_registry.push_back (make_pair (uuid, prettyPrinter)); |
93
6318b8cbf212
implement new tag identification scheme
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
90
diff
changeset
|
35 |
} |
6318b8cbf212
implement new tag identification scheme
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
90
diff
changeset
|
36 |
uint32_t |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
37 |
TagRegistry::LookupUid (std::string uuid) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
38 |
{ |
111
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
39 |
if (!m_sorted) { |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
40 |
std::sort (m_registry.begin (), m_registry.end ()); |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
41 |
m_sorted = true; |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
42 |
} |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
43 |
assert (m_sorted); |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
44 |
uint32_t uid = 0; |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
45 |
for (TagsDataCI i = m_registry.begin (); i != m_registry.end (); i++) { |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
46 |
if (i->first == uuid) { |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
47 |
return uid; |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
48 |
} |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
49 |
uid++; |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
50 |
} |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
51 |
// someone asked for a uid for an unregistered uuid. |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
52 |
assert ("You tried to use unregistered tag: make sure you create an " |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
53 |
"instance of type TagRegistration<YouTagType>."); |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
54 |
// quiet compiler |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
55 |
return 0; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
56 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
57 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
58 |
TagRegistry::PrettyPrint (uint32_t uid, uint8_t buf[Tags::SIZE], std::ostream &os) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
59 |
{ |
111
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
60 |
assert (m_registry.size () > uid); |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
61 |
PrettyPrinter prettyPrinter = m_registry[uid].second; |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
62 |
if (prettyPrinter != 0) { |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
63 |
prettyPrinter (buf, os); |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
64 |
} |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
65 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
66 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
67 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
68 |
#ifdef USE_FREE_LIST |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
69 |
|
53
ae406f4957d5
variable/method/function coding style update
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
16
diff
changeset
|
70 |
struct Tags::TagData *Tags::gFree = 0; |
ae406f4957d5
variable/method/function coding style update
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
16
diff
changeset
|
71 |
uint32_t Tags::gN_free = 0; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
72 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
73 |
struct Tags::TagData * |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
74 |
Tags::AllocData (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
75 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
76 |
struct Tags::TagData *retval; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
77 |
if (gFree != 0) { |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
78 |
retval = gFree; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
79 |
gFree = gFree->m_next; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
80 |
gN_free--; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
81 |
} else { |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
82 |
retval = new struct Tags::TagData (); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
83 |
} |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
84 |
return retval; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
85 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
86 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
87 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
88 |
Tags::FreeData (struct TagData *data) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
89 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
90 |
if (gN_free > 1000) { |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
91 |
delete data; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
92 |
return; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
93 |
} |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
94 |
gN_free++; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
95 |
data->m_next = gFree; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
96 |
gFree = data; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
97 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
98 |
#else |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
99 |
struct Tags::TagData * |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
100 |
Tags::AllocData (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
101 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
102 |
struct Tags::TagData *retval; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
103 |
retval = new struct Tags::TagData (); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
104 |
return retval; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
105 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
106 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
107 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
108 |
Tags::FreeData (struct TagData *data) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
109 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
110 |
delete data; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
111 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
112 |
#endif |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
113 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
114 |
bool |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
115 |
Tags::Remove (uint32_t id) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
116 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
117 |
bool found = false; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
118 |
for (struct TagData *cur = m_next; cur != 0; cur = cur->m_next) { |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
119 |
if (cur->m_id == id) { |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
120 |
found = true; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
121 |
} |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
122 |
} |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
123 |
if (!found) { |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
124 |
return false; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
125 |
} |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
126 |
struct TagData *start = 0; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
127 |
struct TagData **prevNext = &start; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
128 |
for (struct TagData *cur = m_next; cur != 0; cur = cur->m_next) { |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
129 |
if (cur->m_id == id) { |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
130 |
/** |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
131 |
* XXX |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
132 |
* Note: I believe that we could optimize this to |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
133 |
* avoid copying each TagData located after the target id |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
134 |
* and just link the already-copied list to the next tag. |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
135 |
*/ |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
136 |
continue; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
137 |
} |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
138 |
struct TagData *copy = AllocData (); |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
139 |
copy->m_id = cur->m_id; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
140 |
copy->m_count = 1; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
141 |
copy->m_next = 0; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
142 |
memcpy (copy->m_data, cur->m_data, Tags::SIZE); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
143 |
*prevNext = copy; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
144 |
prevNext = ©->m_next; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
145 |
} |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
146 |
*prevNext = 0; |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
147 |
RemoveAll (); |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
148 |
m_next = start; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
149 |
return true; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
150 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
151 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
152 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
153 |
Tags::PrettyPrint (std::ostream &os) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
154 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
155 |
for (struct TagData *cur = m_next; cur != 0; cur = cur->m_next) { |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
156 |
TagRegistry::PrettyPrint (cur->m_id, cur->m_data, os); |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
157 |
} |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
158 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
159 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
160 |
|
16
99e833adbb46
change yans namespace to ns3
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
14
diff
changeset
|
161 |
}; // namespace ns3 |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
162 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
163 |
#ifdef RUN_SELF_TESTS |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
164 |
|
14
6dd7d31c6fc3
replace yans include with ns3 include
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
9
diff
changeset
|
165 |
#include "ns3/test.h" |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
166 |
#include <iomanip> |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
167 |
#include <iostream> |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
168 |
|
16
99e833adbb46
change yans namespace to ns3
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
14
diff
changeset
|
169 |
namespace ns3 { |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
170 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
171 |
class TagsTest : Test { |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
172 |
public: |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
173 |
TagsTest (); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
174 |
virtual ~TagsTest (); |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
175 |
virtual bool RunTests (void); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
176 |
}; |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
177 |
|
53
ae406f4957d5
variable/method/function coding style update
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
16
diff
changeset
|
178 |
struct myTagA { |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
179 |
uint8_t a; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
180 |
}; |
53
ae406f4957d5
variable/method/function coding style update
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
16
diff
changeset
|
181 |
struct myTagB { |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
182 |
uint32_t b; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
183 |
}; |
53
ae406f4957d5
variable/method/function coding style update
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
16
diff
changeset
|
184 |
struct myTagC { |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
185 |
uint8_t c [Tags::SIZE]; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
186 |
}; |
53
ae406f4957d5
variable/method/function coding style update
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
16
diff
changeset
|
187 |
struct myInvalidTag { |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
188 |
uint8_t invalid [Tags::SIZE+1]; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
189 |
}; |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
190 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
191 |
static void |
53
ae406f4957d5
variable/method/function coding style update
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
16
diff
changeset
|
192 |
myTagAPrettyPrinterCb (struct myTagA *a, std::ostream &os) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
193 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
194 |
os << "struct myTagA, a="<<(uint32_t)a->a<<std::endl; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
195 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
196 |
static void |
53
ae406f4957d5
variable/method/function coding style update
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
16
diff
changeset
|
197 |
myTagBPrettyPrinterCb (struct myTagB *b, std::ostream &os) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
198 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
199 |
os << "struct myTagB, b="<<b->b<<std::endl; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
200 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
201 |
static void |
53
ae406f4957d5
variable/method/function coding style update
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
16
diff
changeset
|
202 |
myTagCPrettyPrinterCb (struct myTagC *c, std::ostream &os) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
203 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
204 |
os << "struct myTagC, c="<<(uint32_t)c->c[0]<<std::endl; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
205 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
206 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
207 |
|
93
6318b8cbf212
implement new tag identification scheme
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
90
diff
changeset
|
208 |
static TagRegistration<struct myTagA> gMyTagARegistration ("A", &myTagAPrettyPrinterCb); |
6318b8cbf212
implement new tag identification scheme
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
90
diff
changeset
|
209 |
static TagRegistration<struct myTagB> gMyTagBRegistration ("B", &myTagBPrettyPrinterCb); |
6318b8cbf212
implement new tag identification scheme
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
90
diff
changeset
|
210 |
static TagRegistration<struct myTagC> gMyTagCRegistration ("C", &myTagCPrettyPrinterCb); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
211 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
212 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
213 |
TagsTest::TagsTest () |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
214 |
: Test ("Tags") |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
215 |
{} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
216 |
TagsTest::~TagsTest () |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
217 |
{} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
218 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
219 |
bool |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
220 |
TagsTest::RunTests (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
221 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
222 |
bool ok = true; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
223 |
|
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
224 |
// build initial tag. |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
225 |
Tags tags; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
226 |
struct myTagA a; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
227 |
a.a = 10; |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
228 |
tags.Add (a); |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
229 |
a.a = 0; |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
230 |
tags.Peek (a); |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
231 |
if (a.a != 10) { |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
232 |
ok = false; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
233 |
} |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
234 |
//tags.prettyPrint (std::cout); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
235 |
struct myTagB b; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
236 |
b.b = 0xff; |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
237 |
tags.Add (b); |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
238 |
b.b = 0; |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
239 |
tags.Peek (b); |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
240 |
if (b.b != 0xff) { |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
241 |
ok = false; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
242 |
} |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
243 |
//tags.prettyPrint (std::cout); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
244 |
|
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
245 |
// make sure copy contains copy. |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
246 |
Tags other = tags; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
247 |
//other.prettyPrint (std::cout); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
248 |
//tags.prettyPrint (std::cout); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
249 |
struct myTagA oA; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
250 |
oA.a = 0; |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
251 |
other.Peek (oA); |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
252 |
if (oA.a != 10) { |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
253 |
ok = false; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
254 |
} |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
255 |
struct myTagB oB; |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
256 |
other.Peek (oB); |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
257 |
if (oB.b != 0xff) { |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
258 |
ok = false; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
259 |
} |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
260 |
// remove data. |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
261 |
other.Remove (oA); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
262 |
if (other.Peek (oA)) { |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
263 |
ok = false; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
264 |
} |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
265 |
//other.prettyPrint (std::cout); |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
266 |
if (!tags.Peek (oA)) { |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
267 |
ok = false; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
268 |
} |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
269 |
other.Remove (oB); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
270 |
if (other.Peek (oB)) { |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
271 |
ok = false; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
272 |
} |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
273 |
if (!tags.Peek (oB)) { |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
274 |
ok = false; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
275 |
} |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
276 |
|
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
277 |
other = tags; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
278 |
Tags another = other; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
279 |
struct myTagC c; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
280 |
c.c[0] = 0x66; |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
281 |
another.Add (c); |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
282 |
c.c[0] = 0; |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
283 |
another.Peek (c); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
284 |
if (!another.Peek (c)) { |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
285 |
ok = false; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
286 |
} |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
287 |
if (tags.Peek (c)) { |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
288 |
ok = false; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
289 |
} |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
290 |
|
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
291 |
other = other; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
292 |
//other.prettyPrint (std::cout); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
293 |
|
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
294 |
//struct myInvalidTag invalid; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
295 |
//tags.add (&invalid); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
296 |
|
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
297 |
return ok; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
298 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
299 |
|
53
ae406f4957d5
variable/method/function coding style update
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
16
diff
changeset
|
300 |
static TagsTest gTagsTest; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
301 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
302 |
|
16
99e833adbb46
change yans namespace to ns3
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
14
diff
changeset
|
303 |
}; // namespace ns3 |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
304 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
305 |
#endif /* RUN_SELF_TESTS */ |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
306 |