author | Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
Wed, 02 Jul 2008 03:16:36 -0700 | |
changeset 3365 | 6409d2460601 |
parent 3301 | 60edfd1060ff |
child 3762 | 622a33a8820c |
permissions | -rw-r--r-- |
3050
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
1 |
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
2 |
/* |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
3 |
* Copyright (c) 2008 INRIA |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
4 |
* |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
5 |
* This program is free software; you can redistribute it and/or modify |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
6 |
* it under the terms of the GNU General Public License version 2 as |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
7 |
* published by the Free Software Foundation; |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
8 |
* |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
9 |
* This program is distributed in the hope that it will be useful, |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
12 |
* GNU General Public License for more details. |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
13 |
* |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
14 |
* You should have received a copy of the GNU General Public License |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
15 |
* along with this program; if not, write to the Free Software |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
16 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
17 |
* |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
18 |
* Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
9cc612c6cd32
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3043
diff
changeset
|
19 |
*/ |
3041
a624276a897b
mtag -> tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3040
diff
changeset
|
20 |
#include "tag-list.h" |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
21 |
#include "ns3/log.h" |
3043
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
22 |
#include <vector> |
3365
6409d2460601
bug 245: build failure with gcc 4.3.x
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3301
diff
changeset
|
23 |
#include <string.h> |
3043
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
24 |
|
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
25 |
NS_LOG_COMPONENT_DEFINE ("TagList"); |
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
26 |
|
3043
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
27 |
#define USE_FREE_LIST 1 |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
28 |
#define FREE_LIST_SIZE 1000 |
3299
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
29 |
#define OFFSET_MAX (2147483647) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
30 |
|
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
31 |
namespace ns3 { |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
32 |
|
3043
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
33 |
struct TagListData { |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
34 |
uint32_t size; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
35 |
uint32_t count; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
36 |
uint32_t dirty; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
37 |
uint8_t data[4]; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
38 |
}; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
39 |
|
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
40 |
#ifdef USE_FREE_LIST |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
41 |
static class TagListDataFreeList : public std::vector<struct TagListData *> |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
42 |
{ |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
43 |
public: |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
44 |
~TagListDataFreeList (); |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
45 |
} g_freeList; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
46 |
static uint32_t g_maxSize = 0; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
47 |
|
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
48 |
TagListDataFreeList::~TagListDataFreeList () |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
49 |
{ |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
50 |
for (TagListDataFreeList::iterator i = begin (); |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
51 |
i != end (); i++) |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
52 |
{ |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
53 |
uint8_t *buffer = (uint8_t *)(*i); |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
54 |
delete [] buffer; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
55 |
} |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
56 |
} |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
57 |
#endif /* USE_FREE_LIST */ |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
58 |
|
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
59 |
TagList::Iterator::Item::Item (TagBuffer buf_) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
60 |
: buf (buf_) |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
61 |
{} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
62 |
|
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
63 |
bool |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
64 |
TagList::Iterator::HasNext (void) const |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
65 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
66 |
return m_current < m_end; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
67 |
} |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
68 |
struct TagList::Iterator::Item |
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
69 |
TagList::Iterator::Next (void) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
70 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
71 |
NS_ASSERT (HasNext ()); |
3056
d4bb2f7687d1
avoid doing the work twice.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3050
diff
changeset
|
72 |
struct Item item = Item (TagBuffer (m_current+16, m_end)); |
d4bb2f7687d1
avoid doing the work twice.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3050
diff
changeset
|
73 |
item.tid.SetUid (m_nextTid); |
d4bb2f7687d1
avoid doing the work twice.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3050
diff
changeset
|
74 |
item.size = m_nextSize; |
d4bb2f7687d1
avoid doing the work twice.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3050
diff
changeset
|
75 |
item.start = m_nextStart; |
d4bb2f7687d1
avoid doing the work twice.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3050
diff
changeset
|
76 |
item.end = m_nextEnd; |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
77 |
item.start = std::max (item.start, m_offsetStart); |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
78 |
item.end = std::min (item.end, m_offsetEnd); |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
79 |
m_current += 4 + 4 + 4 + 4 + item.size; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
80 |
item.buf.TrimAtEnd (m_end - m_current); |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
81 |
PrepareForNext (); |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
82 |
return item; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
83 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
84 |
void |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
85 |
TagList::Iterator::PrepareForNext (void) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
86 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
87 |
while (m_current < m_end) |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
88 |
{ |
3056
d4bb2f7687d1
avoid doing the work twice.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3050
diff
changeset
|
89 |
TagBuffer buf = TagBuffer (m_current, m_end); |
d4bb2f7687d1
avoid doing the work twice.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3050
diff
changeset
|
90 |
m_nextTid = buf.ReadU32 (); |
d4bb2f7687d1
avoid doing the work twice.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3050
diff
changeset
|
91 |
m_nextSize = buf.ReadU32 (); |
d4bb2f7687d1
avoid doing the work twice.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3050
diff
changeset
|
92 |
m_nextStart = buf.ReadU32 (); |
d4bb2f7687d1
avoid doing the work twice.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3050
diff
changeset
|
93 |
m_nextEnd = buf.ReadU32 (); |
3300
c8011a2a0c60
another testcase for bug 217. Make sure we do not report tags outside of the current range
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3299
diff
changeset
|
94 |
if (m_nextStart >= m_offsetEnd || m_nextEnd <= m_offsetStart) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
95 |
{ |
3056
d4bb2f7687d1
avoid doing the work twice.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3050
diff
changeset
|
96 |
m_current += 4 + 4 + 4 + 4 + m_nextSize; |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
97 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
98 |
else |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
99 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
100 |
break; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
101 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
102 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
103 |
} |
3299
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
104 |
TagList::Iterator::Iterator (uint8_t *start, uint8_t *end, int32_t offsetStart, int32_t offsetEnd) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
105 |
: m_current (start), |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
106 |
m_end (end), |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
107 |
m_offsetStart (offsetStart), |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
108 |
m_offsetEnd (offsetEnd) |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
109 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
110 |
PrepareForNext (); |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
111 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
112 |
|
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
113 |
uint32_t |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
114 |
TagList::Iterator::GetOffsetStart (void) const |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
115 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
116 |
return m_offsetStart; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
117 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
118 |
|
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
119 |
|
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
120 |
TagList::TagList () |
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
121 |
: m_used (0), |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
122 |
m_data (0) |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
123 |
{ |
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
124 |
NS_LOG_FUNCTION (this); |
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
125 |
} |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
126 |
TagList::TagList (const TagList &o) |
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
127 |
: m_used (o.m_used), |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
128 |
m_data (o.m_data) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
129 |
{ |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
130 |
NS_LOG_FUNCTION (this << &o); |
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
131 |
if (m_data != 0) |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
132 |
{ |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
133 |
m_data->count++; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
134 |
} |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
135 |
} |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
136 |
TagList & |
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
137 |
TagList::operator = (const TagList &o) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
138 |
{ |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
139 |
NS_LOG_FUNCTION (this << &o); |
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
140 |
if (this == &o) |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
141 |
{ |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
142 |
return *this; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
143 |
} |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
144 |
|
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
145 |
Deallocate (m_data); |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
146 |
m_data = o.m_data; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
147 |
m_used = o.m_used; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
148 |
if (m_data != 0) |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
149 |
{ |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
150 |
m_data->count++; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
151 |
} |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
152 |
return *this; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
153 |
} |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
154 |
TagList::~TagList () |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
155 |
{ |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
156 |
NS_LOG_FUNCTION (this); |
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
157 |
Deallocate (m_data); |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
158 |
m_data = 0; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
159 |
m_used = 0; |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
160 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
161 |
|
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
162 |
TagBuffer |
3299
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
163 |
TagList::Add (TypeId tid, uint32_t bufferSize, int32_t start, int32_t end) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
164 |
{ |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
165 |
NS_LOG_FUNCTION (this << tid << bufferSize << start << end); |
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
166 |
uint32_t spaceNeeded = m_used + bufferSize + 4 + 4 + 4 + 4; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
167 |
NS_ASSERT (m_used <= spaceNeeded); |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
168 |
if (m_data == 0) |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
169 |
{ |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
170 |
m_data = Allocate (spaceNeeded); |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
171 |
m_used = 0; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
172 |
} |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
173 |
else if (m_data->size < spaceNeeded || |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
174 |
(m_data->count != 1 && m_data->dirty != m_used)) |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
175 |
{ |
3043
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
176 |
struct TagListData *newData = Allocate (spaceNeeded); |
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
177 |
memcpy (&newData->data, &m_data->data, m_used); |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
178 |
Deallocate (m_data); |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
179 |
m_data = newData; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
180 |
} |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
181 |
TagBuffer tag = TagBuffer (&m_data->data[m_used], |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
182 |
&m_data->data[spaceNeeded]); |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
183 |
tag.WriteU32 (tid.GetUid ()); |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
184 |
tag.WriteU32 (bufferSize); |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
185 |
tag.WriteU32 (start); |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
186 |
tag.WriteU32 (end); |
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
187 |
m_used = spaceNeeded; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
188 |
m_data->dirty = m_used; |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
189 |
return tag; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
190 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
191 |
|
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
192 |
void |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
193 |
TagList::Add (const TagList &o) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
194 |
{ |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
195 |
NS_LOG_FUNCTION (this << &o); |
3299
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
196 |
TagList::Iterator i = o.BeginAll (); |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
197 |
while (i.HasNext ()) |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
198 |
{ |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
199 |
TagList::Iterator::Item item = i.Next (); |
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
200 |
TagBuffer buf = Add (item.tid, item.size, item.start, item.end); |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
201 |
buf.CopyFrom (item.buf); |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
202 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
203 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
204 |
|
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
205 |
void |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
206 |
TagList::RemoveAll (void) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
207 |
{ |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
208 |
NS_LOG_FUNCTION (this); |
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
209 |
Deallocate (m_data); |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
210 |
m_data = 0; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
211 |
m_used = 0; |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
212 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
213 |
|
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
214 |
TagList::Iterator |
3299
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
215 |
TagList::BeginAll (void) const |
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
216 |
{ |
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
217 |
NS_LOG_FUNCTION (this); |
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
218 |
// I am not totally sure but I might need to use |
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
219 |
// INT32_MIN instead of zero below. |
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
220 |
return Begin (0, OFFSET_MAX); |
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
221 |
} |
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
222 |
|
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
223 |
TagList::Iterator |
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
224 |
TagList::Begin (int32_t offsetStart, int32_t offsetEnd) const |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
225 |
{ |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
226 |
NS_LOG_FUNCTION (this << offsetStart << offsetEnd); |
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
227 |
if (m_data == 0) |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
228 |
{ |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
229 |
return Iterator (0, 0, offsetStart, offsetEnd); |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
230 |
} |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
231 |
else |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
232 |
{ |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
233 |
return Iterator (m_data->data, &m_data->data[m_used], offsetStart, offsetEnd); |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
234 |
} |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
235 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
236 |
|
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
237 |
bool |
3299
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
238 |
TagList::IsDirtyAtEnd (int32_t appendOffset) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
239 |
{ |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
240 |
NS_LOG_FUNCTION (this << appendOffset); |
3299
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
241 |
TagList::Iterator i = BeginAll (); |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
242 |
while (i.HasNext ()) |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
243 |
{ |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
244 |
TagList::Iterator::Item item = i.Next (); |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
245 |
if (item.end > appendOffset) |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
246 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
247 |
return true; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
248 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
249 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
250 |
return false; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
251 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
252 |
|
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
253 |
bool |
3299
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
254 |
TagList::IsDirtyAtStart (int32_t prependOffset) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
255 |
{ |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
256 |
NS_LOG_FUNCTION (this << prependOffset); |
3299
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
257 |
TagList::Iterator i = BeginAll (); |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
258 |
while (i.HasNext ()) |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
259 |
{ |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
260 |
TagList::Iterator::Item item = i.Next (); |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
261 |
if (item.start < prependOffset) |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
262 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
263 |
return true; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
264 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
265 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
266 |
return false; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
267 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
268 |
|
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
269 |
void |
3299
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
270 |
TagList::AddAtEnd (int32_t adjustment, int32_t appendOffset) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
271 |
{ |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
272 |
NS_LOG_FUNCTION (this << adjustment << appendOffset); |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
273 |
if (adjustment == 0 && !IsDirtyAtEnd (appendOffset)) |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
274 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
275 |
return; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
276 |
} |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
277 |
TagList list; |
3299
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
278 |
TagList::Iterator i = BeginAll (); |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
279 |
while (i.HasNext ()) |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
280 |
{ |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
281 |
TagList::Iterator::Item item = i.Next (); |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
282 |
item.start += adjustment; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
283 |
item.end += adjustment; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
284 |
|
3301
60edfd1060ff
bug 217: yet another testcase: make sure we handle degenerate testcases with tags which refer to non-existant data.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3300
diff
changeset
|
285 |
if (item.start >= appendOffset) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
286 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
287 |
continue; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
288 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
289 |
else if (item.start < appendOffset && item.end > appendOffset) |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
290 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
291 |
item.end = appendOffset; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
292 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
293 |
else |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
294 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
295 |
// nothing to do. |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
296 |
} |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
297 |
TagBuffer buf = list.Add (item.tid, item.size, item.start, item.end); |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
298 |
buf.CopyFrom (item.buf); |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
299 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
300 |
*this = list; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
301 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
302 |
|
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
303 |
void |
3299
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
304 |
TagList::AddAtStart (int32_t adjustment, int32_t prependOffset) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
305 |
{ |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
306 |
NS_LOG_FUNCTION (this << adjustment << prependOffset); |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
307 |
if (adjustment == 0 && !IsDirtyAtStart (prependOffset)) |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
308 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
309 |
return; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
310 |
} |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
311 |
TagList list; |
3299
4c42f0b977ad
bug 217: avoid unsigned/signed confusion. Used signed all the time.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3236
diff
changeset
|
312 |
TagList::Iterator i = BeginAll (); |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
313 |
while (i.HasNext ()) |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
314 |
{ |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
315 |
TagList::Iterator::Item item = i.Next (); |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
316 |
item.start += adjustment; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
317 |
item.end += adjustment; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
318 |
|
3301
60edfd1060ff
bug 217: yet another testcase: make sure we handle degenerate testcases with tags which refer to non-existant data.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3300
diff
changeset
|
319 |
if (item.end <= prependOffset) |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
320 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
321 |
continue; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
322 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
323 |
else if (item.end > prependOffset && item.start < prependOffset) |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
324 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
325 |
item.start = prependOffset; |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
326 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
327 |
else |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
328 |
{ |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
329 |
// nothing to do. |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
330 |
} |
3040
e11e106c7c19
Mtag -> Tag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3035
diff
changeset
|
331 |
TagBuffer buf = list.Add (item.tid, item.size, item.start, item.end); |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
332 |
buf.CopyFrom (item.buf); |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
333 |
} |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
334 |
*this = list; |
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
335 |
} |
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
336 |
|
3043
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
337 |
#ifdef USE_FREE_LIST |
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
338 |
|
3043
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
339 |
struct TagListData * |
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
340 |
TagList::Allocate (uint32_t size) |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
341 |
{ |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
342 |
NS_LOG_FUNCTION (this << size); |
3043
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
343 |
while (!g_freeList.empty ()) |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
344 |
{ |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
345 |
struct TagListData *data = g_freeList.back (); |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
346 |
g_freeList.pop_back (); |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
347 |
NS_ASSERT (data != 0); |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
348 |
if (data->size >= size) |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
349 |
{ |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
350 |
data->count = 1; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
351 |
data->dirty = 0; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
352 |
return data; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
353 |
} |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
354 |
uint8_t *buffer = (uint8_t *)data; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
355 |
delete [] buffer; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
356 |
} |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
357 |
uint8_t *buffer = new uint8_t [std::max (size, g_maxSize) + sizeof (struct TagListData) - 4]; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
358 |
struct TagListData *data = (struct TagListData *)buffer; |
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
359 |
data->count = 1; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
360 |
data->size = size; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
361 |
data->dirty = 0; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
362 |
return data; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
363 |
} |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
364 |
|
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
365 |
void |
3043
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
366 |
TagList::Deallocate (struct TagListData *data) |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
367 |
{ |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
368 |
NS_LOG_FUNCTION (this << data); |
3043
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
369 |
if (data == 0) |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
370 |
{ |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
371 |
return; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
372 |
} |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
373 |
g_maxSize = std::max (g_maxSize, data->size); |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
374 |
data->count--; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
375 |
if (data->count == 0) |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
376 |
{ |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
377 |
if (g_freeList.size () > FREE_LIST_SIZE || |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
378 |
data->size < g_maxSize) |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
379 |
{ |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
380 |
uint8_t *buffer = (uint8_t *)data; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
381 |
delete [] buffer; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
382 |
} |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
383 |
else |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
384 |
{ |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
385 |
g_freeList.push_back (data); |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
386 |
} |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
387 |
} |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
388 |
} |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
389 |
|
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
390 |
#else /* USE_FREE_LIST */ |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
391 |
|
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
392 |
struct TagListData * |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
393 |
TagList::Allocate (uint32_t size) |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
394 |
{ |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
395 |
NS_LOG_FUNCTION (this << size); |
3043
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
396 |
uint8_t *buffer = new uint8_t [size + sizeof (struct TagListData) - 4]; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
397 |
struct TagListData *data = (struct TagListData *)buffer; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
398 |
data->count = 1; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
399 |
data->size = size; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
400 |
data->dirty = 0; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
401 |
return data; |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
402 |
} |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
403 |
|
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
404 |
void |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
405 |
TagList::Deallocate (struct TagListData *data) |
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
406 |
{ |
3236
8d25b503f270
add some logging
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3223
diff
changeset
|
407 |
NS_LOG_FUNCTION (this << data); |
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
408 |
if (data == 0) |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
409 |
{ |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
410 |
return; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
411 |
} |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
412 |
data->count--; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
413 |
if (data->count == 0) |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
414 |
{ |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
415 |
uint8_t *buffer = (uint8_t *)data; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
416 |
delete [] buffer; |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
417 |
} |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
418 |
} |
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
419 |
|
3043
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
420 |
#endif /* USE_FREE_LIST */ |
4a1ab06f0d63
use a free list for tag buffers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3042
diff
changeset
|
421 |
|
3042
d0a9677d5452
use a shared buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3041
diff
changeset
|
422 |
|
3035
644bfc099992
a new tag implementation: Mtag
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
423 |
} // namespace ns3 |