src/common/packet-metadata.cc
author Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Sat, 31 May 2008 10:46:23 -0700
changeset 3198 dc084a4c70bb
parent 3053 a14d83bacc9c
child 3199 03265a7051b6
permissions -rw-r--r--
add logging, cleanup AddAtEnd.
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
 *
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
     5
 * 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
     6
 * 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
     7
 * published by the Free Software Foundation;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
     8
 *
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
     9
 * 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
    10
 * 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
    11
 * 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
    12
 * GNU General Public License for more details.
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    13
 *
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    14
 * 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
    15
 * 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
    16
 * 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
    17
 *
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    18
 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    19
 */
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    20
#include <utility>
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    21
#include <list>
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    22
#include "ns3/assert.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    23
#include "ns3/fatal-error.h"
1504
36ecc970ba96 checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents: 1232
diff changeset
    24
#include "ns3/log.h"
882
777fcfabc1c8 rename packet-history.h to packet-metadata.h
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 876
diff changeset
    25
#include "packet-metadata.h"
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    26
#include "buffer.h"
2645
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
    27
#include "header.h"
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
    28
#include "trailer.h"
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    29
1504
36ecc970ba96 checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents: 1232
diff changeset
    30
NS_LOG_COMPONENT_DEFINE ("PacketMetadata");
833
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
    31
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    32
namespace ns3 {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    33
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
    34
bool PacketMetadata::m_enable = false;
1525
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
    35
bool PacketMetadata::m_metadataSkipped = false;
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
    36
uint32_t PacketMetadata::m_maxSize = 0;
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
    37
uint16_t PacketMetadata::m_chunkUid = 0;
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
    38
PacketMetadata::DataFreeList PacketMetadata::m_freeList;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    39
957
426b85bab45f fix bug 57
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 907
diff changeset
    40
PacketMetadata::DataFreeList::~DataFreeList ()
426b85bab45f fix bug 57
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 907
diff changeset
    41
{
426b85bab45f fix bug 57
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 907
diff changeset
    42
  for (iterator i = begin (); i != end (); i++)
426b85bab45f fix bug 57
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 907
diff changeset
    43
    {
426b85bab45f fix bug 57
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 907
diff changeset
    44
      PacketMetadata::Deallocate (*i);
426b85bab45f fix bug 57
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 907
diff changeset
    45
    }
1700
2f03a3b8a225 Fix bug 80 (valgrind error when finalizing PacketMetadata).
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1528
diff changeset
    46
  PacketMetadata::m_enable = false;
957
426b85bab45f fix bug 57
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 907
diff changeset
    47
}
426b85bab45f fix bug 57
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 907
diff changeset
    48
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    49
void 
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
    50
PacketMetadata::Enable (void)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    51
{
1525
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
    52
  NS_ASSERT_MSG (!m_metadataSkipped,
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
    53
                 "Error: attempting to enable the packet metadata "
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
    54
                 "subsystem too late in the simulation, which is not allowed.\n"
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
    55
                 "A common cause for this problem is to enable ASCII tracing "
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
    56
                 "after sending any packets.  One way to fix this problem is "
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
    57
                 "to call ns3::PacketMetadata::Enable () near the beginning of"
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
    58
                 " the program, before any packets are sent.");
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    59
  m_enable = true;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    60
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    61
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    62
void
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
    63
PacketMetadata::ReserveCopy (uint32_t size)
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    64
{
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
    65
  struct PacketMetadata::Data *newData = PacketMetadata::Create (m_used + size);
836
f9f5f66013cc fix addition of a trailer or a header
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 835
diff changeset
    66
  memcpy (newData->m_data, m_data->m_data, m_used);
f9f5f66013cc fix addition of a trailer or a header
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 835
diff changeset
    67
  newData->m_dirtyEnd = m_used;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    68
  m_data->m_count--;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    69
  if (m_data->m_count == 0) 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    70
    {
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
    71
      PacketMetadata::Recycle (m_data);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    72
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    73
  m_data = newData;
844
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
    74
  if (m_head != 0xffff)
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
    75
    {
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
    76
      uint8_t *start;
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
    77
      NS_ASSERT (m_tail != 0xffff);
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
    78
      // clear the next field of the tail
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
    79
      start = &m_data->m_data[m_tail];
857
6f7593400c82 a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 856
diff changeset
    80
      Append16 (0xffff, start);
844
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
    81
      // clear the prev field of the head
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
    82
      start = &m_data->m_data[m_head] + 2;
857
6f7593400c82 a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 856
diff changeset
    83
      Append16 (0xffff, start);
844
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
    84
    }
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    85
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    86
void
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
    87
PacketMetadata::Reserve (uint32_t size)
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    88
{
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    89
  NS_ASSERT (m_data != 0);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    90
  if (m_data->m_size >= m_used + size &&
870
e335d37541c3 try alternative implementation of AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 869
diff changeset
    91
      (m_head == 0xffff ||
e335d37541c3 try alternative implementation of AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 869
diff changeset
    92
       m_data->m_count == 1 ||
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    93
       m_data->m_dirtyEnd == m_used))
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    94
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    95
      /* enough room, not dirty. */
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    96
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    97
  else 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    98
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
    99
      /* (enough room and dirty) or (not enough room) */
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   100
      ReserveCopy (size);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   101
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   102
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   103
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   104
uint32_t 
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   105
PacketMetadata::GetUleb128Size (uint32_t value) const
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   106
{
869
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   107
  if (value < 0x80)
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   108
    {
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   109
      return 1;
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   110
    }
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   111
  if (value < 0x4000)
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   112
    {
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   113
      return 2;
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   114
    }
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   115
  if (value < 0x200000)
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   116
    {
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   117
      return 3;
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   118
    }
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   119
  if (value < 0x10000000)
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   120
    {
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   121
      return 4;
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   122
    }
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   123
  return 5;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   124
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   125
uint32_t
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   126
PacketMetadata::ReadUleb128 (const uint8_t **pBuffer) const
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   127
{
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
   128
  const uint8_t *buffer = *pBuffer;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   129
  uint32_t result = 0;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   130
  uint8_t byte;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   131
  result = 0;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   132
  byte = buffer[0];
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   133
  result = (byte & (~0x80));
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   134
  if (!(byte & 0x80))
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   135
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   136
      *pBuffer = buffer + 1;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   137
      return result;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   138
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   139
  byte = buffer[1];
884
f3836277079e fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 883
diff changeset
   140
  result |= (byte & (~0x80)) << 7;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   141
  if (!(byte & 0x80))
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   142
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   143
      *pBuffer = buffer + 2;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   144
      return result;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   145
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   146
  byte = buffer[2];
884
f3836277079e fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 883
diff changeset
   147
  result |= (byte & (~0x80)) << 14;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   148
  if (!(byte & 0x80))
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   149
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   150
      *pBuffer = buffer + 3;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   151
      return result;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   152
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   153
  byte = buffer[3];
884
f3836277079e fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 883
diff changeset
   154
  result |= (byte & (~0x80)) << 21;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   155
  if (!(byte & 0x80))
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   156
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   157
      *pBuffer = buffer + 4;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   158
      return result;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   159
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   160
  byte = buffer[4];
884
f3836277079e fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 883
diff changeset
   161
  result |= (byte & (~0x80)) << 28;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   162
  if (!(byte & 0x80))
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   163
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   164
      *pBuffer = buffer + 5;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   165
      return result;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   166
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   167
  /* This means that the LEB128 number was not valid.
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   168
   * ie: the last (5th) byte did not have the high-order bit zeroed.
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   169
   */
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   170
  NS_ASSERT (false);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   171
  return 0;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   172
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   173
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   174
void
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   175
PacketMetadata::Append16 (uint16_t value, uint8_t *buffer)
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   176
{
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   177
  buffer[0] = value & 0xff;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   178
  value >>= 8;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   179
  buffer[1] = value;
857
6f7593400c82 a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 856
diff changeset
   180
}
3053
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   181
void
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   182
PacketMetadata::Append32 (uint32_t value,  uint8_t *buffer)
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   183
{
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   184
  buffer[0] = value & 0xff;
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   185
  buffer[1] = (value >> 8) & 0xff;
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   186
  buffer[2] = (value >> 16) & 0xff;
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   187
  buffer[3] = (value >> 24) & 0xff;
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   188
}
857
6f7593400c82 a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 856
diff changeset
   189
bool
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   190
PacketMetadata::TryToAppend16 (uint16_t value,  uint8_t **pBuffer, uint8_t *end)
873
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   191
{
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   192
  uint8_t *start = *pBuffer;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   193
  if (start + 1 < end)
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   194
    {
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   195
      start[0] = value & 0xff;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   196
      start[1] = value >> 8;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   197
      *pBuffer = start + 2;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   198
      return true;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   199
    }
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   200
  return false;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   201
}
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   202
bool
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   203
PacketMetadata::TryToAppend32 (uint32_t value,  uint8_t **pBuffer, uint8_t *end)
873
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   204
{
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   205
  uint8_t *start = *pBuffer;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   206
  if (start + 3 < end)
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   207
    {
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   208
      start[0] = value & 0xff;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   209
      start[1] = (value >> 8) & 0xff;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   210
      start[2] = (value >> 16) & 0xff;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   211
      start[3] = (value >> 24) & 0xff;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   212
      *pBuffer = start + 4;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   213
      return true;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   214
    }
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   215
  return false;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   216
}
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   217
bool
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   218
PacketMetadata::TryToAppend (uint32_t value, uint8_t **pBuffer, uint8_t *end)
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   219
{
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   220
  uint8_t *start = *pBuffer;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   221
  if (value < 0x80 && start < end)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   222
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   223
      start[0] = value;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   224
      *pBuffer = start + 1;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   225
      return true;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   226
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   227
  if (value < 0x4000 && start + 1 < end)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   228
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   229
      uint8_t byte = value & (~0x80);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   230
      start[0] = 0x80 | byte;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   231
      value >>= 7;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   232
      start[1] = value;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   233
      *pBuffer = start + 2;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   234
      return true;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   235
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   236
  if (value < 0x200000 && start + 2 < end)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   237
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   238
      uint8_t byte = value & (~0x80);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   239
      start[0] = 0x80 | byte;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   240
      value >>= 7;
869
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   241
      byte = value & (~0x80);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   242
      start[1] = 0x80 | byte;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   243
      value >>= 7;
869
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   244
      byte = value & (~0x80);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   245
      start[2] = value;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   246
      *pBuffer = start + 3;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   247
      return true;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   248
    }
869
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   249
  if (value < 0x10000000 && start + 3 < end)
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   250
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   251
      uint8_t byte = value & (~0x80);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   252
      start[0] = 0x80 | byte;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   253
      value >>= 7;
869
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   254
      byte = value & (~0x80);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   255
      start[1] = 0x80 | byte;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   256
      value >>= 7;
869
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   257
      byte = value & (~0x80);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   258
      start[2] = 0x80 | byte;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   259
      value >>= 7;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   260
      start[3] = value;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   261
      *pBuffer = start + 4;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   262
      return true;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   263
    }
869
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   264
  if (start + 4 < end)
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   265
    {
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   266
      uint8_t byte = value & (~0x80);
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   267
      start[0] = 0x80 | byte;
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   268
      value >>= 7;
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   269
      byte = value & (~0x80);
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   270
      start[1] = 0x80 | byte;
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   271
      value >>= 7;
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   272
      byte = value & (~0x80);
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   273
      start[2] = 0x80 | byte;
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   274
      value >>= 7;
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   275
      byte = value & (~0x80);
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   276
      start[3] = 0x80 | byte;
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   277
      value >>= 7;
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   278
      start[4] = value;
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   279
      *pBuffer = start + 5;
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   280
      return true;
652907a5e97d fix Append and optimize GetUleb128Size
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 867
diff changeset
   281
    }
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   282
  return false;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   283
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   284
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   285
void
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   286
PacketMetadata::AppendValueExtra (uint32_t value, uint8_t *buffer)
876
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   287
{
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   288
  if (value < 0x200000)
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   289
    {
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   290
      uint8_t byte = value & (~0x80);
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   291
      buffer[0] = 0x80 | byte;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   292
      value >>= 7;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   293
      byte = value & (~0x80);
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   294
      buffer[1] = 0x80 | byte;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   295
      value >>= 7;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   296
      byte = value & (~0x80);
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   297
      buffer[2] = value;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   298
      return;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   299
    }
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   300
  if (value < 0x10000000)
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   301
    {
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   302
      uint8_t byte = value & (~0x80);
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   303
      buffer[0] = 0x80 | byte;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   304
      value >>= 7;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   305
      byte = value & (~0x80);
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   306
      buffer[1] = 0x80 | byte;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   307
      value >>= 7;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   308
      byte = value & (~0x80);
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   309
      buffer[2] = 0x80 | byte;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   310
      value >>= 7;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   311
      buffer[3] = value;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   312
      return;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   313
    }
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   314
  {
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   315
    uint8_t byte = value & (~0x80);
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   316
    buffer[0] = 0x80 | byte;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   317
    value >>= 7;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   318
    byte = value & (~0x80);
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   319
    buffer[1] = 0x80 | byte;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   320
    value >>= 7;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   321
    byte = value & (~0x80);
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   322
    buffer[2] = 0x80 | byte;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   323
    value >>= 7;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   324
    byte = value & (~0x80);
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   325
    buffer[3] = 0x80 | byte;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   326
    value >>= 7;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   327
    buffer[4] = value;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   328
  }
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   329
}
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   330
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   331
void
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   332
PacketMetadata::AppendValue (uint32_t value, uint8_t *buffer)
876
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   333
{
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   334
  if (value < 0x80)
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   335
    {
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   336
      buffer[0] = value;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   337
      return;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   338
    }
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   339
  if (value < 0x4000)
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   340
    {
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   341
      uint8_t byte = value & (~0x80);
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   342
      buffer[0] = 0x80 | byte;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   343
      value >>= 7;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   344
      buffer[1] = value;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   345
      return;
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   346
    }
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   347
  AppendValueExtra (value, buffer);
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   348
}
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   349
850783184c36 add back optimization option
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 874
diff changeset
   350
void
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   351
PacketMetadata::UpdateTail (uint16_t written)
853
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   352
{
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   353
  NS_LOG_FUNCTION (this << written);
853
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   354
  if (m_head == 0xffff)
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   355
    {
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   356
      NS_ASSERT (m_tail == 0xffff);
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   357
      m_head = m_used;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   358
      m_tail = m_used;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   359
    } 
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   360
  else
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   361
    {
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   362
      NS_ASSERT (m_tail != 0xffff);
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   363
      // overwrite the next field of the previous tail of the list.
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   364
      uint8_t *previousTail = &m_data->m_data[m_tail];
857
6f7593400c82 a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 856
diff changeset
   365
      Append16 (m_used, previousTail);
853
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   366
      // update the tail of the list to the new node.
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   367
      m_tail = m_used;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   368
    }
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   369
  NS_ASSERT (m_tail != 0xffff);
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   370
  NS_ASSERT (m_head != 0xffff);
906
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   371
  NS_ASSERT (written >= 8);
853
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   372
  m_used += written;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   373
  m_data->m_dirtyEnd = m_used;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   374
}
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   375
863
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   376
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   377
void
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   378
PacketMetadata::UpdateHead (uint16_t written)
863
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   379
{
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   380
  NS_LOG_FUNCTION (this << written);
863
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   381
  if (m_head == 0xffff)
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   382
    {
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   383
      NS_ASSERT (m_tail == 0xffff);
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   384
      m_head = m_used;
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   385
      m_tail = m_used;
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   386
    } 
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   387
  else
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   388
    {
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   389
      NS_ASSERT (m_head != 0xffff);
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   390
      // overwrite the prev field of the previous head of the list.
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   391
      uint8_t *previousHead = &m_data->m_data[m_head + 2];
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   392
      Append16 (m_used, previousHead);
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   393
      // update the head of list to the new node.
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   394
      m_head = m_used;
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   395
    }
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   396
  NS_ASSERT (m_tail != 0xffff);
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   397
  NS_ASSERT (m_head != 0xffff);
906
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   398
  NS_ASSERT (written >= 8);
863
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   399
  m_used += written;
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   400
  m_data->m_dirtyEnd = m_used;
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   401
}
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   402
859
aa89ae478c3a remove Update call from within AddSmall and AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 858
diff changeset
   403
uint16_t
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   404
PacketMetadata::AddSmall (const struct PacketMetadata::SmallItem *item)
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   405
{
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   406
  NS_LOG_FUNCTION (this << item->next << item->prev << item->typeUid << item->size << item->chunkUid);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   407
  NS_ASSERT (m_data != 0);
905
a18fd9def067 fix basic tests, add new test, add a bunch of asserts, add XXX comment
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 904
diff changeset
   408
  NS_ASSERT (m_used != item->prev && m_used != item->next);
2877
1e8a42e5d4c1 fix bug 159
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2658
diff changeset
   409
  uint32_t typeUidSize = GetUleb128Size (item->typeUid);
1e8a42e5d4c1 fix bug 159
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2658
diff changeset
   410
  uint32_t sizeSize = GetUleb128Size (item->size);
3053
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   411
  uint32_t n =  2 + 2 + typeUidSize + sizeSize + 2;
3052
f64799121881 simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2983
diff changeset
   412
  if (m_used + n > m_data->m_size ||
f64799121881 simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2983
diff changeset
   413
      (m_head != 0xffff &&
f64799121881 simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2983
diff changeset
   414
       m_data->m_count != 1 &&
f64799121881 simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2983
diff changeset
   415
       m_used != m_data->m_dirtyEnd))
2877
1e8a42e5d4c1 fix bug 159
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2658
diff changeset
   416
    {
1e8a42e5d4c1 fix bug 159
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2658
diff changeset
   417
      ReserveCopy (n);
1e8a42e5d4c1 fix bug 159
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2658
diff changeset
   418
    }
3052
f64799121881 simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2983
diff changeset
   419
  uint8_t *buffer = &m_data->m_data[m_used];
f64799121881 simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2983
diff changeset
   420
  Append16 (item->next, buffer);
f64799121881 simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2983
diff changeset
   421
  buffer += 2;
f64799121881 simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2983
diff changeset
   422
  Append16 (item->prev, buffer);
f64799121881 simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2983
diff changeset
   423
  buffer += 2;
f64799121881 simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2983
diff changeset
   424
  AppendValue (item->typeUid, buffer);
f64799121881 simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2983
diff changeset
   425
  buffer += typeUidSize;
f64799121881 simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2983
diff changeset
   426
  AppendValue (item->size, buffer);
f64799121881 simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2983
diff changeset
   427
  buffer += sizeSize;
f64799121881 simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2983
diff changeset
   428
  Append16 (item->chunkUid, buffer);
2877
1e8a42e5d4c1 fix bug 159
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2658
diff changeset
   429
  return n;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   430
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   431
859
aa89ae478c3a remove Update call from within AddSmall and AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 858
diff changeset
   432
uint16_t
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   433
PacketMetadata::AddBig (uint32_t next, uint32_t prev, 
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   434
                       const PacketMetadata::SmallItem *item, 
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   435
                       const PacketMetadata::ExtraItem *extraItem)
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   436
{
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   437
  NS_LOG_FUNCTION (this << next << prev <<  
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   438
                   item->next << item->prev << item->typeUid << item->size << item->chunkUid <<
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   439
                   extraItem->fragmentStart << extraItem->fragmentEnd << extraItem->packetUid);
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   440
  NS_ASSERT (m_data != 0);
852
a1a3c9bdb7f4 fix a few bugs in ::RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 851
diff changeset
   441
  uint32_t typeUid = ((item->typeUid & 0x1) == 0x1)?item->typeUid:item->typeUid+1;
905
a18fd9def067 fix basic tests, add new test, add a bunch of asserts, add XXX comment
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 904
diff changeset
   442
  NS_ASSERT (m_used != prev && m_used != next);
3053
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   443
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   444
  uint32_t typeUidSize = GetUleb128Size (typeUid);
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   445
  uint32_t sizeSize = GetUleb128Size (item->size);
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   446
  uint32_t fragStartSize = GetUleb128Size (extraItem->fragmentStart);
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   447
  uint32_t fragEndSize = GetUleb128Size (extraItem->fragmentEnd);
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   448
  uint32_t n = 2 + 2 + typeUidSize + sizeSize + 2 + fragStartSize + fragEndSize + 4;
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   449
3053
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   450
  if (m_used + n > m_data->m_size ||
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   451
      (m_head != 0xffff &&
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   452
       m_data->m_count != 1 &&
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   453
       m_used != m_data->m_dirtyEnd))
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   454
    {
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   455
      ReserveCopy (n);
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   456
    }
860
3095d7275585 add counters
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 859
diff changeset
   457
3053
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   458
  uint8_t *buffer = &m_data->m_data[m_used];
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   459
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   460
  Append16 (next, buffer);
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   461
  buffer += 2;
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   462
  Append16 (prev, buffer);
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   463
  buffer += 2;
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   464
  AppendValue (typeUid, buffer);
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   465
  buffer += typeUidSize;
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   466
  AppendValue (item->size, buffer);
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   467
  buffer += sizeSize;
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   468
  Append16 (item->chunkUid, buffer);
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   469
  buffer += 2;
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   470
  AppendValue (extraItem->fragmentStart, buffer);
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   471
  buffer += fragStartSize;
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   472
  AppendValue (extraItem->fragmentEnd, buffer);
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   473
  buffer += fragEndSize;
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   474
  Append32 (extraItem->packetUid, buffer);
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   475
a14d83bacc9c simplify code logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3052
diff changeset
   476
  return n;
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   477
}
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   478
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   479
/**
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   480
 * \param item the item data to write
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   481
 * \param extraItem the extra item data to write
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   482
 * \param available the number of bytes which can 
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   483
 *        be written without having to rewrite the buffer entirely.
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   484
 *
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   485
 * XXX: should rewrite the code below to avoid using 
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   486
 * TryToAppend calls.
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   487
 */
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   488
void
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   489
PacketMetadata::ReplaceTail (PacketMetadata::SmallItem *item, 
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   490
                            PacketMetadata::ExtraItem *extraItem,
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   491
                            uint32_t available)
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   492
{
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   493
  NS_LOG_FUNCTION (this <<
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   494
                   item->next << item->prev << item->typeUid << item->size << item->chunkUid <<
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   495
                   extraItem->fragmentStart << extraItem->fragmentEnd << extraItem->packetUid <<
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   496
                   available);
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   497
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   498
  NS_ASSERT (m_data != 0);  
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   499
  if (m_tail + available == m_used &&
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   500
      m_used == m_data->m_dirtyEnd)
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   501
    {
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   502
      available = m_data->m_size - m_tail;
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   503
    }
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   504
873
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   505
  if (available >= 14 &&
856
007981962639 make all tests pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 855
diff changeset
   506
      m_data->m_count == 1)
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   507
    {
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   508
      uint8_t *buffer = &m_data->m_data[m_tail];
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   509
      uint8_t *end = buffer + available;
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   510
857
6f7593400c82 a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 856
diff changeset
   511
      Append16 (item->next, buffer);
6f7593400c82 a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 856
diff changeset
   512
      buffer += 2;
6f7593400c82 a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 856
diff changeset
   513
      Append16 (item->prev, buffer);
6f7593400c82 a few micro-optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 856
diff changeset
   514
      buffer += 2;
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   515
      if (TryToAppend (item->typeUid, &buffer, end) &&
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   516
          TryToAppend (item->size, &buffer, end) &&
873
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   517
          TryToAppend16 (item->chunkUid, &buffer, end) &&
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   518
          TryToAppend (extraItem->fragmentStart, &buffer, end) &&
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   519
          TryToAppend (extraItem->fragmentEnd, &buffer, end) &&
873
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   520
          TryToAppend32 (extraItem->packetUid, &buffer, end))
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   521
        {
856
007981962639 make all tests pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 855
diff changeset
   522
          m_used = buffer - &m_data->m_data[0];
007981962639 make all tests pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 855
diff changeset
   523
          m_data->m_dirtyEnd = m_used;
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   524
          return;
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   525
        }
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   526
    }
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   527
  
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   528
  // create a copy of the packet.
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   529
  PacketMetadata h (m_packetUid, 0);
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   530
  uint16_t current = m_head;
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   531
  while (current != 0xffff && current != m_tail)
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   532
    {
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   533
      struct PacketMetadata::SmallItem tmpItem;
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   534
      PacketMetadata::ExtraItem tmpExtraItem;
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   535
      ReadItems (current, &tmpItem, &tmpExtraItem);
867
e98cde9aae4a remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 866
diff changeset
   536
      uint16_t written = h.AddBig (0xffff, h.m_tail, 
e98cde9aae4a remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 866
diff changeset
   537
                                   &tmpItem, &tmpExtraItem);
863
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   538
      h.UpdateTail (written);
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   539
    }
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   540
  // append new tail.
867
e98cde9aae4a remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 866
diff changeset
   541
  uint16_t written = h.AddBig (0xffff, h.m_tail, item, extraItem);
863
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   542
  h.UpdateTail (written);
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   543
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   544
  *this = h;
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   545
}
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   546
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   547
/**
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   548
 * \param current the offset we should start reading the data from
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   549
 * \param item pointer to where we should store the data to return to the caller
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   550
 * \param extraItem pointer to where we should store the data to return to the caller
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   551
 * \returns the number of bytes read.
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   552
 */
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   553
uint32_t
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   554
PacketMetadata::ReadItems (uint16_t current, 
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   555
                          struct PacketMetadata::SmallItem *item,
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   556
                          struct PacketMetadata::ExtraItem *extraItem) const
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   557
{
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   558
  NS_LOG_FUNCTION (this << current);
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   559
  const uint8_t *buffer = &m_data->m_data[current];
865
7356a5847860 ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 864
diff changeset
   560
  item->next = buffer[0];
7356a5847860 ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 864
diff changeset
   561
  item->next |= (buffer[1]) << 8;
7356a5847860 ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 864
diff changeset
   562
  item->prev = buffer[2];
7356a5847860 ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 864
diff changeset
   563
  item->prev |= (buffer[3]) << 8;
7356a5847860 ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 864
diff changeset
   564
  buffer += 4;
7356a5847860 ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 864
diff changeset
   565
  item->typeUid = ReadUleb128 (&buffer);
7356a5847860 ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 864
diff changeset
   566
  item->size = ReadUleb128 (&buffer);
873
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   567
  item->chunkUid = buffer[0];
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   568
  item->chunkUid |= (buffer[1]) << 8;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   569
  buffer += 2;
865
7356a5847860 ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 864
diff changeset
   570
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   571
  bool isExtra = (item->typeUid & 0x1) == 0x1;
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   572
  if (isExtra)
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   573
    {
865
7356a5847860 ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 864
diff changeset
   574
      extraItem->fragmentStart = ReadUleb128 (&buffer);
7356a5847860 ReadItems does not depend on ReadSmall & ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 864
diff changeset
   575
      extraItem->fragmentEnd = ReadUleb128 (&buffer);
873
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   576
      extraItem->packetUid = buffer[0];
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   577
      extraItem->packetUid |= buffer[1] << 8;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   578
      extraItem->packetUid |= buffer[2] << 16;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   579
      extraItem->packetUid |= buffer[3] << 24;
2aab1eb32b12 store chunkUid and packetUid as fixed-size fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 872
diff changeset
   580
      buffer += 4;
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   581
    }
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   582
  else
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   583
    {
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   584
      extraItem->fragmentStart = 0;
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   585
      extraItem->fragmentEnd = item->size;
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   586
      extraItem->packetUid = m_packetUid;
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   587
    }
848
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
   588
  NS_ASSERT (buffer <= &m_data->m_data[m_data->m_size]);
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   589
  return buffer - &m_data->m_data[current];
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   590
}
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   591
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   592
struct PacketMetadata::Data *
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   593
PacketMetadata::Create (uint32_t size)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   594
{
1504
36ecc970ba96 checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents: 1232
diff changeset
   595
  NS_LOG_LOGIC ("create size="<<size<<", max="<<m_maxSize);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   596
  if (size > m_maxSize)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   597
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   598
      m_maxSize = size;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   599
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   600
  while (!m_freeList.empty ()) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   601
    {
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   602
      struct PacketMetadata::Data *data = m_freeList.back ();
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   603
      m_freeList.pop_back ();
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   604
      if (data->m_size >= size) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   605
        {
1504
36ecc970ba96 checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents: 1232
diff changeset
   606
          NS_LOG_LOGIC ("create found size="<<data->m_size);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   607
          data->m_count = 1;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   608
          return data;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   609
        }
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   610
      PacketMetadata::Deallocate (data);
1504
36ecc970ba96 checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents: 1232
diff changeset
   611
      NS_LOG_LOGIC ("create dealloc size="<<data->m_size);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   612
    }
1504
36ecc970ba96 checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents: 1232
diff changeset
   613
  NS_LOG_LOGIC ("create alloc size="<<m_maxSize);
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   614
  return PacketMetadata::Allocate (m_maxSize);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   615
}
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
void
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   618
PacketMetadata::Recycle (struct PacketMetadata::Data *data)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   619
{
1700
2f03a3b8a225 Fix bug 80 (valgrind error when finalizing PacketMetadata).
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1528
diff changeset
   620
  if (!m_enable)
2f03a3b8a225 Fix bug 80 (valgrind error when finalizing PacketMetadata).
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1528
diff changeset
   621
    {
2f03a3b8a225 Fix bug 80 (valgrind error when finalizing PacketMetadata).
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1528
diff changeset
   622
      PacketMetadata::Deallocate (data);
2f03a3b8a225 Fix bug 80 (valgrind error when finalizing PacketMetadata).
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1528
diff changeset
   623
      return;
2f03a3b8a225 Fix bug 80 (valgrind error when finalizing PacketMetadata).
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1528
diff changeset
   624
    } 
1504
36ecc970ba96 checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents: 1232
diff changeset
   625
  NS_LOG_LOGIC ("recycle size="<<data->m_size<<", list="<<m_freeList.size ());
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   626
  NS_ASSERT (data->m_count == 0);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   627
  if (m_freeList.size () > 1000 ||
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   628
      data->m_size < m_maxSize) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   629
    {
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   630
      PacketMetadata::Deallocate (data);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   631
    } 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   632
  else 
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
      m_freeList.push_back (data);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   635
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   636
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   637
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   638
struct PacketMetadata::Data *
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   639
PacketMetadata::Allocate (uint32_t n)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   640
{
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   641
  uint32_t size = sizeof (struct Data);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   642
  if (n <= 10)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   643
    {
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   644
      n = 10;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   645
    }
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   646
  size += n - 10;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   647
  uint8_t *buf = new uint8_t [size];
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   648
  struct PacketMetadata::Data *data = (struct PacketMetadata::Data *)buf;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   649
  data->m_size = n;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   650
  data->m_count = 1;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   651
  data->m_dirtyEnd = 0;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   652
  return data;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   653
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   654
void 
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   655
PacketMetadata::Deallocate (struct PacketMetadata::Data *data)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   656
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   657
  uint8_t *buf = (uint8_t *)data;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   658
  delete [] buf;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   659
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   660
791
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   661
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   662
PacketMetadata 
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   663
PacketMetadata::CreateFragment (uint32_t start, uint32_t end) const
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   664
{
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   665
  PacketMetadata fragment = *this;
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   666
  fragment.RemoveAtStart (start);
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   667
  fragment.RemoveAtEnd (end);
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   668
  return fragment;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   669
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   670
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   671
void 
2645
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
   672
PacketMetadata::AddHeader (const Header &header, uint32_t size)
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
   673
{
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
   674
  uint32_t uid = header.GetInstanceTypeId ().GetUid () << 1;
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
   675
  DoAddHeader (uid, size);
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
   676
}
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
   677
void
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   678
PacketMetadata::DoAddHeader (uint32_t uid, uint32_t size)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   679
{
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   680
  NS_LOG_FUNCTION (this << uid << size);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   681
  if (!m_enable)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   682
    {
1525
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
   683
      m_metadataSkipped = true;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   684
      return;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   685
    }
1528
88b002771286 Add a couple of NS_LOG_PARAM calls for debugging.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1525
diff changeset
   686
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   687
  struct PacketMetadata::SmallItem item;
862
4add4fe2020f simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 861
diff changeset
   688
  item.next = m_head;
4add4fe2020f simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 861
diff changeset
   689
  item.prev = 0xffff;
4add4fe2020f simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 861
diff changeset
   690
  item.typeUid = uid;
4add4fe2020f simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 861
diff changeset
   691
  item.size = size;
4add4fe2020f simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 861
diff changeset
   692
  item.chunkUid = m_chunkUid;
4add4fe2020f simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 861
diff changeset
   693
  m_chunkUid++;
4add4fe2020f simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 861
diff changeset
   694
  uint16_t written = AddSmall (&item);
863
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   695
  UpdateHead (written);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   696
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   697
void 
2645
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
   698
PacketMetadata::RemoveHeader (const Header &header, uint32_t size)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   699
{
2645
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
   700
  uint32_t uid = header.GetInstanceTypeId ().GetUid () << 1;
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   701
  NS_LOG_FUNCTION (this << uid << size);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   702
  if (!m_enable) 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   703
    {
1525
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
   704
      m_metadataSkipped = true;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   705
      return;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   706
    }
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   707
  struct PacketMetadata::SmallItem item;
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   708
  struct PacketMetadata::ExtraItem extraItem;
906
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   709
  uint32_t read = ReadItems (m_head, &item, &extraItem);
843
b6670a38f2e8 the mask to filter out the low bit is 0xfe, not 0xfd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 842
diff changeset
   710
  if ((item.typeUid & 0xfffffffe) != uid ||
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   711
      item.size != size)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   712
    {
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   713
      NS_FATAL_ERROR ("Removing unexpected header.");
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   714
    }
866
7880ebff9969 remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 865
diff changeset
   715
  else if (item.typeUid != uid &&
7880ebff9969 remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 865
diff changeset
   716
           (extraItem.fragmentStart != 0 ||
7880ebff9969 remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 865
diff changeset
   717
            extraItem.fragmentEnd != size))
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   718
    {
866
7880ebff9969 remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 865
diff changeset
   719
      NS_FATAL_ERROR ("Removing incomplete header.");
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   720
    }
906
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   721
  if (m_head + read == m_used)
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   722
    {
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   723
      m_used = m_head;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   724
    }
2658
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   725
  if (m_head == m_tail)
906
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   726
    {
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   727
      m_head = 0xffff;
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   728
      m_tail = 0xffff;
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   729
    }
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   730
  else
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   731
    {
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   732
      m_head = item.next;
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   733
    }
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   734
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   735
void 
2645
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
   736
PacketMetadata::AddTrailer (const Trailer &trailer, uint32_t size)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   737
{
2645
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
   738
  uint32_t uid = trailer.GetInstanceTypeId ().GetUid () << 1;
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   739
  NS_LOG_FUNCTION (this << uid << size);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   740
  if (!m_enable)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   741
    {
1525
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
   742
      m_metadataSkipped = true;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   743
      return;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   744
    }
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   745
  struct PacketMetadata::SmallItem item;
862
4add4fe2020f simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 861
diff changeset
   746
  item.next = 0xffff;
4add4fe2020f simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 861
diff changeset
   747
  item.prev = m_tail;
4add4fe2020f simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 861
diff changeset
   748
  item.typeUid = uid;
4add4fe2020f simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 861
diff changeset
   749
  item.size = size;
4add4fe2020f simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 861
diff changeset
   750
  item.chunkUid = m_chunkUid;
4add4fe2020f simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 861
diff changeset
   751
  m_chunkUid++;
4add4fe2020f simplify a bit the small item logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 861
diff changeset
   752
  uint16_t written = AddSmall (&item);
863
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   753
  UpdateTail (written);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   754
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   755
void 
2645
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
   756
PacketMetadata::RemoveTrailer (const Trailer &trailer, uint32_t size)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   757
{
2645
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
   758
  uint32_t uid = trailer.GetInstanceTypeId ().GetUid () << 1;
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   759
  NS_LOG_FUNCTION (this << uid << size);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   760
  if (!m_enable) 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   761
    {
1525
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
   762
      m_metadataSkipped = true;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   763
      return;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   764
    }
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   765
  struct PacketMetadata::SmallItem item;
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   766
  struct PacketMetadata::ExtraItem extraItem;
906
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   767
  uint32_t read = ReadItems (m_tail, &item, &extraItem);
843
b6670a38f2e8 the mask to filter out the low bit is 0xfe, not 0xfd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 842
diff changeset
   768
  if ((item.typeUid & 0xfffffffe) != uid ||
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   769
      item.size != size)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   770
    {
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   771
      NS_FATAL_ERROR ("Removing unexpected trailer.");
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   772
    }
866
7880ebff9969 remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 865
diff changeset
   773
  else if (item.typeUid != uid &&
7880ebff9969 remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 865
diff changeset
   774
           (extraItem.fragmentStart != 0 ||
7880ebff9969 remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 865
diff changeset
   775
            extraItem.fragmentEnd != size))
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   776
    {
866
7880ebff9969 remove ReadSmall and ReadExtra
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 865
diff changeset
   777
      NS_FATAL_ERROR ("Removing incomplete trailer.");
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   778
    }
906
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   779
  if (m_tail + read == m_used)
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   780
    {
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   781
      m_used = m_tail;
906
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   782
    }  
2658
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   783
  if (m_head == m_tail)
906
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   784
    {
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   785
      m_head = 0xffff;
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   786
      m_tail = 0xffff;
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   787
    }
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   788
  else
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   789
    {
459b7a591892 more asserts, add failing tests, fix them
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 905
diff changeset
   790
      m_tail = item.prev;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   791
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   792
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   793
void
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   794
PacketMetadata::AddAtEnd (PacketMetadata const&o)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   795
{
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   796
  NS_LOG_FUNCTION (this << &o);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   797
  if (!m_enable) 
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   798
    {
1525
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
   799
      m_metadataSkipped = true;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   800
      return;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   801
    }
872
cd19d2692521 unconditionally set m_data
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 870
diff changeset
   802
  if (m_tail == 0xffff)
853
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   803
    {
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   804
      // We have no items so 'AddAtEnd' is 
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   805
      // equivalent to self-assignment.
853
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   806
      *this = o;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   807
      return;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   808
    }
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   809
  NS_ASSERT (m_head != 0xffff && m_tail != 0xffff);
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   810
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   811
  // We read the current tail because we are going to append
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   812
  // after this item.
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   813
  struct PacketMetadata::SmallItem tailItem;
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   814
  PacketMetadata::ExtraItem tailExtraItem;
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   815
  uint32_t tailSize = ReadItems (m_tail, &tailItem, &tailExtraItem);
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   816
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   817
  uint16_t current;
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   818
  struct PacketMetadata::SmallItem item;
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   819
  PacketMetadata::ExtraItem extraItem;
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   820
  o.ReadItems (o.m_head, &item, &extraItem);
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   821
  if (extraItem.packetUid == tailExtraItem.packetUid &&
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   822
      item.typeUid == tailItem.typeUid &&
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   823
      item.chunkUid == tailItem.chunkUid &&
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   824
      item.size == tailItem.size &&
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   825
      extraItem.fragmentStart == tailExtraItem.fragmentEnd)
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   826
    {
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   827
      /* If the previous tail came from the same header as
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   828
       * the next item we want to append to our array, then, 
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   829
       * we merge them and attempt to reuse the previous tail's
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   830
       * location.
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   831
       */
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   832
      tailExtraItem.fragmentEnd = extraItem.fragmentEnd;
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   833
      // XXX This call might be wrong. 
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   834
      ReplaceTail (&tailItem, &tailExtraItem, tailSize);
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   835
      current = item.next;
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   836
    }
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   837
  else
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   838
    {
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   839
      current = o.m_head;
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   840
    }
853
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   841
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   842
  /* Now that we have merged our current tail with the head of the
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   843
   * next packet, we just append all items from the next packet
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   844
   * to the current packet.
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   845
   */
853
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   846
  while (current != 0xffff)
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   847
    {
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   848
      o.ReadItems (current, &item, &extraItem);
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   849
      uint16_t written = AddBig (0xffff, m_tail, &item, &extraItem);
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   850
      UpdateTail (written);
853
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   851
      if (current == o.m_tail)
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   852
        {
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   853
          break;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   854
        }
856
007981962639 make all tests pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 855
diff changeset
   855
      current = item.next;
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   856
    }
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   857
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   858
void
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   859
PacketMetadata::AddPaddingAtEnd (uint32_t end)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   860
{
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   861
  if (!m_enable)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   862
    {
1525
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
   863
      m_metadataSkipped = true;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   864
      return;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   865
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   866
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   867
void 
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   868
PacketMetadata::RemoveAtStart (uint32_t start)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   869
{
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   870
  NS_LOG_FUNCTION (this << start);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   871
  if (!m_enable) 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   872
    {
1525
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
   873
      m_metadataSkipped = true;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   874
      return;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   875
    }
872
cd19d2692521 unconditionally set m_data
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 870
diff changeset
   876
  NS_ASSERT (m_data != 0);
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   877
  uint32_t leftToRemove = start;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   878
  uint16_t current = m_head;
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   879
  while (current != 0xffff && leftToRemove > 0)
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   880
    {
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   881
      struct PacketMetadata::SmallItem item;
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   882
      PacketMetadata::ExtraItem extraItem;
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   883
      ReadItems (current, &item, &extraItem);
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   884
      uint32_t itemRealSize = extraItem.fragmentEnd - extraItem.fragmentStart;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   885
      if (itemRealSize <= leftToRemove)
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   886
        {
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   887
          // remove from list.
2658
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   888
          if (m_head == m_tail)
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   889
            {
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   890
              m_head = 0xffff;
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   891
              m_tail = 0xffff;
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   892
            }
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   893
          else
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   894
            {
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   895
              m_head = item.next;
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   896
            }
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   897
          leftToRemove -= itemRealSize;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   898
        }
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   899
      else
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   900
        {
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   901
          // fragment the list item.
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   902
          PacketMetadata fragment (m_packetUid, 0);
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   903
          extraItem.fragmentStart += leftToRemove;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   904
          leftToRemove = 0;
867
e98cde9aae4a remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 866
diff changeset
   905
          uint16_t written = fragment.AddBig (0xffff, fragment.m_tail,
e98cde9aae4a remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 866
diff changeset
   906
                                              &item, &extraItem);
863
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   907
          fragment.UpdateTail (written);
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   908
          current = item.next;
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   909
          while (current != 0xffff)
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   910
            {
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   911
              ReadItems (current, &item, &extraItem);
867
e98cde9aae4a remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 866
diff changeset
   912
              written = fragment.AddBig (0xffff, fragment.m_tail,
e98cde9aae4a remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 866
diff changeset
   913
                                         &item, &extraItem);
863
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   914
              fragment.UpdateTail (written);
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   915
              if (current == m_tail)
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   916
                {
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   917
                  break;
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   918
                }
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   919
              current = item.next;
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   920
            }
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   921
          *this = fragment;
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   922
        }
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   923
      NS_ASSERT (item.size >= extraItem.fragmentEnd - extraItem.fragmentStart &&
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   924
                 extraItem.fragmentStart <= extraItem.fragmentEnd);
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   925
      if (current == m_tail)
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   926
        {
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   927
          break;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   928
        }
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   929
      current = item.next;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   930
    }
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   931
  NS_ASSERT (leftToRemove == 0);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   932
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   933
void 
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   934
PacketMetadata::RemoveAtEnd (uint32_t end)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   935
{
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
   936
  NS_LOG_FUNCTION (this << end);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   937
  if (!m_enable) 
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   938
    {
1525
648048bca501 Check for the common error of enabling packet metadata in the middle of a simulation, and give appropriate advice in this case. Closes #78.
Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
parents: 1504
diff changeset
   939
      m_metadataSkipped = true;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   940
      return;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   941
    }
872
cd19d2692521 unconditionally set m_data
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 870
diff changeset
   942
  NS_ASSERT (m_data != 0);
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   943
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   944
  uint32_t leftToRemove = end;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   945
  uint16_t current = m_tail;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   946
  while (current != 0xffff && leftToRemove > 0)
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   947
    {
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   948
      struct PacketMetadata::SmallItem item;
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   949
      PacketMetadata::ExtraItem extraItem;
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   950
      ReadItems (current, &item, &extraItem);
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   951
      uint32_t itemRealSize = extraItem.fragmentEnd - extraItem.fragmentStart;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   952
      if (itemRealSize <= leftToRemove)
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   953
        {
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   954
          // remove from list.
2658
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   955
          if (m_head == m_tail)
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   956
            {
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   957
              m_head = 0xffff;
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   958
              m_tail = 0xffff;
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   959
            }
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   960
          else
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   961
            {
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   962
              m_tail = item.prev;
4885203b7855 fix failing tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2654
diff changeset
   963
            }
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   964
          leftToRemove -= itemRealSize;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   965
        }
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   966
      else
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   967
        {
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   968
          // fragment the list item.
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
   969
          PacketMetadata fragment (m_packetUid, 0);
851
ce4de5a9dcd0 remove data from end of trailer, not start of header
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 850
diff changeset
   970
          NS_ASSERT (extraItem.fragmentEnd > leftToRemove);
ce4de5a9dcd0 remove data from end of trailer, not start of header
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 850
diff changeset
   971
          extraItem.fragmentEnd -= leftToRemove;
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   972
          leftToRemove = 0;
867
e98cde9aae4a remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 866
diff changeset
   973
          uint16_t written = fragment.AddBig (fragment.m_head, 0xffff,
e98cde9aae4a remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 866
diff changeset
   974
                                              &item, &extraItem);
863
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   975
          fragment.UpdateHead (written);
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   976
          current = item.prev;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   977
          while (current != 0xffff)
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   978
            {
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   979
              ReadItems (current, &item, &extraItem);
867
e98cde9aae4a remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 866
diff changeset
   980
              written = fragment.AddBig (fragment.m_head, 0xffff,
e98cde9aae4a remove atStart arg to AddBig
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 866
diff changeset
   981
                                         &item, &extraItem);
863
768945a45089 Update -> UpdateHead + UpdateTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 862
diff changeset
   982
              fragment.UpdateHead (written);
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   983
              if (current == m_head)
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   984
                {
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   985
                  break;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   986
                }
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   987
              current = item.prev;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   988
            }
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   989
          *this = fragment;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   990
        }
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   991
      NS_ASSERT (item.size >= extraItem.fragmentEnd - extraItem.fragmentStart &&
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   992
                 extraItem.fragmentStart <= extraItem.fragmentEnd);
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   993
      if (current == m_head)
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   994
        {
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   995
          break;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   996
        }
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   997
      current = item.prev;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   998
    }
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   999
  NS_ASSERT (leftToRemove == 0);
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1000
}
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1001
uint32_t
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
  1002
PacketMetadata::GetTotalSize (void) const
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1003
{
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1004
  uint32_t totalSize = 0;
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
  1005
  uint16_t current = m_head;
841
83a5df185d90 fix the list iteration logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 840
diff changeset
  1006
  uint16_t tail = m_tail;
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1007
  while (current != 0xffff)
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1008
    {
883
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
  1009
      struct PacketMetadata::SmallItem item;
4d2da35c09b0 PacketHistory -> PacketMetadata
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 882
diff changeset
  1010
      PacketMetadata::ExtraItem extraItem;
850
470258d962cc simplify GetTotalSize
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 849
diff changeset
  1011
      ReadItems (current, &item, &extraItem);
470258d962cc simplify GetTotalSize
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 849
diff changeset
  1012
      totalSize += extraItem.fragmentEnd - extraItem.fragmentStart;
841
83a5df185d90 fix the list iteration logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 840
diff changeset
  1013
      if (current == tail)
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1014
        {
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1015
          break;
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1016
        }
904
baa02d31c1ff add failing assert
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 900
diff changeset
  1017
      NS_ASSERT (current != item.next);
841
83a5df185d90 fix the list iteration logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 840
diff changeset
  1018
      current = item.next;
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1019
    }
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1020
  return totalSize;
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1021
}
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1022
887
acd1bbdf4f2f avoid duplicating the packet uid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 884
diff changeset
  1023
uint32_t 
acd1bbdf4f2f avoid duplicating the packet uid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 884
diff changeset
  1024
PacketMetadata::GetUid (void) const
acd1bbdf4f2f avoid duplicating the packet uid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 884
diff changeset
  1025
{
acd1bbdf4f2f avoid duplicating the packet uid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 884
diff changeset
  1026
  return m_packetUid;
acd1bbdf4f2f avoid duplicating the packet uid
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 884
diff changeset
  1027
}
2639
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1028
PacketMetadata::ItemIterator 
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1029
PacketMetadata::BeginItem (Buffer buffer) const
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1030
{
2639
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1031
  return ItemIterator (this, buffer);
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1032
}
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1033
PacketMetadata::ItemIterator::ItemIterator (const PacketMetadata *metadata, Buffer buffer)
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1034
  : m_metadata (metadata),
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1035
    m_buffer (buffer),
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1036
    m_current (metadata->m_head),
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1037
    m_offset (0),
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1038
    m_hasReadTail (false)
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1039
{}
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1040
bool 
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1041
PacketMetadata::ItemIterator::HasNext (void) const
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1042
{
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1043
  if (m_current == 0xffff)
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1044
    {
2639
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1045
      return false;
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1046
    }
2639
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1047
  if (m_hasReadTail)
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1048
    {
2639
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1049
      return false;
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1050
    }
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1051
  return true;
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1052
}
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1053
PacketMetadata::Item
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1054
PacketMetadata::ItemIterator::Next (void)
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1055
{
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1056
  struct PacketMetadata::Item item;
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1057
  struct PacketMetadata::SmallItem smallItem;
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1058
  struct PacketMetadata::ExtraItem extraItem;
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1059
  m_metadata->ReadItems (m_current, &smallItem, &extraItem);
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1060
  if (m_current == m_metadata->m_tail)
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1061
    {
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1062
      m_hasReadTail = true;
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1063
    }
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1064
  m_current = smallItem.next;
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1065
  uint32_t uid = (smallItem.typeUid & 0xfffffffe) >> 1;
2647
3e9474e1d77b implement Packet::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2645
diff changeset
  1066
  item.tid.SetUid (uid);
2639
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1067
  item.currentTrimedFromStart = extraItem.fragmentStart;
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1068
  item.currentTrimedFromEnd = extraItem.fragmentEnd - smallItem.size;
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1069
  item.currentSize = extraItem.fragmentEnd - extraItem.fragmentStart;
2654
4fe950c01030 fragmentEnd is not zero when this is a fragment.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2647
diff changeset
  1070
  if (extraItem.fragmentStart != 0 || extraItem.fragmentEnd != smallItem.size)
2639
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1071
    {
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1072
      item.isFragment = true;
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1073
    }
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1074
  else
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1075
    {
2639
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1076
      item.isFragment = false;
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1077
    }
2645
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
  1078
  TypeId tid;
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
  1079
  tid.SetUid (uid);
2639
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1080
  if (uid == 0)
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1081
    {
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1082
      item.type = PacketMetadata::Item::PAYLOAD;
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1083
    }
2645
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
  1084
  else if (tid.IsChildOf (Header::GetTypeId ()))
2639
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1085
    {
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1086
      item.type = PacketMetadata::Item::HEADER;
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1087
      if (!item.isFragment)
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1088
        {
2639
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1089
          ns3::Buffer::Iterator j = m_buffer.Begin ();
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1090
          j.Next (m_offset);
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1091
          item.current = j;
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1092
        }
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1093
    }
2645
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
  1094
  else if (tid.IsChildOf (Trailer::GetTypeId ()))
2639
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1095
    {
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1096
      item.type = PacketMetadata::Item::TRAILER;
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1097
      if (!item.isFragment)
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1098
        {
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1099
          ns3::Buffer::Iterator j = m_buffer.End ();
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1100
          j.Prev (m_buffer.GetSize () - (m_offset + smallItem.size));
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1101
          item.current = j;
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1102
        }
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1103
    }
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1104
  else 
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1105
    {
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1106
      NS_ASSERT (false);
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1107
    }
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1108
  m_offset += extraItem.fragmentEnd - extraItem.fragmentStart;
588221b7f892 replace PacketPrinter with an iterator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1828
diff changeset
  1109
  return item;
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1110
}
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1111
1143
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1112
uint32_t 
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1113
PacketMetadata::GetSerializedSize (void) const
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1114
{
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
  1115
  NS_LOG_FUNCTION (this);
1143
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1116
  uint32_t totalSize = 0;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1117
  totalSize += 4;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1118
  if (!m_enable)
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1119
    {
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1120
      return totalSize;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1121
    }
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1122
  struct PacketMetadata::SmallItem item;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1123
  struct PacketMetadata::ExtraItem extraItem;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1124
  uint32_t current = m_head;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1125
  while (current != 0xffff)
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1126
    {
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1127
      ReadItems (current, &item, &extraItem);
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1128
      uint32_t uid = (item.typeUid & 0xfffffffe) >> 1;
1149
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1129
      if (uid == 0)
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1130
        {
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1131
          totalSize += 4;
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1132
        }
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1133
      else
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1134
        {
2645
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
  1135
          TypeId tid;
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
  1136
          tid.SetUid (uid);
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
  1137
          totalSize += 4 + tid.GetName ().size ();
1149
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1138
        }
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1139
      totalSize += 1 + 4 + 2 + 4 + 4 + 4;
1143
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1140
      if (current == m_tail)
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1141
        {
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1142
          break;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1143
        }
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1144
      NS_ASSERT (current != item.next);
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1145
      current = item.next;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1146
    }
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1147
  return totalSize;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1148
}
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1149
void 
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1150
PacketMetadata::Serialize (Buffer::Iterator i, uint32_t size) const
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1151
{
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
  1152
  NS_LOG_FUNCTION (this);
1143
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1153
  uint32_t bytesWritten = 0;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1154
  i.WriteU32 (size);
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1155
  bytesWritten += 4;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1156
  struct PacketMetadata::SmallItem item;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1157
  struct PacketMetadata::ExtraItem extraItem;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1158
  uint32_t current = m_head;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1159
  while (current != 0xffff)
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1160
    {
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1161
      ReadItems (current, &item, &extraItem);
1504
36ecc970ba96 checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents: 1232
diff changeset
  1162
      NS_LOG_LOGIC ("bytesWritten=" << bytesWritten << ", typeUid="<<
36ecc970ba96 checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents: 1232
diff changeset
  1163
        item.typeUid << ", size="<<item.size<<", chunkUid="<<item.chunkUid<<
36ecc970ba96 checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents: 1232
diff changeset
  1164
        ", fragmentStart="<<extraItem.fragmentStart<<", fragmentEnd="<<
36ecc970ba96 checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents: 1232
diff changeset
  1165
        extraItem.fragmentEnd<< ", packetUid="<<extraItem.packetUid);
1143
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1166
      uint32_t uid = (item.typeUid & 0xfffffffe) >> 1;
1149
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1167
      if (uid != 0)
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1168
        {
2645
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
  1169
          TypeId tid;
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
  1170
          tid.SetUid (uid);
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
  1171
          std::string uidString = tid.GetName ();
1149
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1172
          i.WriteU32 (uidString.size ());
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1173
          bytesWritten += 4;
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1174
          i.Write ((uint8_t *)uidString.c_str (), uidString.size ());
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1175
          bytesWritten += uidString.size ();
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1176
        }
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1177
      else
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1178
        {
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1179
          i.WriteU32 (0);
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1180
          bytesWritten += 4;
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1181
        }
1143
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1182
      uint8_t isBig = item.typeUid & 0x1;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1183
      i.WriteU8 (isBig);
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1184
      bytesWritten += 1;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1185
      i.WriteU32 (item.size);
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1186
      bytesWritten += 4;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1187
      i.WriteU16 (item.chunkUid);
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1188
      bytesWritten += 2;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1189
      i.WriteU32 (extraItem.fragmentStart);
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1190
      bytesWritten += 4;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1191
      i.WriteU32 (extraItem.fragmentEnd);
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1192
      bytesWritten += 4;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1193
      i.WriteU32 (extraItem.packetUid);
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1194
      bytesWritten += 4;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1195
      if (current == m_tail)
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1196
        {
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1197
          break;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1198
        }
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1199
      
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1200
      NS_ASSERT (current != item.next);
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1201
      current = item.next;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1202
    }
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1203
  NS_ASSERT (bytesWritten == size);
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1204
}
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1205
uint32_t 
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1206
PacketMetadata::Deserialize (Buffer::Iterator i)
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1207
{
3198
dc084a4c70bb add logging, cleanup AddAtEnd.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 3053
diff changeset
  1208
  NS_LOG_FUNCTION (this);
1143
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1209
  struct PacketMetadata::SmallItem item;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1210
  struct PacketMetadata::ExtraItem extraItem;
1149
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1211
  uint32_t totalSize = i.ReadU32 ();
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1212
  uint32_t size = totalSize;
1143
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1213
  size -= 4;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1214
  while (size > 0)
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1215
    {
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1216
      uint32_t uidStringSize = i.ReadU32 ();
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1217
      size -= 4;
1149
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1218
      uint32_t uid;
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1219
      if (uidStringSize == 0)
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1220
        {
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1221
          // uid zero for payload.
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1222
          uid = 0;
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1223
        }
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1224
      else
1143
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1225
        {
1149
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1226
          std::string uidString;
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1227
          for (uint32_t j = 0; j < uidStringSize; j++)
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1228
            {
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1229
              uidString.push_back (i.ReadU8 ());
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1230
              size --;
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1231
            }
2645
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
  1232
          TypeId tid = TypeId::LookupByName (uidString);
139b2dec56c0 stop using ChunkRegistry to get header and trailer uids
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 2639
diff changeset
  1233
          uid = tid.GetUid ();
1143
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1234
        }
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1235
      uint8_t isBig = i.ReadU8 ();
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1236
      size --;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1237
      item.typeUid = (uid << 1) | isBig;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1238
      item.size = i.ReadU32 ();
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1239
      size -= 4;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1240
      item.chunkUid = i.ReadU16 ();
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1241
      size -= 2;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1242
      extraItem.fragmentStart = i.ReadU32 ();
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1243
      size -= 4;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1244
      extraItem.fragmentEnd = i.ReadU32 ();
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1245
      size -= 4;
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1246
      extraItem.packetUid = i.ReadU32 ();
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1247
      size -= 4;
1504
36ecc970ba96 checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents: 1232
diff changeset
  1248
      NS_LOG_LOGIC ("size=" << size << ", typeUid="<<item.typeUid <<
36ecc970ba96 checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents: 1232
diff changeset
  1249
        ", size="<<item.size<<", chunkUid="<<item.chunkUid<<
36ecc970ba96 checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents: 1232
diff changeset
  1250
        ", fragmentStart="<<extraItem.fragmentStart<<", fragmentEnd="<<
36ecc970ba96 checkpoint debug to log
Craig Dowell <craigdo@ee.washington.edu>
parents: 1232
diff changeset
  1251
        extraItem.fragmentEnd<< ", packetUid="<<extraItem.packetUid);
1143
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1252
      uint32_t tmp = AddBig (0xffff, m_tail, &item, &extraItem);
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1253
      UpdateTail (tmp);
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1254
    }
1149
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1255
  NS_ASSERT (size == 0);
e6626b7617ff ci fix metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1143
diff changeset
  1256
  return totalSize;
1143
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1257
}
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1258
7da9f7103447 implement packet metadata serialization/deserialization
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1141
diff changeset
  1259
1134
5f5d33e01eb9 split test code out of the main PacketMetadata code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 1133
diff changeset
  1260
} // namespace ns3
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
  1261