src/node/drop-tail-queue.cc
author George Riley<riley@ece.gatech.edu>
Fri, 24 Aug 2007 11:44:11 -0400
changeset 1303 9856d1175cbb
parent 758 e2f6fe585ab8
child 1308 5c5937a4150d
permissions -rw-r--r--
Change the protocol stack processing to pass packets by non-const reference, rather than const reference and value as was previously done. Also change the queue semantics to return the packet on a deque, rather than requiring a packet as a parameter. The problem with the original approach was that packet UID's were getting skipped. The fix handles the uid properly, and we get sequential packet uid's on the trace file.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
     1
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
     2
/*
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
     3
 * Copyright (c) 2007 University of Washington
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
     4
 * All rights reserved.
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
     5
 *
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
     6
 * This program is free software; you can redistribute it and/or modify
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
     7
 * it under the terms of the GNU General Public License version 2 as
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
     8
 * published by the Free Software Foundation;
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
     9
 *
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    10
 * This program is distributed in the hope that it will be useful,
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    13
 * GNU General Public License for more details.
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    14
 *
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    16
 * along with this program; if not, write to the Free Software
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    17
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    18
 */
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    19
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    20
#include "ns3/debug.h"
758
e2f6fe585ab8 fix bug 29
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 716
diff changeset
    21
#include "drop-tail-queue.h"
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    22
283
13b1fcb759e9 call NS_DEBUG_COMPONENT_DEFINE when needed
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 281
diff changeset
    23
NS_DEBUG_COMPONENT_DEFINE ("DropTailQueue");
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    24
283
13b1fcb759e9 call NS_DEBUG_COMPONENT_DEFINE when needed
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 281
diff changeset
    25
