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