author | Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
Thu, 07 Jun 2007 11:38:06 +0200 | |
changeset 874 | 85c528e8eb0b |
parent 873 | 2aab1eb32b12 |
child 876 | 850783184c36 |
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> |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
22 |
#include <list> |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
23 |
#include "ns3/assert.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
24 |
#include "ns3/fatal-error.h" |
833
224bfad58818
a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
830
diff
changeset
|
25 |
#include "ns3/debug.h" |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
26 |
#include "packet-history.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
27 |
#include "chunk.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
28 |
#include "buffer.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
29 |
|
833
224bfad58818
a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
830
diff
changeset
|
30 |
NS_DEBUG_COMPONENT_DEFINE ("PacketHistory"); |
224bfad58818
a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
830
diff
changeset
|
31 |
|
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
32 |
namespace ns3 { |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
33 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
34 |
bool PacketHistory::m_enable = false; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
35 |
uint32_t PacketHistory::m_maxSize = 0; |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
36 |
uint16_t PacketHistory::m_chunkUid = 0; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
37 |
PacketHistory::DataFreeList PacketHistory::m_freeList; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
38 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
39 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
40 |
PacketHistory::Enable (void) |
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 |
m_enable = true; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
43 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
44 |
|
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
45 |
void |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
46 |
PacketHistory::ReserveCopy (uint32_t size) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
47 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
48 |
struct PacketHistory::Data *newData = PacketHistory::Create (m_used + size); |
836
f9f5f66013cc
fix addition of a trailer or a header
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
835
diff
changeset
|
49 |
memcpy (newData->m_data, m_data->m_data, m_used); |
f9f5f66013cc
fix addition of a trailer or a header
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
835
diff
changeset
|
50 |
newData->m_dirtyEnd = m_used; |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
51 |
m_data->m_count--; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
52 |
if (m_data->m_count == 0) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
53 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
54 |
PacketHistory::Recycle (m_data); |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
55 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
56 |
m_data = newData; |
844
d17e2aca5a17
when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
843
diff
changeset
|
57 |
if (m_head != 0xffff) |
d17e2aca5a17
when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
843
diff
changeset
|
58 |
{ |
d17e2aca5a17
when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
843
diff
changeset
|
59 |
uint8_t *start; |
d17e2aca5a17
when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
843
diff
changeset
|
60 |
NS_ASSERT (m_tail != 0xffff); |
d17e2aca5a17
when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
843
diff
changeset
|
61 |
// clear the next field of the tail |
d17e2aca5a17
when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
843
diff
changeset
|
62 |
start = &m_data->m_data[m_tail]; |
857
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
63 |
Append16 (0xffff, start); |
844
d17e2aca5a17
when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
843
diff
changeset
|
64 |
// clear the prev field of the head |
d17e2aca5a17
when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
843
diff
changeset
|
65 |
start = &m_data->m_data[m_head] + 2; |
857
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
66 |
Append16 (0xffff, start); |
844
d17e2aca5a17
when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
843
diff
changeset
|
67 |
} |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
68 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
69 |
void |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
70 |
PacketHistory::Reserve (uint32_t size) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
71 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
72 |
NS_ASSERT (m_data != 0); |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
73 |
if (m_data->m_size >= m_used + size && |
870
e335d37541c3
try alternative implementation of AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
869
diff
changeset
|
74 |
(m_head == 0xffff || |
e335d37541c3
try alternative implementation of AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
869
diff
changeset
|
75 |
m_data->m_count == 1 || |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
76 |
m_data->m_dirtyEnd == m_used)) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
77 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
78 |
/* enough room, not dirty. */ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
79 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
80 |
else |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
81 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
82 |
/* (enough room and dirty) or (not enough room) */ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
83 |
ReserveCopy (size); |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
84 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
85 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
86 |
|
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
87 |
uint32_t |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
88 |
PacketHistory::GetUleb128Size (uint32_t value) const |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
89 |
{ |
869
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
90 |
if (value < 0x80) |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
91 |
{ |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
92 |
return 1; |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
93 |
} |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
94 |
if (value < 0x4000) |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
95 |
{ |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
96 |
return 2; |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
97 |
} |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
98 |
if (value < 0x200000) |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
99 |
{ |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
100 |
return 3; |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
101 |
} |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
102 |
if (value < 0x10000000) |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
103 |
{ |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
104 |
return 4; |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
105 |
} |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
106 |
return 5; |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
107 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
108 |
uint32_t |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
109 |
PacketHistory::ReadUleb128 (const uint8_t **pBuffer) const |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
110 |
{ |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
111 |
const uint8_t *buffer = *pBuffer; |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
112 |
uint32_t result = 0; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
113 |
uint8_t byte; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
114 |
result = 0; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
115 |
byte = buffer[0]; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
116 |
result = (byte & (~0x80)); |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
117 |
if (!(byte & 0x80)) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
118 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
119 |
*pBuffer = buffer + 1; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
120 |
return result; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
121 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
122 |
byte = buffer[1]; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
123 |
result = (byte & (~0x80)) << 7; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
124 |
if (!(byte & 0x80)) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
125 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
126 |
*pBuffer = buffer + 2; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
127 |
return result; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
128 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
129 |
byte = buffer[2]; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
130 |
result = (byte & (~0x80)) << 14; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
131 |
if (!(byte & 0x80)) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
132 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
133 |
*pBuffer = buffer + 3; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
134 |
return result; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
135 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
136 |
byte = buffer[3]; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
137 |
result = (byte & (~0x80)) << 21; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
138 |
if (!(byte & 0x80)) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
139 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
140 |
*pBuffer = buffer + 4; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
141 |
return result; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
142 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
143 |
byte = buffer[4]; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
144 |
result = (byte & (~0x80)) << 28; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
145 |
if (!(byte & 0x80)) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
146 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
147 |
*pBuffer = buffer + 5; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
148 |
return result; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
149 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
150 |
/* This means that the LEB128 number was not valid. |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
151 |
* ie: the last (5th) byte did not have the high-order bit zeroed. |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
152 |
*/ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
153 |
NS_ASSERT (false); |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
154 |
return 0; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
155 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
156 |
|
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
157 |
void |
857
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
158 |
PacketHistory::Append16 (uint16_t value, uint8_t *buffer) |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
159 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
160 |
buffer[0] = value & 0xff; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
161 |
value >>= 8; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
162 |
buffer[1] = value; |
857
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
163 |
} |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
164 |
bool |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
165 |
PacketHistory::TryToAppendFast (uint32_t value, uint8_t **pBuffer, uint8_t *end) |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
166 |
{ |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
167 |
uint8_t *start = *pBuffer; |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
168 |
if (value < 0x80 && start < end) |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
169 |
{ |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
170 |
start[0] = value; |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
171 |
*pBuffer = start + 1; |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
172 |
return true; |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
173 |
} |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
174 |
if (value < 0x4000 && start + 1 < end) |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
175 |
{ |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
176 |
uint8_t byte = value & (~0x80); |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
177 |
start[0] = 0x80 | byte; |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
178 |
value >>= 7; |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
179 |
start[1] = value; |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
180 |
*pBuffer = start + 2; |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
181 |
return true; |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
182 |
} |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
183 |
return false; |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
184 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
185 |
bool |
873
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
186 |
PacketHistory::TryToAppend16 (uint16_t value, uint8_t **pBuffer, uint8_t *end) |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
187 |
{ |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
188 |
uint8_t *start = *pBuffer; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
189 |
if (start + 1 < end) |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
190 |
{ |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
191 |
start[0] = value & 0xff; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
192 |
start[1] = value >> 8; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
193 |
*pBuffer = start + 2; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
194 |
return true; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
195 |
} |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
196 |
return false; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
197 |
} |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
198 |
bool |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
199 |
PacketHistory::TryToAppend32 (uint32_t value, uint8_t **pBuffer, uint8_t *end) |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
200 |
{ |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
201 |
uint8_t *start = *pBuffer; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
202 |
if (start + 3 < end) |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
203 |
{ |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
204 |
start[0] = value & 0xff; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
205 |
start[1] = (value >> 8) & 0xff; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
206 |
start[2] = (value >> 16) & 0xff; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
207 |
start[3] = (value >> 24) & 0xff; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
208 |
*pBuffer = start + 4; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
209 |
return true; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
210 |
} |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
211 |
return false; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
212 |
} |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
213 |
bool |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
214 |
PacketHistory::TryToAppend (uint32_t value, uint8_t **pBuffer, uint8_t *end) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
215 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
216 |
uint8_t *start = *pBuffer; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
217 |
if (value < 0x80 && start < end) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
218 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
219 |
start[0] = value; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
220 |
*pBuffer = start + 1; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
221 |
return true; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
222 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
223 |
if (value < 0x4000 && start + 1 < end) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
224 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
225 |
uint8_t byte = value & (~0x80); |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
226 |
start[0] = 0x80 | byte; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
227 |
value >>= 7; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
228 |
start[1] = value; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
229 |
*pBuffer = start + 2; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
230 |
return true; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
231 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
232 |
if (value < 0x200000 && start + 2 < end) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
233 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
234 |
uint8_t byte = value & (~0x80); |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
235 |
start[0] = 0x80 | byte; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
236 |
value >>= 7; |
869
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
237 |
byte = value & (~0x80); |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
238 |
start[1] = 0x80 | byte; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
239 |
value >>= 7; |
869
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
240 |
byte = value & (~0x80); |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
241 |
start[2] = value; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
242 |
*pBuffer = start + 3; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
243 |
return true; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
244 |
} |
869
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
245 |
if (value < 0x10000000 && start + 3 < end) |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
246 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
247 |
uint8_t byte = value & (~0x80); |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
248 |
start[0] = 0x80 | byte; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
249 |
value >>= 7; |
869
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
250 |
byte = value & (~0x80); |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
251 |
start[1] = 0x80 | byte; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
252 |
value >>= 7; |
869
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
253 |
byte = value & (~0x80); |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
254 |
start[2] = 0x80 | byte; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
255 |
value >>= 7; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
256 |
start[3] = value; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
257 |
*pBuffer = start + 4; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
258 |
return true; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
259 |
} |
869
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
260 |
if (start + 4 < end) |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
261 |
{ |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
262 |
uint8_t byte = value & (~0x80); |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
263 |
start[0] = 0x80 | byte; |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
264 |
value >>= 7; |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
265 |
byte = value & (~0x80); |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
266 |
start[1] = 0x80 | byte; |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
267 |
value >>= 7; |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
268 |
byte = value & (~0x80); |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
269 |
start[2] = 0x80 | byte; |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
270 |
value >>= 7; |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
271 |
byte = value & (~0x80); |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
272 |
start[3] = 0x80 | byte; |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
273 |
value >>= 7; |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
274 |
start[4] = value; |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
275 |
*pBuffer = start + 5; |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
276 |
return true; |
652907a5e97d
fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
867
diff
changeset
|
277 |
} |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
278 |
return false; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
279 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
280 |
|
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
281 |
void |
863
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
282 |
PacketHistory::UpdateTail (uint16_t written) |
853
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
283 |
{ |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
284 |
if (m_head == 0xffff) |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
285 |
{ |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
286 |
NS_ASSERT (m_tail == 0xffff); |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
287 |
m_head = m_used; |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
288 |
m_tail = m_used; |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
289 |
} |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
290 |
else |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
291 |
{ |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
292 |
NS_ASSERT (m_tail != 0xffff); |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
293 |
// overwrite the next field of the previous tail of the list. |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
294 |
uint8_t *previousTail = &m_data->m_data[m_tail]; |
857
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
295 |
Append16 (m_used, previousTail); |
853
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
296 |
// update the tail of the list to the new node. |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
297 |
m_tail = m_used; |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
298 |
} |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
299 |
NS_ASSERT (m_tail != 0xffff); |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
300 |
NS_ASSERT (m_head != 0xffff); |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
301 |
m_used += written; |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
302 |
m_data->m_dirtyEnd = m_used; |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
303 |
} |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
304 |
|
863
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
305 |
|
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
306 |
void |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
307 |
PacketHistory::UpdateHead (uint16_t written) |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
308 |
{ |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
309 |
if (m_head == 0xffff) |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
310 |
{ |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
311 |
NS_ASSERT (m_tail == 0xffff); |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
312 |
m_head = m_used; |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
313 |
m_tail = m_used; |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
314 |
} |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
315 |
else |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
316 |
{ |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
317 |
NS_ASSERT (m_head != 0xffff); |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
318 |
// overwrite the prev field of the previous head of the list. |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
319 |
uint8_t *previousHead = &m_data->m_data[m_head + 2]; |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
320 |
Append16 (m_used, previousHead); |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
321 |
// update the head of list to the new node. |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
322 |
m_head = m_used; |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
323 |
} |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
324 |
NS_ASSERT (m_tail != 0xffff); |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
325 |
NS_ASSERT (m_head != 0xffff); |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
326 |
m_used += written; |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
327 |
m_data->m_dirtyEnd = m_used; |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
328 |
} |
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
329 |
|
859
aa89ae478c3a
remove Update call from within AddSmall and AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
858
diff
changeset
|
330 |
uint16_t |
862
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
331 |
PacketHistory::AddSmall (const struct PacketHistory::SmallItem *item) |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
332 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
333 |
NS_ASSERT (m_data != 0); |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
334 |
append: |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
335 |
uint8_t *start = &m_data->m_data[m_used]; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
336 |
uint8_t *end = &m_data->m_data[m_data->m_size]; |
873
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
337 |
if (end - start >= 8 && |
858
280636166143
remove useless CanAdd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
857
diff
changeset
|
338 |
(m_head == 0xffff || |
280636166143
remove useless CanAdd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
857
diff
changeset
|
339 |
m_data->m_count == 1 || |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
340 |
m_used == m_data->m_dirtyEnd)) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
341 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
342 |
uint8_t *buffer = start; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
343 |
|
862
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
344 |
Append16 (item->next, buffer); |
857
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
345 |
buffer += 2; |
862
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
346 |
Append16 (item->prev, buffer); |
857
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
347 |
buffer += 2; |
862
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
348 |
if (TryToAppendFast (item->typeUid, &buffer, end) && |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
349 |
TryToAppendFast (item->size, &buffer, end) && |
873
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
350 |
TryToAppend16 (item->chunkUid, &buffer, end)) |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
351 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
352 |
uintptr_t written = buffer - start; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
353 |
NS_ASSERT (written <= 0xffff); |
859
aa89ae478c3a
remove Update call from within AddSmall and AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
858
diff
changeset
|
354 |
return written; |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
355 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
356 |
} |
862
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
357 |
uint32_t n = GetUleb128Size (item->typeUid); |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
358 |
n += GetUleb128Size (item->size); |
873
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
359 |
n += 2; |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
360 |
n += 2 + 2; |
870
e335d37541c3
try alternative implementation of AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
869
diff
changeset
|
361 |
Reserve (n); |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
362 |
goto append; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
363 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
364 |
|
859
aa89ae478c3a
remove Update call from within AddSmall and AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
858
diff
changeset
|
365 |
uint16_t |
867
e98cde9aae4a
remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
866
diff
changeset
|
366 |
PacketHistory::AddBig (uint32_t next, uint32_t prev, |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
367 |
const PacketHistory::SmallItem *item, |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
368 |
const PacketHistory::ExtraItem *extraItem) |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
369 |
{ |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
370 |
NS_ASSERT (m_data != 0); |
852
a1a3c9bdb7f4
fix a few bugs in ::RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
851
diff
changeset
|
371 |
uint32_t typeUid = ((item->typeUid & 0x1) == 0x1)?item->typeUid:item->typeUid+1; |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
372 |
append: |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
373 |
uint8_t *start = &m_data->m_data[m_used]; |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
374 |
uint8_t *end = &m_data->m_data[m_data->m_size]; |
873
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
375 |
if (end - start >= 14 && |
858
280636166143
remove useless CanAdd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
857
diff
changeset
|
376 |
(m_head == 0xffff || |
280636166143
remove useless CanAdd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
857
diff
changeset
|
377 |
m_data->m_count == 1 || |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
378 |
m_used == m_data->m_dirtyEnd)) |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
379 |
{ |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
380 |
uint8_t *buffer = start; |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
381 |
|
857
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
382 |
Append16 (next, buffer); |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
383 |
buffer += 2; |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
384 |
Append16 (prev, buffer); |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
385 |
buffer += 2; |
852
a1a3c9bdb7f4
fix a few bugs in ::RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
851
diff
changeset
|
386 |
if (TryToAppend (typeUid, &buffer, end) && |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
387 |
TryToAppend (item->size, &buffer, end) && |
873
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
388 |
TryToAppend16 (item->chunkUid, &buffer, end) && |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
389 |
TryToAppend (extraItem->fragmentStart, &buffer, end) && |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
390 |
TryToAppend (extraItem->fragmentEnd, &buffer, end) && |
873
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
391 |
TryToAppend32 (extraItem->packetUid, &buffer, end)) |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
392 |
{ |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
393 |
uintptr_t written = buffer - start; |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
394 |
NS_ASSERT (written <= 0xffff); |
859
aa89ae478c3a
remove Update call from within AddSmall and AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
858
diff
changeset
|
395 |
return written; |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
396 |
} |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
397 |
} |
860
3095d7275585
add counters
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
859
diff
changeset
|
398 |
|
852
a1a3c9bdb7f4
fix a few bugs in ::RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
851
diff
changeset
|
399 |
uint32_t n = GetUleb128Size (typeUid); |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
400 |
n += GetUleb128Size (item->size); |
873
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
401 |
n += 2; |
849
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
402 |
n += GetUleb128Size (extraItem->fragmentStart); |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
403 |
n += GetUleb128Size (extraItem->fragmentEnd); |
873
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
404 |
n += 4; |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
405 |
n += 2 + 2; |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
406 |
ReserveCopy (n); |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
407 |
goto append; |
854
cbe6790bf9fa
simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
853
diff
changeset
|
408 |
} |
cbe6790bf9fa
simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
853
diff
changeset
|
409 |
|
cbe6790bf9fa
simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
853
diff
changeset
|
410 |
void |
867
e98cde9aae4a
remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
866
diff
changeset
|
411 |
PacketHistory::ReplaceTail (PacketHistory::SmallItem *item, |
e98cde9aae4a
remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
866
diff
changeset
|
412 |
PacketHistory::ExtraItem *extraItem, |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
413 |
uint32_t available) |
854
cbe6790bf9fa
simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
853
diff
changeset
|
414 |
{ |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
415 |
NS_ASSERT (m_data != 0); |
873
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
416 |
if (available >= 14 && |
856
007981962639
make all tests pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
855
diff
changeset
|
417 |
m_data->m_count == 1) |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
418 |
{ |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
419 |
uint8_t *buffer = &m_data->m_data[m_tail]; |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
420 |
uint8_t *end = buffer + available; |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
421 |
|
857
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
422 |
Append16 (item->next, buffer); |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
423 |
buffer += 2; |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
424 |
Append16 (item->prev, buffer); |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
425 |
buffer += 2; |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
426 |
if (TryToAppend (item->typeUid, &buffer, end) && |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
427 |
TryToAppend (item->size, &buffer, end) && |
873
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
428 |
TryToAppend16 (item->chunkUid, &buffer, end) && |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
429 |
TryToAppend (extraItem->fragmentStart, &buffer, end) && |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
430 |
TryToAppend (extraItem->fragmentEnd, &buffer, end) && |
873
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
431 |
TryToAppend32 (extraItem->packetUid, &buffer, end)) |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
432 |
{ |
856
007981962639
make all tests pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
855
diff
changeset
|
433 |
m_used = buffer - &m_data->m_data[0]; |
007981962639
make all tests pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
855
diff
changeset
|
434 |
m_data->m_dirtyEnd = m_used; |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
435 |
return; |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
436 |
} |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
437 |
} |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
438 |
|
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
439 |
// create a copy of the packet. |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
440 |
PacketHistory h (m_packetUid, 0); |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
441 |
uint16_t current = m_head; |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
442 |
while (current != 0xffff && current != m_tail) |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
443 |
{ |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
444 |
struct PacketHistory::SmallItem tmpItem; |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
445 |
PacketHistory::ExtraItem tmpExtraItem; |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
446 |
ReadItems (current, &tmpItem, &tmpExtraItem); |
867
e98cde9aae4a
remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
866
diff
changeset
|
447 |
uint16_t written = h.AddBig (0xffff, h.m_tail, |
e98cde9aae4a
remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
866
diff
changeset
|
448 |
&tmpItem, &tmpExtraItem); |
863
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
449 |
h.UpdateTail (written); |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
450 |
} |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
451 |
// append new tail. |
867
e98cde9aae4a
remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
866
diff
changeset
|
452 |
uint16_t written = h.AddBig (0xffff, h.m_tail, item, extraItem); |
863
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
453 |
h.UpdateTail (written); |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
454 |
|
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
455 |
*this = h; |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
456 |
} |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
457 |
|
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
458 |
uint32_t |
847
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
459 |
PacketHistory::ReadItems (uint16_t current, |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
460 |
struct PacketHistory::SmallItem *item, |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
461 |
struct PacketHistory::ExtraItem *extraItem) const |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
462 |
{ |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
463 |
const uint8_t *buffer = &m_data->m_data[current]; |
865
7356a5847860
ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
864
diff
changeset
|
464 |
item->next = buffer[0]; |
7356a5847860
ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
864
diff
changeset
|
465 |
item->next |= (buffer[1]) << 8; |
7356a5847860
ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
864
diff
changeset
|
466 |
item->prev = buffer[2]; |
7356a5847860
ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
864
diff
changeset
|
467 |
item->prev |= (buffer[3]) << 8; |
7356a5847860
ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
864
diff
changeset
|
468 |
buffer += 4; |
7356a5847860
ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
864
diff
changeset
|
469 |
item->typeUid = ReadUleb128 (&buffer); |
7356a5847860
ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
864
diff
changeset
|
470 |
item->size = ReadUleb128 (&buffer); |
873
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
471 |
item->chunkUid = buffer[0]; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
472 |
item->chunkUid |= (buffer[1]) << 8; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
473 |
buffer += 2; |
865
7356a5847860
ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
864
diff
changeset
|
474 |
|
847
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
475 |
bool isExtra = (item->typeUid & 0x1) == 0x1; |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
476 |
if (isExtra) |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
477 |
{ |
865
7356a5847860
ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
864
diff
changeset
|
478 |
extraItem->fragmentStart = ReadUleb128 (&buffer); |
7356a5847860
ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
864
diff
changeset
|
479 |
extraItem->fragmentEnd = ReadUleb128 (&buffer); |
873
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
480 |
extraItem->packetUid = buffer[0]; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
481 |
extraItem->packetUid |= buffer[1] << 8; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
482 |
extraItem->packetUid |= buffer[2] << 16; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
483 |
extraItem->packetUid |= buffer[3] << 24; |
2aab1eb32b12
store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
872
diff
changeset
|
484 |
buffer += 4; |
847
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
485 |
} |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
486 |
else |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
487 |
{ |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
488 |
extraItem->fragmentStart = 0; |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
489 |
extraItem->fragmentEnd = item->size; |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
490 |
extraItem->packetUid = m_packetUid; |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
491 |
} |
848
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
492 |
NS_ASSERT (buffer <= &m_data->m_data[m_data->m_size]); |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
493 |
return buffer - &m_data->m_data[current]; |
847
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
494 |
} |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
495 |
|
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
496 |
struct PacketHistory::Data * |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
497 |
PacketHistory::Create (uint32_t size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
498 |
{ |
833
224bfad58818
a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
830
diff
changeset
|
499 |
NS_DEBUG ("create size="<<size<<", max="<<m_maxSize); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
500 |
if (size > m_maxSize) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
501 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
502 |
m_maxSize = size; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
503 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
504 |
while (!m_freeList.empty ()) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
505 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
506 |
struct PacketHistory::Data *data = m_freeList.back (); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
507 |
m_freeList.pop_back (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
508 |
if (data->m_size >= size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
509 |
{ |
833
224bfad58818
a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
830
diff
changeset
|
510 |
NS_DEBUG ("create found size="<<data->m_size); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
511 |
data->m_count = 1; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
512 |
return data; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
513 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
514 |
PacketHistory::Deallocate (data); |
833
224bfad58818
a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
830
diff
changeset
|
515 |
NS_DEBUG ("create dealloc size="<<data->m_size); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
516 |
} |
833
224bfad58818
a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
830
diff
changeset
|
517 |
NS_DEBUG ("create alloc size="<<m_maxSize); |
224bfad58818
a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
830
diff
changeset
|
518 |
return PacketHistory::Allocate (m_maxSize); |
789
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 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
521 |
void |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
522 |
PacketHistory::Recycle (struct PacketHistory::Data *data) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
523 |
{ |
833
224bfad58818
a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
830
diff
changeset
|
524 |
NS_DEBUG ("recycle size="<<data->m_size<<", list="<<m_freeList.size ()); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
525 |
NS_ASSERT (data->m_count == 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
526 |
if (m_freeList.size () > 1000 || |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
527 |
data->m_size < m_maxSize) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
528 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
529 |
PacketHistory::Deallocate (data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
530 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
531 |
else |
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 |
m_freeList.push_back (data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
534 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
535 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
536 |
|
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
537 |
struct PacketHistory::Data * |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
538 |
PacketHistory::Allocate (uint32_t n) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
539 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
540 |
uint32_t size = sizeof (struct Data); |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
541 |
if (n <= 10) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
542 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
543 |
n = 10; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
544 |
} |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
545 |
size += n - 10; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
546 |
uint8_t *buf = new uint8_t [size]; |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
547 |
struct PacketHistory::Data *data = (struct PacketHistory::Data *)buf; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
548 |
data->m_size = n; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
549 |
data->m_count = 1; |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
550 |
data->m_dirtyEnd = 0; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
551 |
return data; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
552 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
553 |
void |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
554 |
PacketHistory::Deallocate (struct PacketHistory::Data *data) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
555 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
556 |
uint8_t *buf = (uint8_t *)data; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
557 |
delete [] buf; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
558 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
559 |
|
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
560 |
|
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
561 |
PacketHistory |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
562 |
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
|
563 |
{ |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
564 |
PacketHistory fragment = *this; |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
565 |
fragment.RemoveAtStart (start); |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
566 |
fragment.RemoveAtEnd (end); |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
567 |
return fragment; |
789
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 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
570 |
void |
862
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
571 |
PacketHistory::DoAddHeader (uint32_t uid, uint32_t size) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
572 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
573 |
if (!m_enable) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
574 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
575 |
return; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
576 |
} |
862
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
577 |
struct PacketHistory::SmallItem item; |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
578 |
item.next = m_head; |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
579 |
item.prev = 0xffff; |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
580 |
item.typeUid = uid; |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
581 |
item.size = size; |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
582 |
item.chunkUid = m_chunkUid; |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
583 |
m_chunkUid++; |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
584 |
uint16_t written = AddSmall (&item); |
863
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
585 |
UpdateHead (written); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
586 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
587 |
void |
862
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
588 |
PacketHistory::DoRemoveHeader (uint32_t uid, uint32_t size) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
589 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
590 |
if (!m_enable) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
591 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
592 |
return; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
593 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
594 |
struct PacketHistory::SmallItem item; |
866
7880ebff9969
remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
865
diff
changeset
|
595 |
struct PacketHistory::ExtraItem extraItem; |
7880ebff9969
remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
865
diff
changeset
|
596 |
ReadItems (m_head, &item, &extraItem); |
843
b6670a38f2e8
the mask to filter out the low bit is 0xfe, not 0xfd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
842
diff
changeset
|
597 |
if ((item.typeUid & 0xfffffffe) != uid || |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
598 |
item.size != size) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
599 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
600 |
NS_FATAL_ERROR ("Removing unexpected header."); |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
601 |
} |
866
7880ebff9969
remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
865
diff
changeset
|
602 |
else if (item.typeUid != uid && |
7880ebff9969
remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
865
diff
changeset
|
603 |
(extraItem.fragmentStart != 0 || |
7880ebff9969
remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
865
diff
changeset
|
604 |
extraItem.fragmentEnd != size)) |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
605 |
{ |
866
7880ebff9969
remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
865
diff
changeset
|
606 |
NS_FATAL_ERROR ("Removing incomplete header."); |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
607 |
} |
840
e473844a60c2
rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
839
diff
changeset
|
608 |
m_head = item.next; |
e473844a60c2
rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
839
diff
changeset
|
609 |
if (m_head > m_tail) |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
610 |
{ |
840
e473844a60c2
rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
839
diff
changeset
|
611 |
m_used = m_head; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
612 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
613 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
614 |
void |
862
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
615 |
PacketHistory::DoAddTrailer (uint32_t uid, uint32_t size) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
616 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
617 |
if (!m_enable) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
618 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
619 |
return; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
620 |
} |
862
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
621 |
struct PacketHistory::SmallItem item; |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
622 |
item.next = 0xffff; |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
623 |
item.prev = m_tail; |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
624 |
item.typeUid = uid; |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
625 |
item.size = size; |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
626 |
item.chunkUid = m_chunkUid; |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
627 |
m_chunkUid++; |
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
628 |
uint16_t written = AddSmall (&item); |
863
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
629 |
UpdateTail (written); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
630 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
631 |
void |
862
4add4fe2020f
simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
861
diff
changeset
|
632 |
PacketHistory::DoRemoveTrailer (uint32_t uid, uint32_t size) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
633 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
634 |
if (!m_enable) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
635 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
636 |
return; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
637 |
} |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
638 |
struct PacketHistory::SmallItem item; |
866
7880ebff9969
remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
865
diff
changeset
|
639 |
struct PacketHistory::ExtraItem extraItem; |
7880ebff9969
remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
865
diff
changeset
|
640 |
ReadItems (m_tail, &item, &extraItem); |
843
b6670a38f2e8
the mask to filter out the low bit is 0xfe, not 0xfd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
842
diff
changeset
|
641 |
if ((item.typeUid & 0xfffffffe) != uid || |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
642 |
item.size != size) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
643 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
644 |
NS_FATAL_ERROR ("Removing unexpected trailer."); |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
645 |
} |
866
7880ebff9969
remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
865
diff
changeset
|
646 |
else if (item.typeUid != uid && |
7880ebff9969
remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
865
diff
changeset
|
647 |
(extraItem.fragmentStart != 0 || |
7880ebff9969
remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
865
diff
changeset
|
648 |
extraItem.fragmentEnd != size)) |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
649 |
{ |
866
7880ebff9969
remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
865
diff
changeset
|
650 |
NS_FATAL_ERROR ("Removing incomplete trailer."); |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
651 |
} |
840
e473844a60c2
rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
839
diff
changeset
|
652 |
m_tail = item.prev; |
e473844a60c2
rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
839
diff
changeset
|
653 |
if (m_tail > m_head) |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
654 |
{ |
840
e473844a60c2
rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
839
diff
changeset
|
655 |
m_used = m_tail; |
789
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 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
658 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
659 |
PacketHistory::AddAtEnd (PacketHistory const&o) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
660 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
661 |
if (!m_enable) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
662 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
663 |
return; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
664 |
} |
872
cd19d2692521
unconditionally set m_data
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
870
diff
changeset
|
665 |
if (m_tail == 0xffff) |
853
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
666 |
{ |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
667 |
*this = o; |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
668 |
return; |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
669 |
} |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
670 |
NS_ASSERT (m_head != 0xffff && m_tail != 0xffff); |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
671 |
|
857
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
672 |
uint16_t lastTail; |
6f7593400c82
a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
856
diff
changeset
|
673 |
lastTail = m_tail; |
853
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
674 |
struct PacketHistory::SmallItem lastItem; |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
675 |
PacketHistory::ExtraItem lastExtraItem; |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
676 |
uint32_t lastTailSize = ReadItems (m_tail, &lastItem, &lastExtraItem); |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
677 |
if (m_tail + lastTailSize == m_used && |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
678 |
m_used == m_data->m_dirtyEnd) |
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
679 |
{ |
856
007981962639
make all tests pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
855
diff
changeset
|
680 |
lastTailSize = m_data->m_size - m_tail; |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
681 |
} |
853
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
682 |
|
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
683 |
uint16_t current = o.m_head; |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
684 |
while (current != 0xffff) |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
685 |
{ |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
686 |
struct PacketHistory::SmallItem item; |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
687 |
PacketHistory::ExtraItem extraItem; |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
688 |
o.ReadItems (current, &item, &extraItem); |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
689 |
if (extraItem.packetUid == lastExtraItem.packetUid && |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
690 |
item.typeUid == lastItem.typeUid && |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
691 |
item.chunkUid == lastItem.chunkUid && |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
692 |
item.size == lastItem.size && |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
693 |
extraItem.fragmentStart == lastExtraItem.fragmentEnd) |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
694 |
{ |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
695 |
// replace previous tail. |
853
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
696 |
lastExtraItem.fragmentEnd = extraItem.fragmentEnd; |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
697 |
NS_ASSERT (m_tail == lastTail); |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
698 |
ReplaceTail (&lastItem, &lastExtraItem, lastTailSize); |
853
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
699 |
} |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
700 |
else |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
701 |
{ |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
702 |
// append the extra items. |
867
e98cde9aae4a
remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
866
diff
changeset
|
703 |
uint16_t written = AddBig (0xffff, m_tail, &item, &extraItem); |
863
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
704 |
UpdateTail (written); |
853
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
705 |
} |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
706 |
if (current == o.m_tail) |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
707 |
{ |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
708 |
break; |
2477fe325610
share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
852
diff
changeset
|
709 |
} |
856
007981962639
make all tests pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
855
diff
changeset
|
710 |
current = item.next; |
855
6b27e6180fcb
implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
854
diff
changeset
|
711 |
} |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
712 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
713 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
714 |
PacketHistory::AddPaddingAtEnd (uint32_t end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
715 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
716 |
if (!m_enable) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
717 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
718 |
return; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
719 |
} |
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 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
722 |
PacketHistory::RemoveAtStart (uint32_t start) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
723 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
724 |
if (!m_enable) |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
725 |
{ |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
726 |
return; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
727 |
} |
872
cd19d2692521
unconditionally set m_data
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
870
diff
changeset
|
728 |
NS_ASSERT (m_data != 0); |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
729 |
uint32_t leftToRemove = start; |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
730 |
uint16_t current = m_head; |
847
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
731 |
while (current != 0xffff && leftToRemove > 0) |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
732 |
{ |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
733 |
struct PacketHistory::SmallItem item; |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
734 |
PacketHistory::ExtraItem extraItem; |
847
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
735 |
ReadItems (current, &item, &extraItem); |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
736 |
uint32_t itemRealSize = extraItem.fragmentEnd - extraItem.fragmentStart; |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
737 |
if (itemRealSize <= leftToRemove) |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
738 |
{ |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
739 |
// remove from list. |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
740 |
m_head = item.next; |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
741 |
leftToRemove -= itemRealSize; |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
742 |
} |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
743 |
else |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
744 |
{ |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
745 |
// fragment the list item. |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
746 |
PacketHistory fragment (m_packetUid, 0); |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
747 |
extraItem.fragmentStart += leftToRemove; |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
748 |
leftToRemove = 0; |
867
e98cde9aae4a
remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
866
diff
changeset
|
749 |
uint16_t written = fragment.AddBig (0xffff, fragment.m_tail, |
e98cde9aae4a
remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
866
diff
changeset
|
750 |
&item, &extraItem); |
863
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
751 |
fragment.UpdateTail (written); |
847
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
752 |
current = item.next; |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
753 |
while (current != 0xffff) |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
754 |
{ |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
755 |
ReadItems (current, &item, &extraItem); |
867
e98cde9aae4a
remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
866
diff
changeset
|
756 |
written = fragment.AddBig (0xffff, fragment.m_tail, |
e98cde9aae4a
remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
866
diff
changeset
|
757 |
&item, &extraItem); |
863
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
758 |
fragment.UpdateTail (written); |
849
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
759 |
if (current == m_tail) |
847
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
760 |
{ |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
761 |
break; |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
762 |
} |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
763 |
current = item.next; |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
764 |
} |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
765 |
*this = fragment; |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
766 |
} |
847
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
767 |
NS_ASSERT (item.size >= extraItem.fragmentEnd - extraItem.fragmentStart && |
319d107f2435
rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
846
diff
changeset
|
768 |
extraItem.fragmentStart <= extraItem.fragmentEnd); |
849
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
769 |
if (current == m_tail) |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
770 |
{ |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
771 |
break; |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
772 |
} |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
773 |
current = item.next; |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
774 |
} |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
775 |
NS_ASSERT (leftToRemove == 0); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
776 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
777 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
778 |
PacketHistory::RemoveAtEnd (uint32_t end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
779 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
780 |
if (!m_enable) |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
781 |
{ |
835
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
782 |
return; |
ea5ca71d6c0c
a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
834
diff
changeset
|
783 |
} |
872
cd19d2692521
unconditionally set m_data
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
870
diff
changeset
|
784 |
NS_ASSERT (m_data != 0); |
849
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
785 |
|
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
786 |
uint32_t leftToRemove = end; |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
787 |
uint16_t current = m_tail; |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
788 |
while (current != 0xffff && leftToRemove > 0) |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
789 |
{ |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
790 |
struct PacketHistory::SmallItem item; |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
791 |
PacketHistory::ExtraItem extraItem; |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
792 |
ReadItems (current, &item, &extraItem); |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
793 |
uint32_t itemRealSize = extraItem.fragmentEnd - extraItem.fragmentStart; |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
794 |
if (itemRealSize <= leftToRemove) |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
795 |
{ |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
796 |
// remove from list. |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
797 |
m_tail = item.prev; |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
798 |
leftToRemove -= itemRealSize; |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
799 |
} |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
800 |
else |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
801 |
{ |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
802 |
// fragment the list item. |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
803 |
PacketHistory fragment (m_packetUid, 0); |
851
ce4de5a9dcd0
remove data from end of trailer, not start of header
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
850
diff
changeset
|
804 |
NS_ASSERT (extraItem.fragmentEnd > leftToRemove); |
ce4de5a9dcd0
remove data from end of trailer, not start of header
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
850
diff
changeset
|
805 |
extraItem.fragmentEnd -= leftToRemove; |
849
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
806 |
leftToRemove = 0; |
867
e98cde9aae4a
remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
866
diff
changeset
|
807 |
uint16_t written = fragment.AddBig (fragment.m_head, 0xffff, |
e98cde9aae4a
remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
866
diff
changeset
|
808 |
&item, &extraItem); |
863
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
809 |
fragment.UpdateHead (written); |
849
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
810 |
current = item.prev; |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
811 |
while (current != 0xffff) |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
812 |
{ |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
813 |
ReadItems (current, &item, &extraItem); |
867
e98cde9aae4a
remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
866
diff
changeset
|
814 |
written = fragment.AddBig (fragment.m_head, 0xffff, |
e98cde9aae4a
remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
866
diff
changeset
|
815 |
&item, &extraItem); |
863
768945a45089
Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
862
diff
changeset
|
816 |
fragment.UpdateHead (written); |
849
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
817 |
if (current == m_head) |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
818 |
{ |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
819 |
break; |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
820 |
} |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
821 |
current = item.prev; |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
822 |
} |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
823 |
*this = fragment; |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
824 |
} |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
825 |
NS_ASSERT (item.size >= extraItem.fragmentEnd - extraItem.fragmentStart && |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
826 |
extraItem.fragmentStart <= extraItem.fragmentEnd); |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
827 |
if (current == m_head) |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
828 |
{ |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
829 |
break; |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
830 |
} |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
831 |
current = item.prev; |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
832 |
} |
5bc5818b09f0
fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
848
diff
changeset
|
833 |
NS_ASSERT (leftToRemove == 0); |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
834 |
} |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
835 |
|
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
836 |
void |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
837 |
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
|
838 |
{ |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
839 |
Print (os, buffer, PacketPrinter::GetDefault ()); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
840 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
841 |
|
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
842 |
uint32_t |
848
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
843 |
PacketHistory::DoPrint (struct PacketHistory::SmallItem *item, uint32_t current, |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
844 |
Buffer data, uint32_t offset, const PacketPrinter &printer, |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
845 |
std::ostream &os) const |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
846 |
{ |
848
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
847 |
PacketHistory::ExtraItem extraItem; |
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
848 |
ReadItems (current, item, &extraItem); |
843
b6670a38f2e8
the mask to filter out the low bit is 0xfe, not 0xfd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
842
diff
changeset
|
849 |
uint32_t uid = item->typeUid & 0xfffffffe; |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
850 |
if (uid == 0) |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
851 |
{ |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
852 |
// payload. |
848
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
853 |
printer.PrintPayload (os, extraItem.packetUid, item->size, |
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
854 |
extraItem.fragmentStart, |
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
855 |
extraItem.fragmentEnd); |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
856 |
} |
848
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
857 |
else if (extraItem.fragmentStart != 0 || |
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
858 |
extraItem.fragmentEnd != item->size) |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
859 |
{ |
848
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
860 |
printer.PrintChunkFragment (uid, os, extraItem.packetUid, item->size, |
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
861 |
extraItem.fragmentStart, extraItem.fragmentEnd); |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
862 |
} |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
863 |
else if (PacketPrinter::IsHeader (uid)) |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
864 |
{ |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
865 |
ns3::Buffer::Iterator j = data.Begin (); |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
866 |
j.Next (offset); |
848
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
867 |
printer.PrintChunk (uid, j, os, extraItem.packetUid, item->size); |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
868 |
} |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
869 |
else if (PacketPrinter::IsTrailer (uid)) |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
870 |
{ |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
871 |
ns3::Buffer::Iterator j = data.End (); |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
872 |
j.Prev (data.GetSize () - (offset + item->size)); |
848
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
873 |
printer.PrintChunk (uid, j, os, extraItem.packetUid, item->size); |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
874 |
} |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
875 |
else |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
876 |
{ |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
877 |
NS_ASSERT (false); |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
878 |
} |
848
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
879 |
return extraItem.fragmentEnd - extraItem.fragmentStart; |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
880 |
} |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
881 |
|
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
882 |
uint32_t |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
883 |
PacketHistory::GetTotalSize (void) const |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
884 |
{ |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
885 |
uint32_t totalSize = 0; |
840
e473844a60c2
rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
839
diff
changeset
|
886 |
uint16_t current = m_head; |
841
83a5df185d90
fix the list iteration logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
840
diff
changeset
|
887 |
uint16_t tail = m_tail; |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
888 |
while (current != 0xffff) |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
889 |
{ |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
890 |
struct PacketHistory::SmallItem item; |
850
470258d962cc
simplify GetTotalSize
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
849
diff
changeset
|
891 |
PacketHistory::ExtraItem extraItem; |
470258d962cc
simplify GetTotalSize
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
849
diff
changeset
|
892 |
ReadItems (current, &item, &extraItem); |
470258d962cc
simplify GetTotalSize
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
849
diff
changeset
|
893 |
totalSize += extraItem.fragmentEnd - extraItem.fragmentStart; |
841
83a5df185d90
fix the list iteration logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
840
diff
changeset
|
894 |
if (current == tail) |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
895 |
{ |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
896 |
break; |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
897 |
} |
841
83a5df185d90
fix the list iteration logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
840
diff
changeset
|
898 |
current = item.next; |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
899 |
} |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
900 |
return totalSize; |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
901 |
} |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
902 |
|
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
903 |
void |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
904 |
PacketHistory::Print (std::ostream &os, Buffer data, const PacketPrinter &printer) const |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
905 |
{ |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
906 |
if (!m_enable) |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
907 |
{ |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
908 |
return; |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
909 |
} |
872
cd19d2692521
unconditionally set m_data
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
870
diff
changeset
|
910 |
NS_ASSERT (m_data != 0); |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
911 |
NS_ASSERT (GetTotalSize () == data.GetSize ()); |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
912 |
if (printer.m_forward) |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
913 |
{ |
840
e473844a60c2
rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
839
diff
changeset
|
914 |
uint32_t tail = m_tail; |
e473844a60c2
rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
839
diff
changeset
|
915 |
uint32_t head = m_head; |
e473844a60c2
rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
839
diff
changeset
|
916 |
uint32_t current = head; |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
917 |
uint32_t offset = 0; |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
918 |
while (current != 0xffff) |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
919 |
{ |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
920 |
struct PacketHistory::SmallItem item; |
848
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
921 |
uint32_t realSize = DoPrint (&item, current, data, offset, printer, os); |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
922 |
offset += realSize; |
840
e473844a60c2
rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
839
diff
changeset
|
923 |
if (current == tail) |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
924 |
{ |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
925 |
break; |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
926 |
} |
841
83a5df185d90
fix the list iteration logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
840
diff
changeset
|
927 |
current = item.next; |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
928 |
} |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
929 |
} |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
930 |
else |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
931 |
{ |
840
e473844a60c2
rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
839
diff
changeset
|
932 |
uint32_t head = m_head; |
e473844a60c2
rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
839
diff
changeset
|
933 |
uint32_t tail = m_tail; |
e473844a60c2
rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
839
diff
changeset
|
934 |
uint32_t current = head; |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
935 |
uint32_t offset = 0; |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
936 |
while (current != 0xffff) |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
937 |
{ |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
938 |
struct PacketHistory::SmallItem item; |
848
10e989a2ed6e
fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
847
diff
changeset
|
939 |
uint32_t realSize = DoPrint (&item, current, data, offset, printer, os); |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
940 |
offset -= realSize; |
840
e473844a60c2
rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
839
diff
changeset
|
941 |
if (current == tail) |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
942 |
{ |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
943 |
break; |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
944 |
} |
841
83a5df185d90
fix the list iteration logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
840
diff
changeset
|
945 |
current = item.prev; |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
946 |
} |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
947 |
} |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
948 |
} |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
949 |
|
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
950 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
951 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
952 |
}; // namespace ns3 |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
953 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
954 |
#include <stdarg.h> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
955 |
#include <iostream> |
795
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
956 |
#include <sstream> |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
957 |
#include "ns3/test.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
958 |
#include "header.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
959 |
#include "trailer.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
960 |
#include "packet.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
961 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
962 |
namespace ns3 { |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
963 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
964 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
965 |
class HistoryHeader : public Header |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
966 |
{ |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
967 |
public: |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
968 |
HistoryHeader (); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
969 |
bool IsOk (void) const; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
970 |
private: |
795
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
971 |
virtual std::string DoGetName (void) const; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
972 |
virtual void PrintTo (std::ostream &os) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
973 |
virtual uint32_t GetSerializedSize (void) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
974 |
virtual void SerializeTo (Buffer::Iterator start) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
975 |
virtual uint32_t DeserializeFrom (Buffer::Iterator start); |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
976 |
bool m_ok; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
977 |
}; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
978 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
979 |
template <int N> |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
980 |
HistoryHeader<N>::HistoryHeader () |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
981 |
: m_ok (false) |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
982 |
{} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
983 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
984 |
template <int N> |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
985 |
bool |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
986 |
HistoryHeader<N>::IsOk (void) const |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
987 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
988 |
return m_ok; |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
989 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
990 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
991 |
template <int N> |
795
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
992 |
std::string |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
993 |
HistoryHeader<N>::DoGetName (void) const |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
994 |
{ |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
995 |
std::ostringstream oss; |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
996 |
oss << N; |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
997 |
return oss.str (); |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
998 |
} |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
999 |
|
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
1000 |
template <int N> |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1001 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1002 |
HistoryHeader<N>::PrintTo (std::ostream &os) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1003 |
{ |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1004 |
NS_ASSERT (false); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1005 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1006 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1007 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1008 |
HistoryHeader<N>::GetSerializedSize (void) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1009 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1010 |
return N; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1011 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1012 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1013 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1014 |
HistoryHeader<N>::SerializeTo (Buffer::Iterator start) const |
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 |
start.WriteU8 (N, N); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1017 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1018 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1019 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1020 |
HistoryHeader<N>::DeserializeFrom (Buffer::Iterator start) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1021 |
{ |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1022 |
m_ok = true; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1023 |
for (int i = 0; i < N; i++) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1024 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1025 |
if (start.ReadU8 () != N) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1026 |
{ |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1027 |
m_ok = false; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1028 |
} |
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 |
return N; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1031 |
} |
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 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1034 |
class HistoryTrailer : public Trailer |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1035 |
{ |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1036 |
public: |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1037 |
HistoryTrailer (); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1038 |
bool IsOk (void) const; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1039 |
private: |
795
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
1040 |
virtual std::string DoGetName (void) const; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1041 |
virtual void PrintTo (std::ostream &os) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1042 |
virtual uint32_t GetSerializedSize (void) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1043 |
virtual void SerializeTo (Buffer::Iterator start) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1044 |
virtual uint32_t DeserializeFrom (Buffer::Iterator start); |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1045 |
bool m_ok; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1046 |
}; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1047 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1048 |
template <int N> |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1049 |
HistoryTrailer<N>::HistoryTrailer () |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1050 |
: m_ok (false) |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1051 |
{} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1052 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1053 |
template <int N> |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1054 |
bool |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1055 |
HistoryTrailer<N>::IsOk (void) const |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1056 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1057 |
return m_ok; |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1058 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1059 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1060 |
template <int N> |
795
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
1061 |
std::string |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
1062 |
HistoryTrailer<N>::DoGetName (void) const |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
1063 |
{ |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
1064 |
std::ostringstream oss; |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
1065 |
oss << N; |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
1066 |
return oss.str (); |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
1067 |
} |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
1068 |
template <int N> |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1069 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1070 |
HistoryTrailer<N>::PrintTo (std::ostream &os) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1071 |
{ |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1072 |
NS_ASSERT (false); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1073 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1074 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1075 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1076 |
HistoryTrailer<N>::GetSerializedSize (void) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1077 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1078 |
return N; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1079 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1080 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1081 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1082 |
HistoryTrailer<N>::SerializeTo (Buffer::Iterator start) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1083 |
{ |
817
cb803cd166a3
new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
814
diff
changeset
|
1084 |
start.Prev (N); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1085 |
start.WriteU8 (N, N); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1086 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1087 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1088 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1089 |
HistoryTrailer<N>::DeserializeFrom (Buffer::Iterator start) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1090 |
{ |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1091 |
m_ok = true; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1092 |
start.Prev (N); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1093 |
for (int i = 0; i < N; i++) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1094 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1095 |
if (start.ReadU8 () != N) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1096 |
{ |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1097 |
m_ok = false; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1098 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1099 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1100 |
return N; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1101 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1102 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1103 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1104 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1105 |
class PacketHistoryTest : public Test { |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1106 |
public: |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1107 |
PacketHistoryTest (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1108 |
virtual ~PacketHistoryTest (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1109 |
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
|
1110 |
virtual bool RunTests (void); |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1111 |
private: |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1112 |
template <int N> |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1113 |
void PrintHeader (std::ostream &os, uint32_t packetUid, uint32_t size, const HistoryHeader<N> *header); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1114 |
template <int N> |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1115 |
void PrintTrailer (std::ostream &os, uint32_t packetUid, uint32_t size, const HistoryTrailer<N> *trailer); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1116 |
void PrintFragment (std::ostream &os,uint32_t packetUid, |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1117 |
uint32_t size,std::string & name, |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1118 |
struct PacketPrinter::FragmentInformation info); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1119 |
void PrintDefault (std::ostream& os,uint32_t packetUid, |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1120 |
uint32_t size,std::string& name, |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1121 |
struct PacketPrinter::FragmentInformation info); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1122 |
void PrintPayload (std::ostream &os,uint32_t packetUid, |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1123 |
uint32_t size, |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1124 |
struct PacketPrinter::FragmentInformation info); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1125 |
template <int N> |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1126 |
void RegisterHeader (void); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1127 |
template <int N> |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1128 |
void RegisterTrailer (void); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1129 |
void CleanupPrints (void); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1130 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1131 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1132 |
bool m_headerError; |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1133 |
bool m_trailerError; |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1134 |
std::list<int> m_prints; |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1135 |
PacketPrinter m_printer; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1136 |
}; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1137 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1138 |
PacketHistoryTest::PacketHistoryTest () |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1139 |
: Test ("PacketHistory") |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1140 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1141 |
m_printer.AddPayloadPrinter (MakeCallback (&PacketHistoryTest::PrintPayload, this)); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1142 |
m_printer.AddDefaultPrinter (MakeCallback (&PacketHistoryTest::PrintDefault, this)); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1143 |
} |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1144 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1145 |
PacketHistoryTest::~PacketHistoryTest () |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1146 |
{} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1147 |
|
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1148 |
template <int N> |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1149 |
void |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1150 |
PacketHistoryTest::RegisterHeader (void) |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1151 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1152 |
static bool registered = false; |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1153 |
if (!registered) |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1154 |
{ |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
1155 |
m_printer.AddHeaderPrinter (MakeCallback (&PacketHistoryTest::PrintHeader<N>, this), |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
1156 |
MakeCallback (&PacketHistoryTest::PrintFragment, this)); |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1157 |
registered = true; |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1158 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1159 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1160 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1161 |
template <int N> |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1162 |
void |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1163 |
PacketHistoryTest::RegisterTrailer (void) |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1164 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1165 |
static bool registered = false; |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1166 |
if (!registered) |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1167 |
{ |
837
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
1168 |
m_printer.AddTrailerPrinter (MakeCallback (&PacketHistoryTest::PrintTrailer<N>, this), |
b73b63e84130
implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
836
diff
changeset
|
1169 |
MakeCallback (&PacketHistoryTest::PrintFragment, this)); |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1170 |
registered = true; |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1171 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1172 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1173 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1174 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1175 |
template <int N> |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1176 |
void |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1177 |
PacketHistoryTest::PrintHeader (std::ostream &os, uint32_t packetUid, uint32_t size, |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1178 |
const HistoryHeader<N> *header) |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1179 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1180 |
if (!header->IsOk ()) |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1181 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1182 |
m_headerError = true; |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1183 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1184 |
m_prints.push_back (N); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1185 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1186 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1187 |
template <int N> |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1188 |
void |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1189 |
PacketHistoryTest::PrintTrailer (std::ostream &os, uint32_t packetUid, uint32_t size, |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1190 |
const HistoryTrailer<N> *trailer) |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1191 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1192 |
if (!trailer->IsOk ()) |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1193 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1194 |
m_trailerError = true; |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1195 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1196 |
m_prints.push_back (N); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1197 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1198 |
void |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1199 |
PacketHistoryTest::PrintFragment (std::ostream &os,uint32_t packetUid, |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1200 |
uint32_t size,std::string & name, |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1201 |
struct PacketPrinter::FragmentInformation info) |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1202 |
{ |
813
0001e4abcf7b
test fragments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
812
diff
changeset
|
1203 |
m_prints.push_back (info.end - info.start); |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1204 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1205 |
void |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1206 |
PacketHistoryTest::PrintDefault (std::ostream& os,uint32_t packetUid, |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1207 |
uint32_t size,std::string& name, |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1208 |
struct PacketPrinter::FragmentInformation info) |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1209 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1210 |
NS_ASSERT (false); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1211 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1212 |
void |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1213 |
PacketHistoryTest::PrintPayload (std::ostream &os,uint32_t packetUid, |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1214 |
uint32_t size, |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1215 |
struct PacketPrinter::FragmentInformation info) |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1216 |
{ |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1217 |
m_prints.push_back (info.end - info.start); |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1218 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1219 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1220 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1221 |
void |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1222 |
PacketHistoryTest::CleanupPrints (void) |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1223 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1224 |
m_prints.clear (); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1225 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1226 |
|
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1227 |
bool |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1228 |
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
|
1229 |
{ |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1230 |
m_headerError = false; |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1231 |
m_trailerError = false; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1232 |
va_list ap; |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1233 |
p.Print (std::cerr, m_printer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1234 |
va_start (ap, n); |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1235 |
if (m_headerError) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1236 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1237 |
std::cout << "PacketHistory header error. file=" << file |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1238 |
<< ", line=" << line << std::endl; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1239 |
return false; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1240 |
} |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1241 |
if (m_trailerError) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1242 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1243 |
std::cout << "PacketHistory trailer error. file=" << file |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1244 |
<< ", line=" << line << std::endl; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1245 |
return false; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1246 |
} |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1247 |
if (n != m_prints.size ()) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1248 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1249 |
goto error; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1250 |
} |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1251 |
for (std::list<int>::iterator i = m_prints.begin (); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1252 |
i != m_prints.end (); i++) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1253 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1254 |
int v = va_arg (ap, int); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1255 |
if (v != *i) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1256 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1257 |
va_end (ap); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1258 |
goto error; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1259 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1260 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1261 |
va_end (ap); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1262 |
return true; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1263 |
error: |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1264 |
std::cout << "PacketHistory error. file="<< file |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1265 |
<< ", line=" << line << ", got:\""; |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1266 |
for (std::list<int>::iterator i = m_prints.begin (); |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1267 |
i != m_prints.end (); i++) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1268 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1269 |
std::cout << *i << ", "; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1270 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1271 |
std::cout << "\", expected: \""; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1272 |
va_start (ap, n); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1273 |
for (uint32_t j = 0; j < n; j++) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1274 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1275 |
int v = va_arg (ap, int); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1276 |
std::cout << v << ", "; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1277 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1278 |
va_end (ap); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1279 |
std::cout << "\"" << std::endl; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1280 |
return false; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1281 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1282 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1283 |
#define ADD_HEADER(p, n) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1284 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1285 |
HistoryHeader<n> header; \ |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1286 |
RegisterHeader<n> (); \ |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1287 |
p.AddHeader (header); \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1288 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1289 |
#define ADD_TRAILER(p, n) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1290 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1291 |
HistoryTrailer<n> trailer; \ |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1292 |
RegisterTrailer<n> (); \ |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1293 |
p.AddTrailer (trailer); \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1294 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1295 |
#define REM_HEADER(p, n) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1296 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1297 |
HistoryHeader<n> header; \ |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1298 |
RegisterHeader<n> (); \ |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1299 |
p.RemoveHeader (header); \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1300 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1301 |
#define REM_TRAILER(p, n) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1302 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1303 |
HistoryTrailer<n> trailer; \ |
806
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1304 |
RegisterTrailer<n> (); \ |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1305 |
p.RemoveTrailer (trailer); \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1306 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1307 |
#define CHECK_HISTORY(p, ...) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1308 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1309 |
if (!CheckHistory (p, __FILE__, \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1310 |
__LINE__, __VA_ARGS__)) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1311 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1312 |
ok = false; \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1313 |
} \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1314 |
CleanupPrints (); \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1315 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1316 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1317 |
bool |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1318 |
PacketHistoryTest::RunTests (void) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1319 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1320 |
bool ok = true; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1321 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1322 |
PacketHistory::Enable (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1323 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1324 |
Packet p = Packet (0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1325 |
Packet p1 = Packet (0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1326 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1327 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1328 |
ADD_TRAILER (p, 100); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1329 |
CHECK_HISTORY (p, 2, 10, 100); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1330 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1331 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1332 |
ADD_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1333 |
ADD_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1334 |
ADD_HEADER (p, 3); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1335 |
CHECK_HISTORY (p, 4, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1336 |
3, 2, 1, 10); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1337 |
ADD_HEADER (p, 5); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1338 |
CHECK_HISTORY (p, 5, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1339 |
5, 3, 2, 1, 10); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1340 |
ADD_HEADER (p, 6); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1341 |
CHECK_HISTORY (p, 6, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1342 |
6, 5, 3, 2, 1, 10); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1343 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1344 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1345 |
ADD_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1346 |
ADD_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1347 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1348 |
REM_HEADER (p, 3); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1349 |
CHECK_HISTORY (p, 3, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1350 |
2, 1, 10); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1351 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1352 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1353 |
ADD_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1354 |
ADD_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1355 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1356 |
REM_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1357 |
REM_HEADER (p, 2); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1358 |
CHECK_HISTORY (p, 2, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1359 |
1, 10); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1360 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1361 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1362 |
ADD_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1363 |
ADD_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1364 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1365 |
REM_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1366 |
REM_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1367 |
REM_HEADER (p, 1); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1368 |
CHECK_HISTORY (p, 1, 10); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1369 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1370 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1371 |
ADD_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1372 |
ADD_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1373 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1374 |
p1 = p; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1375 |
REM_HEADER (p1, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1376 |
REM_HEADER (p1, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1377 |
REM_HEADER (p1, 1); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1378 |
CHECK_HISTORY (p1, 1, 10); |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1379 |
CHECK_HISTORY (p, 4, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1380 |
3, 2, 1, 10); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1381 |
ADD_HEADER (p1, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1382 |
ADD_HEADER (p1, 2); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1383 |
CHECK_HISTORY (p1, 3, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1384 |
2, 1, 10); |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1385 |
CHECK_HISTORY (p, 4, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1386 |
3, 2, 1, 10); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1387 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1388 |
CHECK_HISTORY (p, 5, |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1389 |
3, 3, 2, 1, 10); |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1390 |
ADD_TRAILER (p, 4); |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1391 |
CHECK_HISTORY (p, 6, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1392 |
3, 3, 2, 1, 10, 4); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1393 |
ADD_TRAILER (p, 5); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1394 |
CHECK_HISTORY (p, 7, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1395 |
3, 3, 2, 1, 10, 4, 5); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1396 |
REM_HEADER (p, 3); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1397 |
CHECK_HISTORY (p, 6, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1398 |
3, 2, 1, 10, 4, 5); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1399 |
REM_TRAILER (p, 5); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1400 |
CHECK_HISTORY (p, 5, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1401 |
3, 2, 1, 10, 4); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1402 |
p1 = p; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1403 |
REM_TRAILER (p, 4); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1404 |
CHECK_HISTORY (p, 4, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1405 |
3, 2, 1, 10); |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1406 |
CHECK_HISTORY (p1, 5, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1407 |
3, 2, 1, 10, 4); |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1408 |
p1.RemoveAtStart (3); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1409 |
CHECK_HISTORY (p1, 4, |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1410 |
2, 1, 10, 4); |
845
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
1411 |
p1.RemoveAtStart (1); |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
1412 |
CHECK_HISTORY (p1, 4, |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
1413 |
1, 1, 10, 4); |
7abb0f867d8f
implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
844
diff
changeset
|
1414 |
p1.RemoveAtStart (1); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1415 |
CHECK_HISTORY (p1, 3, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1416 |
1, 10, 4); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1417 |
p1.RemoveAtEnd (4); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1418 |
CHECK_HISTORY (p1, 2, |
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1419 |
1, 10); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1420 |
p1.RemoveAtStart (1); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1421 |
CHECK_HISTORY (p1, 1, 10); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1422 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1423 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1424 |
ADD_HEADER (p, 8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1425 |
ADD_TRAILER (p, 8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1426 |
ADD_TRAILER (p, 8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1427 |
p.RemoveAtStart (8+10+8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1428 |
CHECK_HISTORY (p, 1, 8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1429 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1430 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1431 |
ADD_HEADER (p, 10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1432 |
ADD_HEADER (p, 8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1433 |
ADD_TRAILER (p, 6); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1434 |
ADD_TRAILER (p, 7); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1435 |
ADD_TRAILER (p, 9); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1436 |
p.RemoveAtStart (5); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1437 |
p.RemoveAtEnd (12); |
814
af117fb6eb5d
test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
813
diff
changeset
|
1438 |
CHECK_HISTORY (p, 5, 3, 10, 10, 6, 4); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1439 |
|
817
cb803cd166a3
new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
814
diff
changeset
|
1440 |
p = Packet (10); |
cb803cd166a3
new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
814
diff
changeset
|
1441 |
ADD_HEADER (p, 10); |
cb803cd166a3
new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
814
diff
changeset
|
1442 |
ADD_TRAILER (p, 6); |
cb803cd166a3
new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
814
diff
changeset
|
1443 |
p.RemoveAtEnd (18); |
cb803cd166a3
new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
814
diff
changeset
|
1444 |
ADD_TRAILER (p, 5); |
cb803cd166a3
new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
814
diff
changeset
|
1445 |
ADD_HEADER (p, 3); |
cb803cd166a3
new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
814
diff
changeset
|
1446 |
CHECK_HISTORY (p, 3, 3, 8, 5); |
cb803cd166a3
new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
814
diff
changeset
|
1447 |
p.RemoveAtStart (12); |
cb803cd166a3
new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
814
diff
changeset
|
1448 |
CHECK_HISTORY (p, 1, 4); |
818 | 1449 |
p.RemoveAtEnd (2); |
1450 |
CHECK_HISTORY (p, 1, 2); |
|
1451 |
ADD_HEADER (p, 10); |
|
1452 |
CHECK_HISTORY (p, 2, 10, 2); |
|
1453 |
p.RemoveAtEnd (5); |
|
1454 |
CHECK_HISTORY (p, 1, 7); |
|
817
cb803cd166a3
new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
814
diff
changeset
|
1455 |
|
820
5f5eed583a17
add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
818
diff
changeset
|
1456 |
Packet p2 = Packet (0); |
5f5eed583a17
add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
818
diff
changeset
|
1457 |
Packet p3 = Packet (0); |
5f5eed583a17
add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
818
diff
changeset
|
1458 |
|
5f5eed583a17
add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
818
diff
changeset
|
1459 |
p = Packet (40); |
5f5eed583a17
add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
818
diff
changeset
|
1460 |
ADD_HEADER (p, 5); |
5f5eed583a17
add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
818
diff
changeset
|
1461 |
ADD_HEADER (p, 8); |
821 | 1462 |
CHECK_HISTORY (p, 3, 8, 5, 40); |
820
5f5eed583a17
add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
818
diff
changeset
|
1463 |
p1 = p.CreateFragment (0, 5); |
5f5eed583a17
add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
818
diff
changeset
|
1464 |
p2 = p.CreateFragment (5, 5); |
5f5eed583a17
add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
818
diff
changeset
|
1465 |
p3 = p.CreateFragment (10, 43); |
5f5eed583a17
add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
818
diff
changeset
|
1466 |
CHECK_HISTORY (p1, 1, 5); |
5f5eed583a17
add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
818
diff
changeset
|
1467 |
CHECK_HISTORY (p2, 2, 3, 2); |
5f5eed583a17
add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
818
diff
changeset
|
1468 |
CHECK_HISTORY (p3, 2, 3, 40); |
821 | 1469 |
p1.AddAtEnd (p2); |
1470 |
CHECK_HISTORY (p1, 2, 8, 2); |
|
1471 |
CHECK_HISTORY (p2, 2, 3, 2); |
|
1472 |
p1.AddAtEnd (p3); |
|
1473 |
CHECK_HISTORY (p1, 3, 8, 5, 40); |
|
1474 |
CHECK_HISTORY (p2, 2, 3, 2); |
|
1475 |
CHECK_HISTORY (p3, 2, 3, 40); |
|
825 | 1476 |
p1 = p.CreateFragment (0, 5); |
1477 |
CHECK_HISTORY (p1, 1, 5); |
|
1478 |
||
1479 |
p3 = Packet (50); |
|
1480 |
ADD_HEADER (p3, 8); |
|
1481 |
CHECK_HISTORY (p3, 2, 8, 50); |
|
1482 |
CHECK_HISTORY (p1, 1, 5); |
|
1483 |
p1.AddAtEnd (p3); |
|
1484 |
CHECK_HISTORY (p1, 3, 5, 8, 50); |
|
1485 |
ADD_HEADER (p1, 5); |
|
1486 |
CHECK_HISTORY (p1, 4, 5, 5, 8, 50); |
|
1487 |
ADD_TRAILER (p1, 2); |
|
1488 |
CHECK_HISTORY (p1, 5, 5, 5, 8, 50, 2); |
|
1489 |
REM_HEADER (p1, 5); |
|
1490 |
CHECK_HISTORY (p1, 4, 5, 8, 50, 2); |
|
1491 |
p1.RemoveAtEnd (60); |
|
1492 |
CHECK_HISTORY (p1, 1, 5); |
|
1493 |
p1.AddAtEnd (p2); |
|
1494 |
CHECK_HISTORY (p1, 2, 8, 2); |
|
1495 |
CHECK_HISTORY (p2, 2, 3, 2); |
|
828 | 1496 |
|
1497 |
p3 = Packet (40); |
|
1498 |
ADD_HEADER (p3, 5); |
|
1499 |
ADD_HEADER (p3, 5); |
|
1500 |
CHECK_HISTORY (p3, 3, 5, 5, 40); |
|
1501 |
p1 = p3.CreateFragment (0, 5); |
|
1502 |
p2 = p3.CreateFragment (5, 5); |
|
1503 |
CHECK_HISTORY (p1, 1, 5); |
|
1504 |
CHECK_HISTORY (p2, 1, 5); |
|
1505 |
p1.AddAtEnd (p2); |
|
1506 |
CHECK_HISTORY (p1, 2, 5, 5); |
|
829
6f869667686f
more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
828
diff
changeset
|
1507 |
|
6f869667686f
more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
828
diff
changeset
|
1508 |
p = Packet (0); |
6f869667686f
more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
828
diff
changeset
|
1509 |
CHECK_HISTORY (p, 0); |
6f869667686f
more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
828
diff
changeset
|
1510 |
|
6f869667686f
more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
828
diff
changeset
|
1511 |
p3 = Packet (0); |
6f869667686f
more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
828
diff
changeset
|
1512 |
ADD_HEADER (p3, 5); |
6f869667686f
more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
828
diff
changeset
|
1513 |
ADD_HEADER (p3, 5); |
6f869667686f
more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
828
diff
changeset
|
1514 |
CHECK_HISTORY (p3, 2, 5, 5); |
6f869667686f
more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
828
diff
changeset
|
1515 |
p1 = p3.CreateFragment (0, 4); |
6f869667686f
more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
828
diff
changeset
|
1516 |
p2 = p3.CreateFragment (9, 1); |
6f869667686f
more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
828
diff
changeset
|
1517 |
CHECK_HISTORY (p1, 1, 4); |
6f869667686f
more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
828
diff
changeset
|
1518 |
CHECK_HISTORY (p2, 1, 1); |
6f869667686f
more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
828
diff
changeset
|
1519 |
p1.AddAtEnd (p2); |
6f869667686f
more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
828
diff
changeset
|
1520 |
CHECK_HISTORY (p1, 2, 4, 1); |
825 | 1521 |
|
1522 |
||
817
cb803cd166a3
new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
814
diff
changeset
|
1523 |
|
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1524 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1525 |
return ok; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1526 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1527 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1528 |
static PacketHistoryTest g_packetHistoryTest; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1529 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1530 |
}//namespace ns3 |