EmaMaker
/
tc-homework2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug 8: Enque/Deque misspelled

Tom Henderson 2007-03-07 22:26:20 -08:00
parent 7d3e9538f0
commit e7e003521d
8 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
samples/main-channel.cc
View File

@ -63,7 +63,7 @@ FakeInternetNode::Doit (void)
NS_DEBUG_UNCOND("FakeInternetNode::Doit (): **** Send outbound packet");
Packet p;
m_dtqOutbound.Enque(p);
m_dtqOutbound.Enqueue(p);
UpperNotify();
}
@ -73,8 +73,8 @@ FakeInternetNode::UpperDoSendUp (Packet &p)
NS_DEBUG_UNCOND("FakeInternetNode::UpperDoSendUp (" << &p << ")");
NS_DEBUG_UNCOND("FakeInternetNode::UpperDoSendUp (): **** Receive inbound packet");
m_dtqInbound.Enque(p);
return m_dtqInbound.Deque(p);
m_dtqInbound.Enqueue(p);
return m_dtqInbound.Dequeue(p);
}
bool
@ -82,7 +82,7 @@ FakeInternetNode::UpperDoPull (Packet &p)
{
NS_DEBUG_UNCOND("FakeInternetNode::DoPull (" << &p << ")");
return m_dtqOutbound.Deque(p);
return m_dtqOutbound.Dequeue(p);
}
// ===========================================================================
@ -127,7 +127,7 @@ FakePhysicalLayer::LowerDoNotify (LayerConnectorUpper *upper)
NS_ASSERT(m_upperPartner);
m_upperPartner->UpperPull(p);
m_dtqOutbound.Enque(p);
m_dtqOutbound.Enqueue(p);
NS_DEBUG_UNCOND("FakePhysicalLayer::LowerDoNotify (): Got bits, Notify lower");
@ -149,7 +149,7 @@ FakePhysicalLayer::UpperDoPull (Packet &p)
{
NS_DEBUG_UNCOND("FakePhysicalLayer::DoPull (" << &p << ")");
return m_dtqOutbound.Deque(p);
return m_dtqOutbound.Dequeue(p);
}
// ===========================================================================

12
samples/ns-2/simple.tcl.cc
View File

