src/common/packet-history.cc
author Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Fri, 01 Jun 2007 13:06:35 +0200
changeset 820 5f5eed583a17
parent 818 1c6df07b7644
child 821 c5ebe0778031
permissions -rw-r--r--
add more tests
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"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    25
#include "packet-history.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    26
#include "chunk.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    27
#include "buffer.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    28
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    29
namespace {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    30
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    31
class ItemList
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    32
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    33
public:
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
    34
  void InitPayload (uint32_t packetUid, uint32_t size);
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    35
  void AddHeader (uint32_t type, uint32_t size);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    36
  void AddTrailer (uint32_t type, uint32_t size);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    37
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    38
  void RemHeader (uint32_t type, uint32_t size);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    39
  void RemTrailer (uint32_t type, uint32_t size);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    40
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    41
  void RemAtStart (uint32_t toRemove);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    42
  void RemAtEnd (uint32_t toRemove);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    43
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    44
  void AddAtEnd (ItemList const *other);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    45
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
    46
  void Print (std::ostream &os, ns3::Buffer buffer, const ns3::PacketPrinter &printer) const;
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
    47
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    48
private:
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    49
  enum Type {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    50
    PAYLOAD,
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
    51
    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
    52
    TRAILER,
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    53
  };
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    54
  struct Item
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    55
  {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    56
    enum ItemList::Type m_type;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    57
    uint32_t m_size;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    58
    uint32_t m_chunkType;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    59
    uint32_t m_fragmentStart;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    60
    uint32_t m_fragmentEnd;
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
    61
    uint32_t m_packetUid;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    62
  };
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    63
  std::list<Item> m_itemList;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    64
};
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    65
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    66
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
    67
