author | Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
Tue, 29 May 2007 16:53:53 +0200 | |
changeset 791 | ff528910ba40 |
parent 790 | de06cb662828 |
child 792 | 99423210502e |
permissions | -rw-r--r-- |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1 |
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
2 |
/* |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
3 |
* Copyright (c) 2006,2007 INRIA |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
4 |
* All rights reserved. |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
5 |
* |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
6 |
* This program is free software; you can redistribute it and/or modify |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
7 |
* it under the terms of the GNU General Public License version 2 as |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
8 |
* published by the Free Software Foundation; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
9 |
* |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
10 |
* This program is distributed in the hope that it will be useful, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
11 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
12 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
13 |
* GNU General Public License for more details. |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
14 |
* |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
16 |
* along with this program; if not, write to the Free Software |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
17 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
18 |
* |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
19 |
* Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
20 |
*/ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
21 |
#include <utility> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
22 |
#include "ns3/assert.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
23 |
#include "ns3/fatal-error.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
24 |
#include "packet-history.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
25 |
#include "chunk.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
26 |
#include "buffer.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
27 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
28 |
namespace ns3 { |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
29 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
30 |
bool PacketHistory::m_enable = false; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
31 |
PacketHistory::ChunkFactories PacketHistory::m_factories; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
32 |
uint32_t PacketHistory::m_maxSize = 0; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
33 |
PacketHistory::DataFreeList PacketHistory::m_freeList; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
34 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
35 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
36 |
PacketHistory::Enable (void) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
37 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
38 |
m_enable = true; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
39 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
40 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
41 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
42 |
PacketHistory::PacketHistory () |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
43 |
: m_data (0), |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
44 |
m_end (0), |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
45 |
m_n (0), |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
46 |
m_aggregated (false) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
47 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
48 |
Construct (0, 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
49 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
50 |
PacketHistory::PacketHistory (uint32_t uid, uint32_t size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
51 |
: m_data (0), |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
52 |
m_end (0), |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
53 |
m_n (0), |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
54 |
m_aggregated (false) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
55 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
56 |
Construct (uid, size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
57 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
58 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
59 |
PacketHistory::Construct (uint32_t uid, uint32_t size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
60 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
61 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
62 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
63 |
m_data = PacketHistory::Create (size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
64 |
AppendOneCommand (PacketHistory::INIT_UID, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
65 |
uid); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
66 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
67 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
68 |
PacketHistory::PacketHistory (PacketHistory const &o) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
69 |
: m_data (o.m_data), |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
70 |
m_end (o.m_end), |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
71 |
m_n (o.m_n), |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
72 |
m_aggregated (o.m_aggregated) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
73 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
74 |
if (m_data != 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
75 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
76 |
m_data->m_count++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
77 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
78 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
79 |
PacketHistory & |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
80 |
PacketHistory::operator = (PacketHistory const& o) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
81 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
82 |
if (m_data == o.m_data) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
83 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
84 |
// self assignment |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
85 |
return *this; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
86 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
87 |
if (m_data != 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
88 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
89 |
m_data->m_count--; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
90 |
if (m_data->m_count == 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
91 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
92 |
PacketHistory::Recycle (m_data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
93 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
94 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
95 |
m_data = o.m_data; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
96 |
m_end = o.m_end; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
97 |
m_n = o.m_n; |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
98 |
m_aggregated = o.m_aggregated; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
99 |
if (m_data != 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
100 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
101 |
m_data->m_count++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
102 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
103 |
return *this; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
104 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
105 |
PacketHistory::~PacketHistory () |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
106 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
107 |
if (m_data != 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
108 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
109 |
m_data->m_count--; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
110 |
if (m_data->m_count == 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
111 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
112 |
PacketHistory::Recycle (m_data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
113 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
114 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
115 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
116 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
117 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
118 |
struct PacketHistory::CommandData * |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
119 |
PacketHistory::Create (uint32_t size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
120 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
121 |
if (size > m_maxSize) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
122 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
123 |
m_maxSize = size; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
124 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
125 |
while (!m_freeList.empty ()) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
126 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
127 |
struct PacketHistory::CommandData *data = m_freeList.back (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
128 |
m_freeList.pop_back (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
129 |
if (data->m_size >= size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
130 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
131 |
data->m_count = 1; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
132 |
return data; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
133 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
134 |
PacketHistory::Deallocate (data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
135 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
136 |
return PacketHistory::Allocate (size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
137 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
138 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
139 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
140 |
PacketHistory::Recycle (struct CommandData *data) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
141 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
142 |
NS_ASSERT (data->m_count == 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
143 |
if (m_freeList.size () > 1000 || |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
144 |
data->m_size < m_maxSize) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
145 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
146 |
PacketHistory::Deallocate (data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
147 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
148 |
else |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
149 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
150 |
m_freeList.push_back (data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
151 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
152 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
153 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
154 |
struct PacketHistory::CommandData * |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
155 |
PacketHistory::Allocate (uint32_t n) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
156 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
157 |
uint32_t size = sizeof (struct CommandData); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
158 |
if (n <= 4) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
159 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
160 |
n = 4; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
161 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
162 |
size += (n-4) * (4 + 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
163 |
uint8_t *buf = new uint8_t [size]; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
164 |
struct CommandData *data = (struct CommandData *)buf; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
165 |
data->m_size = n; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
166 |
data->m_count = 1; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
167 |
return data; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
168 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
169 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
170 |
PacketHistory::Deallocate (struct CommandData *data) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
171 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
172 |
uint8_t *buf = (uint8_t *)data; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
173 |
delete [] buf; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
174 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
175 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
176 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
177 |
PacketHistory::AppendOneCommand (uint32_t type, uint32_t data0, uint32_t data1) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
178 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
179 |
NS_ASSERT (m_data != 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
180 |
uint32_t n = GetUleb128Size (type); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
181 |
n += GetUleb128Size (data0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
182 |
n += GetUleb128Size (data1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
183 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
184 |
if (m_data->m_size > m_end + n) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
185 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
186 |
if (m_data->m_count == 1 || |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
187 |
m_data->m_dirtyEnd == m_end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
188 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
189 |
AppendValue (data1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
190 |
AppendValue (data0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
191 |
AppendValue (type); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
192 |
m_n++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
193 |
return; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
194 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
195 |
else |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
196 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
197 |
uint8_t *buffer = &(m_data->m_data[m_end]); |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
198 |
uint32_t lastType = ReadReverseValue (&buffer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
199 |
if (lastType == type) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
200 |
{ |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
201 |
uint32_t lastData = ReadReverseValue (&buffer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
202 |
if (lastData == data0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
203 |
{ |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
204 |
lastData = ReadReverseValue (&buffer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
205 |
if (lastData == data1) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
206 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
207 |
return; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
208 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
209 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
210 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
211 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
212 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
213 |
Reserve (n); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
214 |
AppendValue (data1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
215 |
AppendValue (data0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
216 |
AppendValue (type); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
217 |
m_n++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
218 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
219 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
220 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
221 |
PacketHistory::AppendOneCommand (uint32_t type, uint32_t data) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
222 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
223 |
NS_ASSERT (m_data != 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
224 |
uint32_t n = GetUleb128Size (data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
225 |
n += GetUleb128Size (type); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
226 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
227 |
if (m_data->m_size > m_end + n) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
228 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
229 |
if (m_data->m_count == 1 || |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
230 |
m_data->m_dirtyEnd == m_end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
231 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
232 |
AppendValue (data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
233 |
AppendValue (type); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
234 |
m_n++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
235 |
return; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
236 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
237 |
else |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
238 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
239 |
uint8_t *buffer = &(m_data->m_data[m_end]); |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
240 |
uint32_t lastType = ReadReverseValue (&buffer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
241 |
if (lastType == type) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
242 |
{ |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
243 |
uint32_t lastData = ReadReverseValue (&buffer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
244 |
if (lastData == data) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
245 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
246 |
return; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
247 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
248 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
249 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
250 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
251 |
Reserve (n); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
252 |
AppendValue (data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
253 |
AppendValue (type); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
254 |
m_n++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
255 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
256 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
257 |
PacketHistory::ReserveCopy (uint32_t size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
258 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
259 |
struct CommandData *newData = PacketHistory::Create (m_end + size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
260 |
memcpy (newData->m_data, m_data->m_data, m_end); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
261 |
newData->m_dirtyEnd = m_end; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
262 |
m_data->m_count--; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
263 |
if (m_data->m_count == 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
264 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
265 |
PacketHistory::Recycle (m_data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
266 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
267 |
m_data = newData; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
268 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
269 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
270 |
PacketHistory::Reserve (uint32_t size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
271 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
272 |
NS_ASSERT (m_data != 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
273 |
if (m_data->m_size > m_end + size && |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
274 |
(m_data->m_count == 1 || |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
275 |
m_data->m_dirtyEnd == m_end)) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
276 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
277 |
/* enough room, not dirty. */ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
278 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
279 |
else |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
280 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
281 |
/* (enough room and dirty) or (not enough room) */ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
282 |
ReserveCopy (size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
283 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
284 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
285 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
286 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
287 |
PacketHistory::GetUleb128Size (uint32_t value) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
288 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
289 |
uint32_t n = 0; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
290 |
uint32_t tmp = value; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
291 |
do { |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
292 |
tmp >>= 7; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
293 |
n++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
294 |
} while (tmp != 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
295 |
return n; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
296 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
297 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
298 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
299 |
PacketHistory::GetReverseUleb128Size (uint8_t *buffer) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
300 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
301 |
uint8_t *cur = buffer; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
302 |
uint8_t byte = *cur; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
303 |
if (byte & 0x80) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
304 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
305 |
NS_FATAL_ERROR ("The last byte should have a zero high bit"); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
306 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
307 |
cur--; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
308 |
while ((byte & 0x80) && (buffer - cur) < 5) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
309 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
310 |
cur--; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
311 |
byte = *cur; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
312 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
313 |
uint32_t n = buffer - cur; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
314 |
return n; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
315 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
316 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
317 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
318 |
PacketHistory::AppendValue (uint32_t value) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
319 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
320 |
uint32_t n = 0; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
321 |
uint8_t *buffer = &m_data->m_data[m_end]; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
322 |
do { |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
323 |
uint8_t byte = value & (~0x80); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
324 |
value >>= 7; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
325 |
if (value != 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
326 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
327 |
/* more bytes to come */ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
328 |
byte |= 0x80; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
329 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
330 |
n++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
331 |
*buffer = byte; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
332 |
buffer++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
333 |
} while (value != 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
334 |
m_end += n; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
335 |
if (m_end > m_data->m_dirtyEnd) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
336 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
337 |
m_data->m_dirtyEnd = m_end; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
338 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
339 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
340 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
341 |
uint32_t |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
342 |
PacketHistory::ReadValue (uint8_t *buffer, uint32_t *n) const |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
343 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
344 |
uint32_t result = 0; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
345 |
uint8_t shift, byte; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
346 |
result = 0; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
347 |
shift = 0; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
348 |
do { |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
349 |
byte = *buffer; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
350 |
buffer++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
351 |
result |= (byte & (~0x80))<<shift; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
352 |
shift += 7; |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
353 |
(*n)++; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
354 |
} while (byte & 0x80 && |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
355 |
/* a LEB128 unsigned number is at most 5 bytes long. */ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
356 |
shift < (7*5)); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
357 |
if (byte & 0x80) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
358 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
359 |
/* This means that the LEB128 number was not valid. |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
360 |
* ie: the last (5th) byte did not have the high-order bit zeroed. |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
361 |
*/ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
362 |
result = -1; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
363 |
} |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
364 |
return result; |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
365 |
} |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
366 |
|
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
367 |
uint32_t |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
368 |
PacketHistory::ReadReverseValue (uint8_t **pBuffer) const |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
369 |
{ |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
370 |
uint32_t n = GetReverseUleb128Size (*pBuffer); |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
371 |
NS_ASSERT (n > 0); |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
372 |
uint8_t *buffer = *pBuffer - n + 1; |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
373 |
uint32_t read = 0; |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
374 |
uint32_t result = ReadValue (buffer, &read); |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
375 |
NS_ASSERT (read == n); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
376 |
*pBuffer = *pBuffer - n; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
377 |
return result; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
378 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
379 |
|
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
380 |
uint32_t |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
381 |
PacketHistory::ReadForwardValue (uint8_t **pBuffer) const |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
382 |
{ |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
383 |
uint32_t read = 0; |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
384 |
uint32_t result = ReadValue (*pBuffer, &read); |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
385 |
*pBuffer = *pBuffer + read; |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
386 |
return result; |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
387 |
} |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
388 |
|
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
389 |
PacketHistory |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
390 |
PacketHistory::CreateFragment (uint32_t start, uint32_t end) const |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
391 |
{ |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
392 |
PacketHistory fragment = *this; |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
393 |
fragment.RemoveAtStart (start); |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
394 |
fragment.RemoveAtEnd (end); |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
395 |
return fragment; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
396 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
397 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
398 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
399 |
PacketHistory::AddHeader (uint32_t uid, Chunk const & header, uint32_t size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
400 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
401 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
402 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
403 |
AppendOneCommand (PacketHistory::ADD_HEADER, uid, size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
404 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
405 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
406 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
407 |
PacketHistory::RemoveHeader (uint32_t uid, Chunk const & header, uint32_t size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
408 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
409 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
410 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
411 |
AppendOneCommand (PacketHistory::REM_HEADER, uid, size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
412 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
413 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
414 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
415 |
PacketHistory::AddTrailer (uint32_t uid, Chunk const & trailer, uint32_t size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
416 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
417 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
418 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
419 |
AppendOneCommand (PacketHistory::ADD_TRAILER, uid, size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
420 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
421 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
422 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
423 |
PacketHistory::RemoveTrailer (uint32_t uid, Chunk const & trailer, uint32_t size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
424 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
425 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
426 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
427 |
AppendOneCommand (PacketHistory::REM_TRAILER, uid, size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
428 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
429 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
430 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
431 |
PacketHistory::AddAtEnd (PacketHistory const&o) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
432 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
433 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
434 |
{ |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
435 |
m_aggregated = true; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
436 |
uint32_t n = GetUleb128Size (PacketHistory::ADD_AT_END); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
437 |
n += o.m_end; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
438 |
Reserve (n); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
439 |
memcpy (&m_data->m_data[m_end], o.m_data->m_data, o.m_end); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
440 |
m_end += o.m_end; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
441 |
if (m_end > m_data->m_dirtyEnd) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
442 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
443 |
m_data->m_dirtyEnd = m_end; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
444 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
445 |
AppendOneCommand (PacketHistory::ADD_AT_END, 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
446 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
447 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
448 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
449 |
PacketHistory::AddPaddingAtEnd (uint32_t end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
450 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
451 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
452 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
453 |
AppendOneCommand (PacketHistory::PADDING_AT_END, end); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
454 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
455 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
456 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
457 |
PacketHistory::RemoveAtStart (uint32_t start) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
458 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
459 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
460 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
461 |
AppendOneCommand (PacketHistory::REM_AT_START, start); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
462 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
463 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
464 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
465 |
PacketHistory::RemoveAtEnd (uint32_t end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
466 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
467 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
468 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
469 |
AppendOneCommand (PacketHistory::REM_AT_END, end); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
470 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
471 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
472 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
473 |
void |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
474 |
PacketHistory::PrintSimple (std::ostream &os, Buffer buffer) const |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
475 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
476 |
Buffer original = buffer; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
477 |
HeadersToPrint headersToPrint; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
478 |
TrailersToPrint trailersToPrint; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
479 |
uint8_t *dataBuffer = &m_data->m_data[m_end] - 1; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
480 |
int32_t start = 0; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
481 |
int32_t end = buffer.GetSize (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
482 |
int32_t curStart = start; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
483 |
int32_t curEnd = end; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
484 |
for (uint32_t i = 0; i < m_n; i++) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
485 |
{ |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
486 |
uint32_t type = ReadReverseValue (&dataBuffer); |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
487 |
uint32_t data = ReadReverseValue (&dataBuffer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
488 |
switch (type) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
489 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
490 |
case PacketHistory::INIT_UID: |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
491 |
break; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
492 |
case PacketHistory::INIT_SIZE: |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
493 |
std::cout << "init size=" << data << std::endl; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
494 |
break; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
495 |
case PacketHistory::ADD_HEADER: { |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
496 |
int32_t size = ReadReverseValue (&dataBuffer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
497 |
if (curStart == start) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
498 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
499 |
if (start + size < end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
500 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
501 |
headersToPrint.push_back (std::make_pair (data, curStart)); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
502 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
503 |
curStart += size; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
504 |
start += size; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
505 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
506 |
else if (curStart + size <= start) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
507 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
508 |
// header lies entirely outside of data area. |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
509 |
curStart += size; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
510 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
511 |
else if (curStart < start) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
512 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
513 |
// header lies partly inside and outside of data area |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
514 |
// potentially, because we fragmented the packet in the middle |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
515 |
// of this header. |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
516 |
curStart += size; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
517 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
518 |
else |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
519 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
520 |
// header lies entirely inside data area but there is some |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
521 |
// data at the start of the data area which does not belong |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
522 |
// to this header. Potentially, because we fragmented |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
523 |
// the packet in the middle of a previous header. |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
524 |
NS_ASSERT (curStart > start); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
525 |
// we print the content of the header anyway because we can. |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
526 |
if (start + size < end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
527 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
528 |
headersToPrint.push_back (std::make_pair (data, curStart)); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
529 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
530 |
curStart += size; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
531 |
start = curStart; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
532 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
533 |
} break; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
534 |
case PacketHistory::REM_HEADER: { |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
535 |
int32_t size = ReadReverseValue (&dataBuffer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
536 |
if (curStart <= start) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
537 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
538 |
// header lies entirely outside of data area. |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
539 |
curStart -= size; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
540 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
541 |
else |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
542 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
543 |
NS_ASSERT (false); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
544 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
545 |
} break; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
546 |
case PacketHistory::ADD_TRAILER: { |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
547 |
int32_t size = ReadReverseValue (&dataBuffer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
548 |
if (curEnd == end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
549 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
550 |
if (end - size >= start) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
551 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
552 |
// trailer lies exactly at the end of the data area |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
553 |
trailersToPrint.push_back (std::make_pair (data, buffer.GetSize () - curEnd)); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
554 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
555 |
curEnd -= size; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
556 |
end -= size; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
557 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
558 |
else if (curEnd - size >= end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
559 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
560 |
// trailer lies entirely outside of data area. |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
561 |
curEnd -= size; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
562 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
563 |
else if (curEnd > end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
564 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
565 |
// header lies partly inside and partly outside of |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
566 |
// data area, potentially because of fragmentation. |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
567 |
curEnd -= size; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
568 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
569 |
else |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
570 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
571 |
// header lies entirely inside data area |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
572 |
NS_ASSERT (curEnd < end); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
573 |
if (end - size >= start) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
574 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
575 |
trailersToPrint.push_back (std::make_pair (data, buffer.GetSize () - curEnd)); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
576 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
577 |
curEnd -= size; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
578 |
end = curEnd; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
579 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
580 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
581 |
} break; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
582 |
case PacketHistory::REM_TRAILER: { |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
583 |
int32_t size = ReadReverseValue (&dataBuffer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
584 |
if (curEnd >= end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
585 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
586 |
curEnd += size; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
587 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
588 |
else |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
589 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
590 |
NS_ASSERT (false); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
591 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
592 |
} break; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
593 |
case PacketHistory::REM_AT_START: |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
594 |
curStart -= data; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
595 |
break; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
596 |
case PacketHistory::REM_AT_END: |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
597 |
curEnd += data; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
598 |
break; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
599 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
600 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
601 |
for (HeadersToPrint::iterator j = headersToPrint.begin (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
602 |
j != headersToPrint.end (); j++) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
603 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
604 |
uint32_t uid = j->first; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
605 |
uint32_t offset = j->second; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
606 |
Buffer tmp = original; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
607 |
tmp.RemoveAtStart (offset); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
608 |
Chunk *chunk = CreateStatic (uid); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
609 |
chunk->Deserialize (tmp.Begin ()); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
610 |
chunk->Print (os); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
611 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
612 |
for (TrailersToPrint::reverse_iterator j = trailersToPrint.rbegin (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
613 |
j != trailersToPrint.rend (); j++) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
614 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
615 |
uint32_t uid = j->first; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
616 |
uint32_t offset = j->second; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
617 |
Buffer tmp = original; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
618 |
tmp.RemoveAtEnd (offset); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
619 |
Chunk *chunk = CreateStatic (uid); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
620 |
chunk->Deserialize (tmp.End ()); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
621 |
chunk->Print (os); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
622 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
623 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
624 |
|
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
625 |
void |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
626 |
PacketHistory::PrintComplex (std::ostream &os, Buffer buffer) const |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
627 |
{ |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
628 |
// we need to build a linked list of the different fragments |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
629 |
// which are stored in this packet. |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
630 |
|
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
631 |
} |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
632 |
|
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
633 |
void |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
634 |
PacketHistory::PrintDefault (std::ostream &os, Buffer buffer) const |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
635 |
{ |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
636 |
if (!m_enable) |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
637 |
{ |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
638 |
return; |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
639 |
} |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
640 |
|
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
641 |
if (m_aggregated) |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
642 |
{ |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
643 |
PrintComplex (os, buffer); |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
644 |
} |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
645 |
else |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
646 |
{ |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
647 |
PrintSimple (os, buffer); |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
648 |
} |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
649 |
} |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
650 |
|
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
651 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
652 |
Chunk * |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
653 |
PacketHistory::CreateStatic (uint32_t uid) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
654 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
655 |
for (ChunkFactoriesI i = m_factories.begin (); i != m_factories.end (); i++) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
656 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
657 |
if (i->first == uid) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
658 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
659 |
return (*i->second) (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
660 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
661 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
662 |
NS_ASSERT_MSG (false, "cannot be reached"); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
663 |
/* quiet compiler */ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
664 |
return 0; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
665 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
666 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
667 |
PacketHistory::RegisterChunkFactory (Chunk *(*createStatic) (void)) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
668 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
669 |
static uint32_t uid = 0; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
670 |
uid++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
671 |
for (ChunkFactoriesI i = m_factories.begin (); i != m_factories.end (); i++) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
672 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
673 |
NS_ASSERT (i->first != uid); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
674 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
675 |
m_factories.push_back (std::make_pair (uid, createStatic)); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
676 |
return uid; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
677 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
678 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
679 |
}; // namespace ns3 |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
680 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
681 |
#include <stdarg.h> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
682 |
#include <iostream> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
683 |
#include "ns3/test.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
684 |
#include "header.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
685 |
#include "trailer.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
686 |
#include "packet.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
687 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
688 |
namespace ns3 { |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
689 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
690 |
static std::list<int> g_prints; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
691 |
static bool g_headerError; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
692 |
static bool g_trailerError; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
693 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
694 |
static void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
695 |
RecordPrint (int n) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
696 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
697 |
g_prints.push_back (n); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
698 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
699 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
700 |
static void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
701 |
RecordTrailerError (int n) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
702 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
703 |
g_trailerError = true; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
704 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
705 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
706 |
static void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
707 |
RecordHeaderError (int n) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
708 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
709 |
g_headerError = true; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
710 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
711 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
712 |
static void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
713 |
CleanupPrints (void) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
714 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
715 |
g_prints.erase (g_prints.begin (), g_prints.end ()); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
716 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
717 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
718 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
719 |
class HistoryHeader : public Header |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
720 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
721 |
private: |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
722 |
virtual void PrintTo (std::ostream &os) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
723 |
virtual uint32_t GetSerializedSize (void) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
724 |
virtual void SerializeTo (Buffer::Iterator start) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
725 |
virtual uint32_t DeserializeFrom (Buffer::Iterator start); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
726 |
}; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
727 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
728 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
729 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
730 |
HistoryHeader<N>::PrintTo (std::ostream &os) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
731 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
732 |
RecordPrint (N); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
733 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
734 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
735 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
736 |
HistoryHeader<N>::GetSerializedSize (void) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
737 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
738 |
return N; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
739 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
740 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
741 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
742 |
HistoryHeader<N>::SerializeTo (Buffer::Iterator start) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
743 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
744 |
start.WriteU8 (N, N); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
745 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
746 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
747 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
748 |
HistoryHeader<N>::DeserializeFrom (Buffer::Iterator start) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
749 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
750 |
for (int i = 0; i < N; i++) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
751 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
752 |
if (start.ReadU8 () != N) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
753 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
754 |
RecordHeaderError (N); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
755 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
756 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
757 |
return N; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
758 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
759 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
760 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
761 |
class HistoryTrailer : public Trailer |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
762 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
763 |
private: |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
764 |
virtual void PrintTo (std::ostream &os) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
765 |
virtual uint32_t GetSerializedSize (void) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
766 |
virtual void SerializeTo (Buffer::Iterator start) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
767 |
virtual uint32_t DeserializeFrom (Buffer::Iterator start); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
768 |
}; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
769 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
770 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
771 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
772 |
HistoryTrailer<N>::PrintTo (std::ostream &os) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
773 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
774 |
RecordPrint (N); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
775 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
776 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
777 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
778 |
HistoryTrailer<N>::GetSerializedSize (void) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
779 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
780 |
return N; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
781 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
782 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
783 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
784 |
HistoryTrailer<N>::SerializeTo (Buffer::Iterator start) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
785 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
786 |
start.WriteU8 (N, N); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
787 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
788 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
789 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
790 |
HistoryTrailer<N>::DeserializeFrom (Buffer::Iterator start) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
791 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
792 |
start.Prev (N); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
793 |
for (int i = 0; i < N; i++) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
794 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
795 |
if (start.ReadU8 () != N) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
796 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
797 |
RecordTrailerError (N); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
798 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
799 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
800 |
return N; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
801 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
802 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
803 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
804 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
805 |
class PacketHistoryTest : public Test { |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
806 |
public: |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
807 |
PacketHistoryTest (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
808 |
virtual ~PacketHistoryTest (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
809 |
bool CheckHistory (Packet p, char *file, int line, uint32_t n, ...); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
810 |
virtual bool RunTests (void); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
811 |
}; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
812 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
813 |
PacketHistoryTest::PacketHistoryTest () |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
814 |
: Test ("PacketHistory") |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
815 |
{} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
816 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
817 |
PacketHistoryTest::~PacketHistoryTest () |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
818 |
{} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
819 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
820 |
bool |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
821 |
PacketHistoryTest::CheckHistory (Packet p, char *file, int line, uint32_t n, ...) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
822 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
823 |
g_headerError = false; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
824 |
g_trailerError = false; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
825 |
va_list ap; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
826 |
p.Print (std::cerr); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
827 |
va_start (ap, n); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
828 |
if (g_headerError) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
829 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
830 |
std::cout << "PacketHistory header error. file=" << file |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
831 |
<< ", line=" << line << std::endl; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
832 |
return false; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
833 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
834 |
if (g_trailerError) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
835 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
836 |
std::cout << "PacketHistory trailer error. file=" << file |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
837 |
<< ", line=" << line << std::endl; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
838 |
return false; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
839 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
840 |
if (n != g_prints.size ()) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
841 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
842 |
goto error; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
843 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
844 |
for (std::list<int>::iterator i = g_prints.begin (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
845 |
i != g_prints.end (); i++) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
846 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
847 |
int v = va_arg (ap, int); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
848 |
if (v != *i) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
849 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
850 |
va_end (ap); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
851 |
goto error; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
852 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
853 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
854 |
va_end (ap); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
855 |
return true; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
856 |
error: |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
857 |
std::cout << "PacketHistory error. file="<< file |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
858 |
<< ", line=" << line << ", got:\""; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
859 |
for (std::list<int>::iterator i = g_prints.begin (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
860 |
i != g_prints.end (); i++) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
861 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
862 |
std::cout << *i << ", "; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
863 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
864 |
std::cout << "\", expected: \""; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
865 |
va_start (ap, n); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
866 |
for (uint32_t j = 0; j < n; j++) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
867 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
868 |
int v = va_arg (ap, int); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
869 |
std::cout << v << ", "; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
870 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
871 |
va_end (ap); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
872 |
std::cout << "\"" << std::endl; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
873 |
return false; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
874 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
875 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
876 |
#define ADD_HEADER(p, n) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
877 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
878 |
HistoryHeader<n> header; \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
879 |
p.AddHeader (header); \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
880 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
881 |
#define ADD_TRAILER(p, n) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
882 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
883 |
HistoryTrailer<n> trailer; \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
884 |
p.AddTrailer (trailer); \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
885 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
886 |
#define REM_HEADER(p, n) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
887 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
888 |
HistoryHeader<n> header; \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
889 |
p.RemoveHeader (header); \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
890 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
891 |
#define REM_TRAILER(p, n) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
892 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
893 |
HistoryTrailer<n> trailer; \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
894 |
p.RemoveTrailer (trailer); \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
895 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
896 |
#define CHECK_HISTORY(p, ...) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
897 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
898 |
if (!CheckHistory (p, __FILE__, \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
899 |
__LINE__, __VA_ARGS__)) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
900 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
901 |
ok = false; \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
902 |
} \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
903 |
CleanupPrints (); \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
904 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
905 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
906 |
bool |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
907 |
PacketHistoryTest::RunTests (void) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
908 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
909 |
bool ok = true; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
910 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
911 |
PacketHistory::Enable (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
912 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
913 |
Packet p = Packet (0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
914 |
Packet p1 = Packet (0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
915 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
916 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
917 |
ADD_TRAILER (p, 100); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
918 |
CHECK_HISTORY (p, 1, 100); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
919 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
920 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
921 |
ADD_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
922 |
ADD_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
923 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
924 |
CHECK_HISTORY (p, 3, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
925 |
3, 2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
926 |
ADD_HEADER (p, 5); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
927 |
CHECK_HISTORY (p, 4, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
928 |
5, 3, 2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
929 |
ADD_HEADER (p, 6); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
930 |
CHECK_HISTORY (p, 5, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
931 |
6, 5, 3, 2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
932 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
933 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
934 |
ADD_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
935 |
ADD_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
936 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
937 |
REM_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
938 |
CHECK_HISTORY (p, 2, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
939 |
2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
940 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
941 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
942 |
ADD_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
943 |
ADD_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
944 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
945 |
REM_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
946 |
REM_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
947 |
CHECK_HISTORY (p, 1, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
948 |
1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
949 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
950 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
951 |
ADD_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
952 |
ADD_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
953 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
954 |
REM_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
955 |
REM_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
956 |
REM_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
957 |
CHECK_HISTORY (p, 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
958 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
959 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
960 |
ADD_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
961 |
ADD_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
962 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
963 |
p1 = p; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
964 |
REM_HEADER (p1, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
965 |
REM_HEADER (p1, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
966 |
REM_HEADER (p1, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
967 |
CHECK_HISTORY (p1, 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
968 |
CHECK_HISTORY (p, 3, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
969 |
3, 2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
970 |
ADD_HEADER (p1, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
971 |
ADD_HEADER (p1, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
972 |
CHECK_HISTORY (p1, 2, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
973 |
2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
974 |
CHECK_HISTORY (p, 3, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
975 |
3, 2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
976 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
977 |
CHECK_HISTORY (p, 4, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
978 |
3, 3, 2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
979 |
ADD_TRAILER (p, 4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
980 |
CHECK_HISTORY (p, 5, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
981 |
3, 3, 2, 1, 4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
982 |
ADD_TRAILER (p, 5); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
983 |
CHECK_HISTORY (p, 6, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
984 |
3, 3, 2, 1, 4, 5); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
985 |
REM_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
986 |
CHECK_HISTORY (p, 5, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
987 |
3, 2, 1, 4, 5); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
988 |
REM_TRAILER (p, 5); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
989 |
CHECK_HISTORY (p, 4, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
990 |
3, 2, 1, 4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
991 |
p1 = p; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
992 |
REM_TRAILER (p, 4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
993 |
CHECK_HISTORY (p, 3, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
994 |
3, 2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
995 |
CHECK_HISTORY (p1, 4, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
996 |
3, 2, 1, 4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
997 |
p1.RemoveAtStart (3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
998 |
CHECK_HISTORY (p1, 3, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
999 |
2, 1, 4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1000 |
p1.RemoveAtStart (2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1001 |
CHECK_HISTORY (p1, 2, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1002 |
1, 4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1003 |
p1.RemoveAtEnd (4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1004 |
CHECK_HISTORY (p1, 1, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1005 |
1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1006 |
p1.RemoveAtStart (1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1007 |
CHECK_HISTORY (p1, 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1008 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1009 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1010 |
ADD_HEADER (p, 8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1011 |
ADD_TRAILER (p, 8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1012 |
ADD_TRAILER (p, 8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1013 |
p.RemoveAtStart (8+10+8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1014 |
CHECK_HISTORY (p, 1, 8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1015 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1016 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1017 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1018 |
ADD_HEADER (p, 10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1019 |
ADD_HEADER (p, 8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1020 |
ADD_TRAILER (p, 6); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1021 |
ADD_TRAILER (p, 7); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1022 |
ADD_TRAILER (p, 9); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1023 |
p.RemoveAtStart (5); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1024 |
p.RemoveAtEnd (12); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1025 |
CHECK_HISTORY (p, 2, 10, 6); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1026 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1027 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1028 |
return ok; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1029 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1030 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1031 |
static PacketHistoryTest g_packetHistoryTest; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1032 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1033 |
}//namespace ns3 |