namespace ns3 {
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    26
584
d843d0d5314d make Queue::CreateDefault use the ComponentManager.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 534
diff changeset
    27
const ClassId DropTailQueue::cid = 
715
697cce7e938a a new ComponentManager API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 584
diff changeset
    28
  MakeClassId<DropTailQueue> ("DropTailQueue", Queue::iid);
584
d843d0d5314d make Queue::CreateDefault use the ComponentManager.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 534
diff changeset
    29
375
de64c081a2e0 Make queues copyable; change p2p-topology.cc to reflect this
Tom Henderson <tomh@tomh.org>
parents: 345
diff changeset
    30
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    31
DropTailQueue::DropTailQueue () :
345
47b41507a45a move channel.cc channel.h to node directory; merge ns-3-tracing from mathieu
Tom Henderson <tomh@tomh.org>
parents: 337
diff changeset
    32
  Queue (),
317
b5959aa4a02f fix queue tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 308
diff changeset
    33
  m_packets (),
b5959aa4a02f fix queue tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 308
diff changeset
    34
  m_maxPackets(DTQ_NPACKETS_MAX_DEFAULT)
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    35
{
317
b5959aa4a02f fix queue tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 308
diff changeset
    36
  NS_DEBUG("DropTailQueue::DropTailQueue ()");
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    37
}
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    38
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    39
DropTailQueue::~DropTailQueue ()
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    40
{
317
b5959aa4a02f fix queue tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 308
diff changeset
    41
  NS_DEBUG("DropTailQueue::~DropTailQueue ()");
b5959aa4a02f fix queue tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 308
diff changeset
    42
}
b5959aa4a02f fix queue tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 308
diff changeset
    43
b5959aa4a02f fix queue tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 308
diff changeset
    44
void 
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    45
DropTailQueue::SetMaxPackets (uint32_t npackets)
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    46
{
317
b5959aa4a02f fix queue tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 308
diff changeset
    47
  NS_DEBUG("DropTailQueue::SetMaxPackets (" << npackets << ")");
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    48
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    49
  m_maxPackets = npackets;
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    50
}
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    51
345
47b41507a45a move channel.cc channel.h to node directory; merge ns-3-tracing from mathieu
Tom Henderson <tomh@tomh.org>
parents: 337
diff changeset
    52
uint32_t 
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    53
DropTailQueue::GetMaxPackets (void)
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    54
{
317
b5959aa4a02f fix queue tracing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 308
diff changeset
    55
  NS_DEBUG("DropTailQueue::GetMaxPackets () <= " << m_maxPackets);
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    56
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    57
  return m_maxPackets;
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    58
}
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    59
345
47b41507a45a move channel.cc channel.h to node directory; merge ns-3-tracing from mathieu
Tom Henderson <tomh@tomh.org>
parents: 337
diff changeset
    60
bool 
337
42102ed8ee3c Fix bug 8: Enque/Deque misspelled
Tom Henderson <tomh@tomh.org>
parents: 323
diff changeset
    61
DropTailQueue::DoEnqueue (const Packet& p)
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    62
{
337
42102ed8ee3c Fix bug 8: Enque/Deque misspelled
Tom Henderson <tomh@tomh.org>
parents: 323
diff changeset
    63
  NS_DEBUG("DropTailQueue::DoEnqueue (" << &p << ")");
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    64
345
47b41507a45a move channel.cc channel.h to node directory; merge ns-3-tracing from mathieu
Tom Henderson <tomh@tomh.org>
parents: 337
diff changeset
    65
  if (m_packets.size () >= m_maxPackets)
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    66
    {
337
42102ed8ee3c Fix bug 8: Enque/Deque misspelled
Tom Henderson <tomh@tomh.org>
parents: 323
diff changeset
    67
      NS_DEBUG("DropTailQueue::DoEnqueue (): Queue full -- droppping pkt");
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    68
      Drop (p);
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    69
      return false;
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    70
    }
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    71
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    72
  m_packets.push(p);
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    73
  return true;
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    74
}
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    75
1303
9856d1175cbb Change the protocol stack processing to pass packets by non-const
George Riley<riley@ece.gatech.edu>
parents: 758
diff changeset
    76
Packet
9856d1175cbb Change the protocol stack processing to pass packets by non-const
George Riley<riley@ece.gatech.edu>
parents: 758
diff changeset
    77
DropTailQueue::DoDequeue ()
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    78
{
1303
9856d1175cbb Change the protocol stack processing to pass packets by non-const
George Riley<riley@ece.gatech.edu>
parents: 758
diff changeset
    79
  NS_DEBUG("DropTailQueue::DoDequeue ( )");
9856d1175cbb Change the protocol stack processing to pass packets by non-const
George Riley<riley@ece.gatech.edu>
parents: 758
diff changeset
    80
  NS_ASSERT(!IsEmpty());
9856d1175cbb Change the protocol stack processing to pass packets by non-const
George Riley<riley@ece.gatech.edu>
parents: 758
diff changeset
    81
  Packet p = m_packets.front ();
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    82
  m_packets.pop ();
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    83
337
42102ed8ee3c Fix bug 8: Enque/Deque misspelled
Tom Henderson <tomh@tomh.org>
parents: 323
diff changeset
    84
  NS_DEBUG("DropTailQueue::DoDequeue (): Popped " << &p << " <= true");
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    85
1303
9856d1175cbb Change the protocol stack processing to pass packets by non-const
George Riley<riley@ece.gatech.edu>
parents: 758
diff changeset
    86
  return p;
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    87
}
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    88
1303
9856d1175cbb Change the protocol stack processing to pass packets by non-const
George Riley<riley@ece.gatech.edu>
parents: 758
diff changeset
    89
Packet
9856d1175cbb Change the protocol stack processing to pass packets by non-const
George Riley<riley@ece.gatech.edu>
parents: 758
diff changeset
    90
DropTailQueue::DoPeek ()
378
32bd402ea5ea remove unused files, remove notion of PHY, make more realistic p2p-net-device and p2p-channel
Craig Dowell
parents: 375
diff changeset
    91
{
1303
9856d1175cbb Change the protocol stack processing to pass packets by non-const
George Riley<riley@ece.gatech.edu>
parents: 758
diff changeset
    92
  NS_DEBUG("DropTailQueue::DoPeek ( )");
9856d1175cbb Change the protocol stack processing to pass packets by non-const
George Riley<riley@ece.gatech.edu>
parents: 758
diff changeset
    93
  NS_ASSERT(!IsEmpty());
378
32bd402ea5ea remove unused files, remove notion of PHY, make more realistic p2p-net-device and p2p-channel
Craig Dowell
parents: 375
diff changeset
    94
1303
9856d1175cbb Change the protocol stack processing to pass packets by non-const
George Riley<riley@ece.gatech.edu>
parents: 758
diff changeset
    95
  return m_packets.front ();
378
32bd402ea5ea remove unused files, remove notion of PHY, make more realistic p2p-net-device and p2p-channel
Craig Dowell
parents: 375
diff changeset
    96
}
32bd402ea5ea remove unused files, remove notion of PHY, make more realistic p2p-net-device and p2p-channel
Craig Dowell
parents: 375
diff changeset
    97
264
128d8d1bfb51 queues, trace-writer, debug
craigdo@m354-pc01.ee.washington.edu
parents:
diff changeset
    98
}; // namespace ns3