@ -66,14 +66,14 @@ public:
~Tracer () {};
void LogEnque (std::string const &name, const Packet &p)
void LogEnqueue (std::string const &name, const Packet &p)
{
m_filestr << name << " que ";
PrintLlcPacket (p, m_filestr);
m_filestr << std::endl;
}
void LogDeque (std::string const &name, const Packet &p)
void LogDequeue (std::string const &name, const Packet &p)
{
m_filestr << name << " deq ";
PrintLlcPacket (p, m_filestr);
@ -248,11 +248,11 @@ AddDuplexLink(
static void
SetupTrace (TraceContainer &container, Tracer &tracer)
{
container.SetCallback ("Queue::Enque",
MakeCallback (&Tracer::LogEnque, &tracer));
container.SetCallback ("Queue::Enqueue",
MakeCallback (&Tracer::LogEnqueue, &tracer));
container.SetCallback ("Queue::Deque",
MakeCallback (&Tracer::LogDeque, &tracer));
container.SetCallback ("Queue::Dequeue",
MakeCallback (&Tracer::LogDequeue, &tracer));
container.SetCallback ("Queue::Drop",
MakeCallback (&Tracer::LogDrop, &tracer));

4
src/devices/serial/serial-net-device.cc
View File

@ -66,7 +66,7 @@ SerialNetDevice::SendTo (Packet& p, const MacAddress& dest)
tag.address = address;
p.AddTag (tag);
#endif
if (m_queue->Enque(p) )
if (m_queue->Enqueue(p) )
{
NotifyDataAvailable ();
return true;
@ -116,7 +116,7 @@ SerialNetDevice::NotifyDataAvailable(void)
NS_DEBUG ("SerialNetDevice::NotifyDataAvailable ()");
Packet p;
bool found = GetQueue ()->Deque (p);
bool found = GetQueue ()->Dequeue (p);
if (found)
{
#ifdef NOTYET

2
src/devices/serial/serial-phy.cc
View File

@ -46,7 +46,7 @@ SerialPhy::NotifyDataAvailable(void)
NS_DEBUG ("SerialPhy::NotifyDataAvailable ()");
Packet p;
bool found = m_netdevice->GetQueue ()->Deque (p);
bool found = m_netdevice->GetQueue ()->Dequeue (p);
if (found)
{
#ifdef NOTYET

14
src/node/drop-tail.cc
View File

@ -69,13 +69,13 @@ DropTailQueue::GetMaxPackets (void)
}
bool
DropTailQueue::DoEnque (const Packet& p)
DropTailQueue::DoEnqueue (const Packet& p)
{
NS_DEBUG("DropTailQueue::DoEnque (" << &p << ")");
NS_DEBUG("DropTailQueue::DoEnqueue (" << &p << ")");
if (GetNPackets () >= m_maxPackets)
{
NS_DEBUG("DropTailQueue::DoEnque (): Queue full -- droppping pkt");
NS_DEBUG("DropTailQueue::DoEnqueue (): Queue full -- droppping pkt");
Drop (p);
return false;
}
@ -85,20 +85,20 @@ DropTailQueue::DoEnque (const Packet& p)
}
bool
DropTailQueue::DoDeque (Packet& p)
DropTailQueue::DoDequeue (Packet& p)
{
NS_DEBUG("DropTailQueue::DoDeque (" << &p << ")");
NS_DEBUG("DropTailQueue::DoDequeue (" << &p << ")");
if (m_packets.empty())
{
NS_DEBUG("DropTailQueue::DoDeque (): Queue empty");
NS_DEBUG("DropTailQueue::DoDequeue (): Queue empty");
return false;
}
p = m_packets.front ();
m_packets.pop ();
NS_DEBUG("DropTailQueue::DoDeque (): Popped " << &p << " <= true");
NS_DEBUG("DropTailQueue::DoDequeue (): Popped " << &p << " <= true");
return true;
}

4
src/node/drop-tail.h
View File

@ -43,8 +43,8 @@ public:
uint32_t GetMaxPackets (void);
private:
virtual bool DoEnque (const Packet& p);
virtual bool DoDeque (Packet &p);
virtual bool DoEnqueue (const Packet& p);
virtual bool DoDequeue (Packet &p);
private:
std::queue<Packet> m_packets;

32
src/node/queue.cc
View File

@ -42,15 +42,15 @@ Queue::~Queue()
}
bool
Queue::Enque (const Packet& p)
Queue::Enqueue (const Packet& p)
{
NS_DEBUG("Queue::Enque (" << &p << ")");
NS_DEBUG("Queue::Enqueue (" << &p << ")");
NS_DEBUG("Queue::Enque (): m_traceEnque (p)");
NS_DEBUG("Queue::Enqueue (): m_traceEnqueue (p)");
m_traceEnque (m_name, p);
m_traceEnqueue (m_name, p);
bool retval = DoEnque (p);
bool retval = DoEnqueue (p);
if (retval)
{
m_nBytes += p.GetSize ();
@ -60,11 +60,11 @@ Queue::Enque (const Packet& p)
}
bool
Queue::Deque (Packet &p)
Queue::Dequeue (Packet &p)
{
NS_DEBUG("Queue::Deque (" << &p << ")");
NS_DEBUG("Queue::Dequeue (" << &p << ")");
bool retval = DoDeque (p);
bool retval = DoDequeue (p);
if (retval)
{
@ -74,19 +74,19 @@ Queue::Deque (Packet &p)
NS_ASSERT (m_nBytes >= 0);
NS_ASSERT (m_nPackets >= 0);
NS_DEBUG("Queue::Deque (): m_traceDeque (p)");
NS_DEBUG("Queue::Dequeue (): m_traceDequeue (p)");
const Packet packet = p;
m_traceDeque (m_name, packet);
m_traceDequeue (m_name, packet);
}
return retval;
}
void
Queue::DequeAll (void)
Queue::DequeueAll (void)
{
NS_DEBUG("Queue::DequeAll ()");
NS_DEBUG("Queue::DequeueAll ()");
NS_ASSERT (!"Don't know what to do with dequeued packets!");
}
@ -120,10 +120,10 @@ Queue::QueueRegisterTraces (TraceContainer &container)
{
NS_DEBUG("Queue::RegisterTraces (" << &container << ")");
container.RegisterCallback ("Queue::Enque",
&m_traceEnque);
container.RegisterCallback ("Queue::Deque",
&m_traceDeque);
container.RegisterCallback ("Queue::Enqueue",
&m_traceEnqueue);
container.RegisterCallback ("Queue::Dequeue",
&m_traceDequeue);
container.RegisterCallback ("Queue::Drop",
&m_traceDrop);
}

14
src/node/queue.h
View File

@ -38,10 +38,10 @@ public:
Queue (std::string const &name);
virtual ~Queue ();
bool Enque (const Packet& p);
bool Deque (Packet &p);
bool Enqueue (const Packet& p);
bool Dequeue (Packet &p);
void DequeAll (void);
void DequeueAll (void);
uint32_t GetNPackets (void);
uint32_t GetNBytes (void);
@ -79,8 +79,8 @@ public:
#endif
private:
virtual bool DoEnque (const Packet& p) = 0;
virtual bool DoDeque (Packet &p) = 0;
virtual bool DoEnqueue (const Packet& p) = 0;
virtual bool DoDequeue (Packet &p) = 0;
protected:
// called by subclasses to notify parent of packet drops.
@ -88,8 +88,8 @@ protected:
void QueueRegisterTraces (TraceContainer &container);
private:
CallbackTracer<std::string const &, const Packet &> m_traceEnque;
CallbackTracer<std::string const &, const Packet &> m_traceDeque;
CallbackTracer<std::string const &, const Packet &> m_traceEnqueue;
CallbackTracer<std::string const &, const Packet &> m_traceDequeue;
CallbackTracer<std::string const &, const Packet &> m_traceDrop;
uint32_t m_nBytes;