ItemList::InitPayload (uint32_t packetUid, uint32_t size)
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    68
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    69
  NS_ASSERT (m_itemList.empty ());
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    70
  struct Item item;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    71
  item.m_type = ItemList::PAYLOAD;
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
    72
  item.m_chunkType = 0;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    73
  item.m_size = size;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    74
  item.m_fragmentStart = 0;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    75
  item.m_fragmentEnd = item.m_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
    76
  item.m_packetUid = packetUid;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    77
  m_itemList.push_back (item);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    78
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    79
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    80
void 
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    81
ItemList::AddHeader (uint32_t type, uint32_t size)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    82
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    83
  struct Item item;
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
    84
  item.m_type = ItemList::HEADER;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    85
  item.m_chunkType = type;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    86
  item.m_size = size;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    87
  item.m_fragmentStart = 0;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    88
  item.m_fragmentEnd = 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
    89
  item.m_packetUid = m_itemList.front ().m_packetUid;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    90
  m_itemList.push_front (item);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    91
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    92
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    93
void 
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    94
ItemList::AddTrailer (uint32_t type, uint32_t size)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    95
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    96
  struct Item item;
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
    97
  item.m_type = ItemList::TRAILER;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    98
  item.m_chunkType = type;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    99
  item.m_size = size;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   100
  item.m_fragmentStart = 0;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   101
  item.m_fragmentEnd = 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
   102
  item.m_packetUid = m_itemList.back ().m_packetUid;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   103
  m_itemList.push_back (item);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   104
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   105
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   106
void 
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   107
ItemList::RemHeader (uint32_t type, uint32_t size)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   108
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   109
  struct Item item = m_itemList.front ();
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
   110
  if (item.m_type != ItemList::HEADER ||
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   111
      item.m_size != size ||
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   112
      item.m_chunkType != type)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   113
    {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   114
      NS_FATAL_ERROR ("Removing Unexpected header");
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   115
    }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   116
  else if (item.m_fragmentStart != 0 ||
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   117
           item.m_fragmentEnd != item.m_size)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   118
    {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   119
      NS_FATAL_ERROR ("Removing non-complete header");
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   120
    }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   121
  m_itemList.pop_front ();
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   122
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   123
void 
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   124
ItemList::RemTrailer (uint32_t type, uint32_t size)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   125
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   126
  struct Item item = m_itemList.back ();
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
   127
  if (item.m_type != ItemList::TRAILER ||
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   128
      item.m_size != size ||
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   129
      item.m_chunkType != type)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   130
    {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   131
      NS_FATAL_ERROR ("Removing Unexpected trailer");
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   132
    }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   133
  else if (item.m_fragmentStart != 0 ||
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   134
           item.m_fragmentEnd != item.m_size)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   135
    {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   136
      NS_FATAL_ERROR ("Removing non-complete trailer");
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   137
    }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   138
  m_itemList.pop_back ();
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   139
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   140
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   141
void 
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   142
ItemList::RemAtStart (uint32_t toRemove)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   143
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   144
  uint32_t leftToRemove = toRemove;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   145
  while (!m_itemList.empty () && leftToRemove > 0)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   146
    {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   147
      struct Item &item = m_itemList.front ();
817
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
   148
      uint32_t itemRealSize = item.m_fragmentEnd - item.m_fragmentStart;
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
   149
      if (itemRealSize <= leftToRemove)
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   150
        {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   151
          m_itemList.pop_front ();
817
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
   152
          leftToRemove -= itemRealSize;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   153
        }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   154
      else
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   155
        {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   156
          item.m_fragmentStart += leftToRemove;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   157
          leftToRemove = 0;
812
add0226d313d make the tests pass again
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 810
diff changeset
   158
          NS_ASSERT (item.m_size >= item.m_fragmentEnd - item.m_fragmentStart &&
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   159
                     item.m_fragmentStart <= item.m_fragmentEnd);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   160
        }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   161
    }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   162
  NS_ASSERT (leftToRemove == 0);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   163
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   164
void 
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   165
ItemList::RemAtEnd (uint32_t toRemove)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   166
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   167
  uint32_t leftToRemove = toRemove;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   168
  while (!m_itemList.empty () && leftToRemove > 0)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   169
    {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   170
      struct Item &item = m_itemList.back ();
817
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
   171
      uint32_t itemRealSize = item.m_fragmentEnd - item.m_fragmentStart;
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
   172
      if (itemRealSize <= leftToRemove)
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   173
        {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   174
          m_itemList.pop_back ();
817
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
   175
          leftToRemove -= itemRealSize;
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   176
        }
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   177
      else
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   178
        {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   179
          item.m_fragmentEnd -= leftToRemove;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   180
          leftToRemove = 0;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   181
        }
812
add0226d313d make the tests pass again
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 810
diff changeset
   182
      NS_ASSERT (item.m_size >= item.m_fragmentEnd - item.m_fragmentStart &&
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   183
                 item.m_fragmentStart <= item.m_fragmentEnd &&
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   184
                 item.m_fragmentEnd <= item.m_size);
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   185
    }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   186
  NS_ASSERT (leftToRemove == 0);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   187
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   188
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   189
void 
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   190
ItemList::AddAtEnd (ItemList const *other)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   191
{
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   192
  for (std::list<ItemList::Item>::const_iterator i = other->m_itemList.begin (); 
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   193
       i != other->m_itemList.end (); i++)
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   194
    {
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   195
      const ItemList::Item &item = *i;
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   196
      ItemList::Item &last = m_itemList.back ();
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
   197
      if (item.m_packetUid == last.m_packetUid &&
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   198
          item.m_type == last.m_type &&
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   199
          item.m_chunkType == last.m_chunkType &&
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   200
          item.m_size == last.m_size &&
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   201
          last.m_fragmentEnd != last.m_size && 
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   202
          item.m_fragmentStart == last.m_fragmentEnd)
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   203
        {
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   204
          last.m_fragmentEnd = item.m_fragmentEnd;
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   205
        }
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   206
      else
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   207
        {
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   208
          m_itemList.push_back (item);
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   209
        }
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   210
    }
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   211
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   212
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   213
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
   214
ItemList::Print (std::ostream &os, ns3::Buffer buffer, const ns3::PacketPrinter &printer) 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
   215
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   216
  NS_ASSERT (!m_itemList.empty ());
807
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   217
  uint32_t totalSize = 0;
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   218
  for (std::list<ItemList::Item>::const_iterator i = m_itemList.begin (); 
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   219
       i != m_itemList.end (); i++)
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   220
    {
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   221
      ItemList::Item item = *i;
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   222
      totalSize += item.m_fragmentEnd - item.m_fragmentStart;
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   223
    }
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   224
  NS_ASSERT (totalSize == buffer.GetSize ());
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   225
  uint32_t offset = 0;
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
   226
  for (std::list<ItemList::Item>::const_iterator i = m_itemList.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
   227
       i != m_itemList.end (); i++)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   228
    {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   229
      ItemList::Item item = *i;
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   230
      if (item.m_type == ItemList::PAYLOAD)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   231
        {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   232
          printer.PrintPayload (os, item.m_packetUid, item.m_size, item.m_fragmentStart, item.m_fragmentEnd);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   233
        }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   234
      else if (item.m_fragmentStart != 0 || 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   235
               item.m_fragmentEnd != item.m_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
   236
        {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   237
          printer.PrintChunkFragment (item.m_chunkType, os, item.m_packetUid, item.m_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
   238
                                      item.m_fragmentStart, item.m_fragmentEnd);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   239
        }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   240
      else if (item.m_type == ItemList::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
   241
        {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   242
          ns3::Buffer::Iterator j = buffer.Begin ();
807
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   243
          j.Next (offset);
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
   244
          printer.PrintChunk (item.m_chunkType, j, os, item.m_packetUid, item.m_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
   245
        }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   246
      else if (item.m_type == ItemList::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
   247
        {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   248
          ns3::Buffer::Iterator j = buffer.End ();
812
add0226d313d make the tests pass again
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 810
diff changeset
   249
          j.Prev (totalSize - (offset + item.m_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
   250
          printer.PrintChunk (item.m_chunkType, j, os, item.m_packetUid, item.m_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
   251
        }
807
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   252
      else 
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   253
        {
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   254
          NS_ASSERT (false);
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   255
        }
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   256
      offset += item.m_fragmentEnd - item.m_fragmentStart;
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
   257
    }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   258
}
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   259
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   260
} // anonymous namespace
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   261
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   262
namespace ns3 {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   263
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   264
bool PacketHistory::m_enable = false;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   265
uint32_t PacketHistory::m_maxSize = 0;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   266
PacketHistory::DataFreeList PacketHistory::m_freeList;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   267
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   268
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   269
PacketHistory::Enable (void)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   270
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   271
  m_enable = true;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   272
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   273
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   274
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   275
PacketHistory::PacketHistory ()
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   276
  : m_data (0),
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   277
    m_end (0),
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   278
    m_n (0),
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   279
    m_aggregated (false)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   280
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   281
  Construct (0, 0);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   282
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   283
PacketHistory::PacketHistory (uint32_t uid, uint32_t size)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   284
  : m_data (0),
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   285
    m_end (0),
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   286
    m_n (0),
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   287
    m_aggregated (false)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   288
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   289
  Construct (uid, size);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   290
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   291
void
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   292
PacketHistory::Construct (uint32_t uid, uint32_t size)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   293
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   294
  if (m_enable) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   295
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   296
      m_data = PacketHistory::Create (size);
809
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   297
      AppendOneCommand (PacketHistory::INIT,
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   298
                        size, uid);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   299
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   300
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   301
PacketHistory::PacketHistory (PacketHistory const &o)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   302
  : m_data (o.m_data),
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   303
    m_end (o.m_end),
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   304
    m_n (o.m_n),
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   305
    m_aggregated (o.m_aggregated)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   306
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   307
  if (m_data != 0) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   308
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   309
      m_data->m_count++;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   310
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   311
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   312
PacketHistory &
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   313
PacketHistory::operator = (PacketHistory const& o)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   314
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   315
  if (m_data == o.m_data) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   316
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   317
      // self assignment
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   318
      return *this;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   319
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   320
  if (m_data != 0) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   321
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   322
      m_data->m_count--;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   323
      if (m_data->m_count == 0) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   324
        {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   325
          PacketHistory::Recycle (m_data);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   326
        }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   327
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   328
  m_data = o.m_data;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   329
  m_end = o.m_end;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   330
  m_n = o.m_n;
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   331
  m_aggregated = o.m_aggregated;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   332
  if (m_data != 0) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   333
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   334
      m_data->m_count++;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   335
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   336
  return *this;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   337
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   338
PacketHistory::~PacketHistory ()
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   339
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   340
  if (m_data != 0) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   341
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   342
      m_data->m_count--;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   343
      if (m_data->m_count == 0) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   344
        {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   345
          PacketHistory::Recycle (m_data);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   346
        }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   347
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   348
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   349
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   350
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   351
struct PacketHistory::CommandData *
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   352
PacketHistory::Create (uint32_t size)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   353
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   354
  if (size > m_maxSize)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   355
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   356
      m_maxSize = size;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   357
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   358
  while (!m_freeList.empty ()) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   359
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   360
      struct PacketHistory::CommandData *data = m_freeList.back ();
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   361
      m_freeList.pop_back ();
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   362
      if (data->m_size >= size) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   363
        {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   364
          data->m_count = 1;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   365
          return data;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   366
        }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   367
      PacketHistory::Deallocate (data);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   368
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   369
  return PacketHistory::Allocate (size);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   370
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   371
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   372
void
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   373
PacketHistory::Recycle (struct CommandData *data)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   374
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   375
  NS_ASSERT (data->m_count == 0);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   376
  if (m_freeList.size () > 1000 ||
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   377
      data->m_size < m_maxSize) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   378
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   379
      PacketHistory::Deallocate (data);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   380
    } 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   381
  else 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   382
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   383
      m_freeList.push_back (data);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   384
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   385
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   386
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   387
struct PacketHistory::CommandData *
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   388
PacketHistory::Allocate (uint32_t n)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   389
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   390
  uint32_t size = sizeof (struct CommandData);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   391
  if (n <= 4)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   392
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   393
      n = 4;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   394
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   395
  size += (n-4) * (4 + 1);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   396
  uint8_t *buf = new uint8_t [size];
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   397
  struct CommandData *data = (struct CommandData *)buf;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   398
  data->m_size = n;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   399
  data->m_count = 1;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   400
  return data;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   401
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   402
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   403
PacketHistory::Deallocate (struct CommandData *data)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   404
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   405
  uint8_t *buf = (uint8_t *)data;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   406
  delete [] buf;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   407
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   408
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   409
void
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   410
PacketHistory::AppendOneCommand (uint32_t type, uint32_t data0, uint32_t data1)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   411
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   412
  NS_ASSERT (m_data != 0);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   413
  uint32_t n = GetUleb128Size (type);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   414
  n += GetUleb128Size (data0);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   415
  n += GetUleb128Size (data1);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   416
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   417
  if (m_data->m_size > m_end + n)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   418
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   419
      if (m_data->m_count == 1 ||
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   420
          m_data->m_dirtyEnd == m_end)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   421
        {
809
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   422
          AppendValue (type);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   423
          AppendValue (data0);
809
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   424
          AppendValue (data1);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   425
          m_n++;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   426
          return;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   427
        }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   428
      else
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   429
        {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   430
          uint8_t *buffer = &(m_data->m_data[m_end]);
809
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   431
          uint32_t lastType = ReadForwardValue (&buffer);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   432
          if (lastType == type)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   433
            {
809
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   434
              uint32_t lastData = ReadForwardValue (&buffer);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   435
              if (lastData == data0)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   436
                {
809
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   437
                  lastData = ReadForwardValue (&buffer);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   438
                  if (lastData == data1)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   439
                    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   440
                      return;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   441
                    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   442
                }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   443
            }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   444
        }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   445
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   446
  Reserve (n);
809
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   447
  AppendValue (type);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   448
  AppendValue (data0);
809
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   449
  AppendValue (data1);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   450
  m_n++;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   451
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   452
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   453
void
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   454
PacketHistory::AppendOneCommand (uint32_t type, uint32_t data)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   455
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   456
  NS_ASSERT (m_data != 0);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   457
  uint32_t n = GetUleb128Size (data);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   458
  n += GetUleb128Size (type);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   459
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   460
  if (m_data->m_size > m_end + n)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   461
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   462
      if (m_data->m_count == 1 ||
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   463
          m_data->m_dirtyEnd == m_end)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   464
        {
809
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   465
          AppendValue (type);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   466
          AppendValue (data);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   467
          m_n++;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   468
          return;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   469
        }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   470
      else
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   471
        {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   472
          uint8_t *buffer = &(m_data->m_data[m_end]);
809
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   473
          uint32_t lastType = ReadForwardValue (&buffer);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   474
          if (lastType == type)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   475
            {
809
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   476
              uint32_t lastData = ReadForwardValue (&buffer);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   477
              if (lastData == data)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   478
                {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   479
                  return;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   480
                }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   481
            }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   482
        }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   483
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   484
  Reserve (n);
809
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   485
  AppendValue (type);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   486
  AppendValue (data);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   487
  m_n++;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   488
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   489
void
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   490
PacketHistory::ReserveCopy (uint32_t size)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   491
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   492
  struct CommandData *newData = PacketHistory::Create (m_end + size);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   493
  memcpy (newData->m_data, m_data->m_data, m_end);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   494
  newData->m_dirtyEnd = m_end;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   495
  m_data->m_count--;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   496
  if (m_data->m_count == 0) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   497
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   498
      PacketHistory::Recycle (m_data);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   499
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   500
  m_data = newData;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   501
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   502
void
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   503
PacketHistory::Reserve (uint32_t size)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   504
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   505
  NS_ASSERT (m_data != 0);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   506
  if (m_data->m_size > m_end + size &&
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   507
      (m_data->m_count == 1 ||
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   508
       m_data->m_dirtyEnd == m_end))
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   509
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   510
      /* enough room, not dirty. */
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   511
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   512
  else 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   513
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   514
      /* (enough room and dirty) or (not enough room) */
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   515
      ReserveCopy (size);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   516
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   517
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   518
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   519
uint32_t 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   520
PacketHistory::GetUleb128Size (uint32_t value) const
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   521
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   522
  uint32_t n = 0;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   523
  uint32_t tmp = value;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   524
  do {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   525
    tmp >>= 7;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   526
    n++;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   527
  } while (tmp != 0);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   528
  return n;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   529
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   530
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   531
uint32_t 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   532
PacketHistory::GetReverseUleb128Size (uint8_t *buffer) const
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   533
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   534
  uint8_t *cur = buffer;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   535
  uint8_t byte = *cur;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   536
  if (byte & 0x80)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   537
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   538
      NS_FATAL_ERROR ("The last byte should have a zero high bit");
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   539
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   540
  cur--;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   541
  while ((byte & 0x80) && (buffer - cur) < 5)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   542
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   543
      cur--;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   544
      byte = *cur;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   545
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   546
  uint32_t n = buffer - cur;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   547
  return n;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   548
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   549
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   550
void
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   551
PacketHistory::AppendValue (uint32_t value)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   552
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   553
  uint32_t n = 0;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   554
  uint8_t *buffer = &m_data->m_data[m_end];
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   555
  do {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   556
    uint8_t byte = value & (~0x80);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   557
    value >>= 7;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   558
    if (value != 0)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   559
      {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   560
        /* more bytes to come */
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   561
        byte |= 0x80;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   562
      }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   563
    n++;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   564
    *buffer = byte;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   565
    buffer++;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   566
  } while (value != 0);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   567
  m_end += n;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   568
  if (m_end > m_data->m_dirtyEnd)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   569
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   570
      m_data->m_dirtyEnd = m_end;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   571
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   572
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   573
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   574
uint32_t
791
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   575
PacketHistory::ReadValue (uint8_t *buffer, uint32_t *n) const
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   576
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   577
  uint32_t result = 0;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   578
  uint8_t shift, byte;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   579
  result = 0;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   580
  shift = 0;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   581
  do {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   582
    byte = *buffer;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   583
    buffer++;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   584
    result |= (byte & (~0x80))<<shift;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   585
    shift += 7;
791
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   586
    (*n)++;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   587
  } while (byte & 0x80 && 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   588
           /* a LEB128 unsigned number is at most 5 bytes long. */
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   589
           shift < (7*5)); 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   590
  if (byte & 0x80)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   591
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   592
      /* This means that the LEB128 number was not valid.
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   593
       * ie: the last (5th) byte did not have the high-order bit zeroed.
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   594
       */
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   595
      result = 0xffffffff;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   596
    }
791
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   597
  return result;
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   598
}
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   599
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   600
uint32_t
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   601
PacketHistory::ReadForwardValue (uint8_t **pBuffer) const
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   602
{
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   603
  uint32_t read = 0;
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   604
  uint32_t result = ReadValue (*pBuffer, &read);
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   605
  *pBuffer = *pBuffer + read;
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   606
  return result;
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   607
}
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   608
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   609
PacketHistory 
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   610
PacketHistory::CreateFragment (uint32_t start, uint32_t end) const
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   611
{
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   612
  PacketHistory fragment = *this;
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   613
  fragment.RemoveAtStart (start);
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   614
  fragment.RemoveAtEnd (end);
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   615
  return fragment;
789
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
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   618
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   619
PacketHistory::AddHeader (uint32_t uid, Chunk const & header, uint32_t size)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   620
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   621
  if (m_enable) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   622
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   623
      AppendOneCommand (PacketHistory::ADD_HEADER, uid, size);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   624
    }  
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   625
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   626
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   627
PacketHistory::RemoveHeader (uint32_t uid, Chunk const & header, uint32_t size)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   628
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   629
  if (m_enable) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   630
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   631
      AppendOneCommand (PacketHistory::REM_HEADER, uid, size);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   632
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   633
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   634
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   635
PacketHistory::AddTrailer (uint32_t uid, Chunk const & trailer, uint32_t size)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   636
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   637
  if (m_enable) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   638
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   639
      AppendOneCommand (PacketHistory::ADD_TRAILER, uid, size);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   640
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   641
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   642
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   643
PacketHistory::RemoveTrailer (uint32_t uid, Chunk const & trailer, uint32_t size)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   644
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   645
  if (m_enable) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   646
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   647
      AppendOneCommand (PacketHistory::REM_TRAILER, uid, size);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   648
    }
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
void
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   651
PacketHistory::AddAtEnd (PacketHistory const&o)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   652
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   653
  if (m_enable) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   654
    {
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   655
      m_aggregated = true;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   656
      uint32_t n = GetUleb128Size (PacketHistory::ADD_AT_END);
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   657
      n += GetUleb128Size (o.m_end); 
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   658
      n += o.m_end;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   659
      Reserve (n);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   660
      memcpy (&m_data->m_data[m_end], o.m_data->m_data, o.m_end);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   661
      m_end += o.m_end;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   662
      if (m_end > m_data->m_dirtyEnd)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   663
        {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   664
          m_data->m_dirtyEnd = m_end;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   665
        }
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   666
      AppendOneCommand (PacketHistory::ADD_AT_END, o.m_end);
789
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
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   669
void
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   670
PacketHistory::AddPaddingAtEnd (uint32_t end)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   671
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   672
  if (m_enable)
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
      AppendOneCommand (PacketHistory::PADDING_AT_END, end);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   675
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   676
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   677
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   678
PacketHistory::RemoveAtStart (uint32_t start)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   679
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   680
  if (m_enable) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   681
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   682
      AppendOneCommand (PacketHistory::REM_AT_START, start);
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 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   686
PacketHistory::RemoveAtEnd (uint32_t end)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   687
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   688
  if (m_enable) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   689
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   690
      AppendOneCommand (PacketHistory::REM_AT_END, end);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   691
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   692
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   693
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   694
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
   695
PacketHistory::PrintComplex (std::ostream &os, Buffer buffer, const PacketPrinter &printer) const
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   696
{
791
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   697
  // we need to build a linked list of the different fragments 
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   698
  // which are stored in this packet.
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   699
  uint8_t *dataBuffer = &m_data->m_data[0];
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   700
  ItemList itemList;
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   701
  BuildItemList (&itemList, dataBuffer, m_end);
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
   702
  itemList.Print (os, buffer, printer);
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   703
}
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   704
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   705
void 
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   706
PacketHistory::BuildItemList (ItemList *list, uint8_t *buffer, uint32_t size) const
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   707
{
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   708
  // we need to build a linked list of the different fragments 
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   709
  // which are stored in this packet.
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   710
  uint8_t *dataBuffer = buffer;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   711
  for (uint32_t i = 0; i < m_n; i++)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   712
    {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   713
      uint32_t type = ReadForwardValue (&dataBuffer);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   714
      uint32_t data = ReadForwardValue (&dataBuffer);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   715
      switch (type)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   716
        {
809
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   717
        case INIT: {
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   718
          uint32_t uid = ReadForwardValue (&dataBuffer);
810
d170149bcc7b build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 809
diff changeset
   719
          list->InitPayload (uid, data);
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   720
        } break;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   721
        case ADD_HEADER: {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   722
          uint32_t size = ReadForwardValue (&dataBuffer);
810
d170149bcc7b build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 809
diff changeset
   723
          list->AddHeader (data, size);
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   724
        } break;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   725
        case REM_HEADER: {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   726
          uint32_t size = ReadForwardValue (&dataBuffer);
810
d170149bcc7b build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 809
diff changeset
   727
          list->RemHeader (data, size);
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   728
        } break;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   729
        case ADD_TRAILER: {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   730
          uint32_t size = ReadForwardValue (&dataBuffer);
810
d170149bcc7b build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 809
diff changeset
   731
          list->AddTrailer (data, size);
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   732
        } break;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   733
        case REM_TRAILER: {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   734
          uint32_t size = ReadForwardValue (&dataBuffer);
810
d170149bcc7b build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 809
diff changeset
   735
          list->RemTrailer (data, size);
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   736
        } break;
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   737
        case ADD_AT_END: {
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   738
          ItemList other;
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   739
          BuildItemList (&other, dataBuffer, data);
810
d170149bcc7b build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 809
diff changeset
   740
          list->AddAtEnd (&other);
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   741
        } break;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   742
        case REM_AT_START: {
810
d170149bcc7b build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 809
diff changeset
   743
          list->RemAtStart (data);
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   744
        } break;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   745
        case REM_AT_END: {
810
d170149bcc7b build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 809
diff changeset
   746
          list->RemAtEnd (data);
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   747
        } break;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   748
        case PADDING_AT_END:
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   749
          break;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   750
        }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   751
    }  
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   752
}
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   753
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   754
void 
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   755
PacketHistory::PrintDefault (std::ostream &os, Buffer buffer) const
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   756
{
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
   757
  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
   758
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   759
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   760
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
   761
PacketHistory::Print (std::ostream &os, Buffer buffer, const PacketPrinter &printer) 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
   762
{
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   763
  if (!m_enable) 
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   764
    {
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   765
      return;
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   766
    }
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   767
809
1bfeec93c1e1 remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 807
diff changeset
   768
  PrintComplex (os, buffer, printer);
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   769
}
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   770
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   771
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   772
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   773
}; // namespace ns3
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   774
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   775
#include <stdarg.h>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   776
#include <iostream>
795
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   777
#include <sstream>
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   778
#include "ns3/test.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   779
#include "header.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   780
#include "trailer.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   781
#include "packet.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   782
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   783
namespace ns3 {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   784
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   785
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   786
class HistoryHeader : public Header
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   787
{
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
   788
public:
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   789
  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
   790
  bool IsOk (void) const;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   791
private:
795
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   792
  virtual std::string DoGetName (void) const;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   793
  virtual void PrintTo (std::ostream &os) const;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   794
  virtual uint32_t GetSerializedSize (void) const;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   795
  virtual void SerializeTo (Buffer::Iterator start) const;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   796
  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
   797
  bool m_ok;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   798
};
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   799
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   800
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
   801
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
   802
  : 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
   803
{}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   804
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   805
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
   806
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
   807
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
   808
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   809
  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
   810
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   811
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   812
template <int N>
795
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   813
std::string 
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   814
HistoryHeader<N>::DoGetName (void) const
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   815
{
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   816
  std::ostringstream oss;
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   817
  oss << N;
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   818
  return oss.str ();
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   819
}
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   820
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   821
template <int N>
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   822
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   823
HistoryHeader<N>::PrintTo (std::ostream &os) const
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   824
{
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
   825
  NS_ASSERT (false);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   826
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   827
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   828
uint32_t 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   829
HistoryHeader<N>::GetSerializedSize (void) const
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   830
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   831
  return N;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   832
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   833
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   834
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   835
HistoryHeader<N>::SerializeTo (Buffer::Iterator start) const
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   836
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   837
  start.WriteU8 (N, N);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   838
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   839
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   840
uint32_t
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   841
HistoryHeader<N>::DeserializeFrom (Buffer::Iterator start)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   842
{
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
   843
  m_ok = true;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   844
  for (int i = 0; i < N; i++)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   845
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   846
      if (start.ReadU8 () != N)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   847
        {
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
   848
          m_ok = false;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   849
        }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   850
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   851
  return N;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   852
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   853
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   854
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   855
class HistoryTrailer : public Trailer
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   856
{
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
   857
public:
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   858
  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
   859
  bool IsOk (void) const;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   860
private:
795
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   861
  virtual std::string DoGetName (void) const;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   862
  virtual void PrintTo (std::ostream &os) const;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   863
  virtual uint32_t GetSerializedSize (void) const;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   864
  virtual void SerializeTo (Buffer::Iterator start) const;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   865
  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
   866
  bool m_ok;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   867
};
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   868
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   869
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
   870
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
   871
  : 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
   872
{}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   873
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   874
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
   875
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
   876
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
   877
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   878
  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
   879
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   880
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   881
template <int N>
795
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   882
std::string 
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   883
HistoryTrailer<N>::DoGetName (void) const
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   884
{
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   885
  std::ostringstream oss;
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   886
  oss << N;
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   887
  return oss.str ();
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   888
}
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
   889
template <int N>
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   890
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   891
HistoryTrailer<N>::PrintTo (std::ostream &os) const
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   892
{
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
   893
  NS_ASSERT (false);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   894
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   895
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   896
uint32_t 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   897
HistoryTrailer<N>::GetSerializedSize (void) const
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   898
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   899
  return N;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   900
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   901
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   902
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   903
HistoryTrailer<N>::SerializeTo (Buffer::Iterator start) const
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   904
{
817
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
   905
  start.Prev (N);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   906
  start.WriteU8 (N, N);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   907
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   908
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   909
uint32_t
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   910
HistoryTrailer<N>::DeserializeFrom (Buffer::Iterator start)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   911
{
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
   912
  m_ok = true;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   913
  start.Prev (N);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   914
  for (int i = 0; i < N; i++)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   915
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   916
      if (start.ReadU8 () != N)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   917
        {
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
   918
          m_ok = false;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   919
        }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   920
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   921
  return N;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   922
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   923
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   924
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   925
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   926
class PacketHistoryTest : public Test {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   927
public:
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   928
  PacketHistoryTest ();
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   929
  virtual ~PacketHistoryTest ();
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   930
  bool CheckHistory (Packet p, char *file, int line, uint32_t n, ...);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   931
  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
   932
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
   933
  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
   934
  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
   935
  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
   936
  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
   937
  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
   938
                      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
   939
                      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
   940
  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
   941
                     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
   942
                     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
   943
  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
   944
                     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
   945
                     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
   946
  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
   947
  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
   948
  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
   949
  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
   950
  void CleanupPrints (void);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   951
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   952
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   953
  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
   954
  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
   955
  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
   956
  PacketPrinter m_printer;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   957
};
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   958
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   959
PacketHistoryTest::PacketHistoryTest ()
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   960
  : Test ("PacketHistory")
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   961
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   962
  m_printer.AddPayloadPrinter (MakeCallback (&PacketHistoryTest::PrintPayload, this));
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   963
  m_printer.AddDefaultPrinter (MakeCallback (&PacketHistoryTest::PrintDefault, this));
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   964
}
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   965
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   966
PacketHistoryTest::~PacketHistoryTest ()
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   967
{}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   968
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
   969
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
   970
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
   971
PacketHistoryTest::RegisterHeader (void)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   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
  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
   974
  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
   975
    {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   976
      m_printer.AddPrinter (MakeCallback (&PacketHistoryTest::PrintHeader<N>, this),
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   977
                            MakeCallback (&PacketHistoryTest::PrintFragment, this));
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   978
      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
   979
    }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   980
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   981
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   982
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
   983
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
   984
PacketHistoryTest::RegisterTrailer (void)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   985
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   986
  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
   987
  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
   988
    {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   989
      m_printer.AddPrinter (MakeCallback (&PacketHistoryTest::PrintTrailer<N>, this),
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   990
                            MakeCallback (&PacketHistoryTest::PrintFragment, this));
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   991
      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
   992
    }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   993
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   994
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   995
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   996
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
   997
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
   998
PacketHistoryTest::PrintHeader (std::ostream &os, uint32_t packetUid, uint32_t size, 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   999
                                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
  1000
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1001
  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
  1002
    {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1003
      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
  1004
    }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1005
  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
  1006
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1007
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1008
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
  1009
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
  1010
PacketHistoryTest::PrintTrailer (std::ostream &os, uint32_t packetUid, uint32_t size, 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1011
                                 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
  1012
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1013
  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
  1014
    {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1015
      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
  1016
    }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1017
  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
  1018
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1019
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
  1020
PacketHistoryTest::PrintFragment (std::ostream &os,uint32_t packetUid,
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1021
                                  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
  1022
                                  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
  1023
{
813
0001e4abcf7b test fragments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 812
diff changeset
  1024
  m_prints.push_back (info.end - info.start);
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1025
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1026
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
  1027
PacketHistoryTest::PrintDefault (std::ostream& os,uint32_t packetUid,
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1028
                     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
  1029
                     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
  1030
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1031
  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
  1032
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1033
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
  1034
PacketHistoryTest::PrintPayload (std::ostream &os,uint32_t packetUid,
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1035
                                 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
  1036
                                 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
  1037
{
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1038
  m_prints.push_back (info.end - info.start);
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1039
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1040
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1041
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 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1043
PacketHistoryTest::CleanupPrints (void)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1044
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1045
  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
  1046
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1047
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1048
bool 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1049
PacketHistoryTest::CheckHistory (Packet p, char *file, int line, uint32_t n, ...)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1050
{
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
  1051
  m_headerError = false;
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1052
  m_trailerError = false;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1053
  va_list ap;
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1054
  p.Print (std::cerr, m_printer);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1055
  va_start (ap, n);
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1056
  if (m_headerError)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1057
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1058
      std::cout << "PacketHistory header error. file=" << file 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1059
                << ", line=" << line << std::endl;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1060
      return false;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1061
    }
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
  1062
  if (m_trailerError)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1063
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1064
      std::cout << "PacketHistory trailer error. file=" << file 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1065
                << ", line=" << line << std::endl;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1066
      return false;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1067
    }
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
  1068
  if (n != m_prints.size ())
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1069
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1070
      goto error;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1071
    }
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1072
  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
  1073
       i != m_prints.end (); i++)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1074
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1075
      int v = va_arg (ap, int);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1076
      if (v != *i)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1077
        {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1078
          va_end (ap);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1079
          goto error;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1080
        }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1081
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1082
  va_end (ap);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1083
  return true;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1084
 error:
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1085
  std::cout << "PacketHistory error. file="<< file 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1086
            << ", 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
  1087
  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
  1088
       i != m_prints.end (); i++)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1089
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1090
      std::cout << *i << ", ";
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1091
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1092
  std::cout << "\", expected: \"";
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1093
  va_start (ap, n);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1094
  for (uint32_t j = 0; j < n; j++)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1095
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1096
      int v = va_arg (ap, int);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1097
      std::cout << v << ", ";
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
  va_end (ap);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1100
  std::cout << "\"" << std::endl;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1101
  return false;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1102
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1103
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1104
#define ADD_HEADER(p, n)                        \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1105
  {                                             \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1106
    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
  1107
    RegisterHeader<n> ();                       \
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1108
    p.AddHeader (header);                       \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1109
  }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1110
#define ADD_TRAILER(p, n)                       \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1111
  {                                             \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1112
    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
  1113
    RegisterTrailer<n> ();                      \
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1114
    p.AddTrailer (trailer);                     \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1115
  }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1116
#define REM_HEADER(p, n)                        \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1117
  {                                             \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1118
    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
  1119
    RegisterHeader<n> ();                       \
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1120
    p.RemoveHeader (header);                    \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1121
  }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1122
#define REM_TRAILER(p, n)                       \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1123
  {                                             \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1124
    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
  1125
    RegisterTrailer<n> ();                      \
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1126
    p.RemoveTrailer (trailer);                  \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1127
  }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1128
#define CHECK_HISTORY(p, ...)                   \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1129
  {                                             \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1130
    if (!CheckHistory (p, __FILE__,             \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1131
                      __LINE__, __VA_ARGS__))   \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1132
      {                                         \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1133
        ok = false;                             \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1134
      }                                         \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1135
    CleanupPrints ();                           \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1136
  }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1137
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1138
bool
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1139
PacketHistoryTest::RunTests (void)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1140
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1141
  bool ok = true;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1142
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1143
  PacketHistory::Enable ();
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1144
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1145
  Packet p = Packet (0);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1146
  Packet p1 = Packet (0);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1147
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1148
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1149
  ADD_TRAILER (p, 100);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1150
  CHECK_HISTORY (p, 2, 10, 100);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1151
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1152
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1153
  ADD_HEADER (p, 1);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1154
  ADD_HEADER (p, 2);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1155
  ADD_HEADER (p, 3);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1156
  CHECK_HISTORY (p, 4, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1157
                 3, 2, 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1158
  ADD_HEADER (p, 5);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1159
  CHECK_HISTORY (p, 5, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1160
                 5, 3, 2, 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1161
  ADD_HEADER (p, 6);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1162
  CHECK_HISTORY (p, 6, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1163
                 6, 5, 3, 2, 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1164
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1165
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1166
  ADD_HEADER (p, 1);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1167
  ADD_HEADER (p, 2);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1168
  ADD_HEADER (p, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1169
  REM_HEADER (p, 3);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1170
  CHECK_HISTORY (p, 3, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1171
                 2, 1, 10);
789
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
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1174
  ADD_HEADER (p, 1);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1175
  ADD_HEADER (p, 2);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1176
  ADD_HEADER (p, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1177
  REM_HEADER (p, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1178
  REM_HEADER (p, 2);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1179
  CHECK_HISTORY (p, 2, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1180
                 1, 10);
789
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
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1183
  ADD_HEADER (p, 1);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1184
  ADD_HEADER (p, 2);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1185
  ADD_HEADER (p, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1186
  REM_HEADER (p, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1187
  REM_HEADER (p, 2);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1188
  REM_HEADER (p, 1);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1189
  CHECK_HISTORY (p, 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1190
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1191
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1192
  ADD_HEADER (p, 1);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1193
  ADD_HEADER (p, 2);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1194
  ADD_HEADER (p, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1195
  p1 = p;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1196
  REM_HEADER (p1, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1197
  REM_HEADER (p1, 2);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1198
  REM_HEADER (p1, 1);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1199
  CHECK_HISTORY (p1, 1, 10);
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1200
  CHECK_HISTORY (p, 4, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1201
                 3, 2, 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1202
  ADD_HEADER (p1, 1);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1203
  ADD_HEADER (p1, 2);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1204
  CHECK_HISTORY (p1, 3, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1205
                 2, 1, 10);
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1206
  CHECK_HISTORY (p, 4, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1207
                 3, 2, 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1208
  ADD_HEADER (p, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1209
  CHECK_HISTORY (p, 5, 
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1210
                 3, 3, 2, 1, 10);
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1211
  ADD_TRAILER (p, 4);
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1212
  CHECK_HISTORY (p, 6, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1213
                 3, 3, 2, 1, 10, 4);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1214
  ADD_TRAILER (p, 5);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1215
  CHECK_HISTORY (p, 7, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1216
                 3, 3, 2, 1, 10, 4, 5);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1217
  REM_HEADER (p, 3);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1218
  CHECK_HISTORY (p, 6, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1219
                 3, 2, 1, 10, 4, 5);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1220
  REM_TRAILER (p, 5);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1221
  CHECK_HISTORY (p, 5, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1222
                 3, 2, 1, 10, 4);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1223
  p1 = p;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1224
  REM_TRAILER (p, 4);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1225
  CHECK_HISTORY (p, 4, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1226
                 3, 2, 1, 10);
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1227
  CHECK_HISTORY (p1, 5, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1228
                 3, 2, 1, 10, 4);
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1229
  p1.RemoveAtStart (3);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1230
  CHECK_HISTORY (p1, 4, 
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1231
                 2, 1, 10, 4);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1232
  p1.RemoveAtStart (2);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1233
  CHECK_HISTORY (p1, 3, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1234
                 1, 10, 4);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1235
  p1.RemoveAtEnd (4);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1236
  CHECK_HISTORY (p1, 2, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1237
                 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1238
  p1.RemoveAtStart (1);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1239
  CHECK_HISTORY (p1, 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1240
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1241
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1242
  ADD_HEADER (p, 8);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1243
  ADD_TRAILER (p, 8);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1244
  ADD_TRAILER (p, 8);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1245
  p.RemoveAtStart (8+10+8);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1246
  CHECK_HISTORY (p, 1, 8);
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
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1249
  ADD_HEADER (p, 10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1250
  ADD_HEADER (p, 8);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1251
  ADD_TRAILER (p, 6);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1252
  ADD_TRAILER (p, 7);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1253
  ADD_TRAILER (p, 9);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1254
  p.RemoveAtStart (5);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1255
  p.RemoveAtEnd (12);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1256
  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
  1257
817
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1258
  p = Packet (10);
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1259
  ADD_HEADER (p, 10);
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1260
  ADD_TRAILER (p, 6);
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1261
  p.RemoveAtEnd (18);
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1262
  ADD_TRAILER (p, 5);
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1263
  ADD_HEADER (p, 3);
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1264
  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
  1265
  p.RemoveAtStart (12);
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1266
  CHECK_HISTORY (p, 1, 4);
818
1c6df07b7644 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 817
diff changeset
  1267
  p.RemoveAtEnd (2);
1c6df07b7644 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 817
diff changeset
  1268
  CHECK_HISTORY (p, 1, 2);
1c6df07b7644 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 817
diff changeset
  1269
  ADD_HEADER (p, 10);
1c6df07b7644 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 817
diff changeset
  1270
  CHECK_HISTORY (p, 2, 10, 2);
1c6df07b7644 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 817
diff changeset
  1271
  p.RemoveAtEnd (5);
1c6df07b7644 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 817
diff changeset
  1272
  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
  1273
820
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1274
  Packet p2 = Packet (0);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1275
  Packet p3 = Packet (0);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1276
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1277
  p = Packet (40);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1278
  ADD_HEADER (p, 5);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1279
  ADD_HEADER (p, 8);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1280
  p1 = p.CreateFragment (0, 5);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1281
  p2 = p.CreateFragment (5, 5);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1282
  p3 = p.CreateFragment (10, 43);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1283
  CHECK_HISTORY (p1, 1, 5);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1284
  CHECK_HISTORY (p2, 2, 3, 2);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1285
  CHECK_HISTORY (p3, 2, 3, 40);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1286
817
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1287
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1288
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1289
  return ok;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1290
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1291
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1292
static PacketHistoryTest g_packetHistoryTest;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1293
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1294
}//namespace ns3