summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mem/packet_queue.cc20
-rw-r--r--src/mem/packet_queue.hh5
2 files changed, 9 insertions, 16 deletions
diff --git a/src/mem/packet_queue.cc b/src/mem/packet_queue.cc
index a6f31c6eb..428f8c13f 100644
--- a/src/mem/packet_queue.cc
+++ b/src/mem/packet_queue.cc
@@ -71,11 +71,10 @@ PacketQueue::checkFunctional(PacketPtr pkt)
{
pkt->pushLabel(label);
- DeferredPacketIterator i = transmitList.begin();
- DeferredPacketIterator end = transmitList.end();
+ auto i = transmitList.begin();
bool found = false;
- while (!found && i != end) {
+ while (!found && i != transmitList.end()) {
// If the buffered packet contains data, and it overlaps the
// current packet, then update data
found = pkt->checkFunctional(i->pkt);
@@ -140,7 +139,7 @@ PacketQueue::schedSendTiming(PacketPtr pkt, Tick when, bool send_as_snoop)
}
// this belongs in the middle somewhere, insertion sort
- DeferredPacketIterator i = transmitList.begin();
+ auto i = transmitList.begin();
++i; // already checked for insertion at front
while (i != transmitList.end() && when >= i->tick)
++i;
@@ -151,21 +150,16 @@ void PacketQueue::trySendTiming()
{
assert(deferredPacketReady());
- // take the next packet off the list here, as we might return to
- // ourselves through the sendTiming call below
DeferredPacket dp = transmitList.front();
- transmitList.pop_front();
// use the appropriate implementation of sendTiming based on the
// type of port associated with the queue, and whether the packet
// is to be sent as a snoop or not
waitingOnRetry = !sendTiming(dp.pkt, dp.sendAsSnoop);
- if (waitingOnRetry) {
- // put the packet back at the front of the list (packet should
- // not have changed since it wasn't accepted)
- assert(!sendEvent.scheduled());
- transmitList.push_front(dp);
+ if (!waitingOnRetry) {
+ // take the packet off the list
+ transmitList.pop_front();
}
}
@@ -216,7 +210,7 @@ PacketQueue::processSendEvent()
unsigned int
PacketQueue::drain(DrainManager *dm)
{
- if (transmitList.empty() && !sendEvent.scheduled())
+ if (transmitList.empty())
return 0;
DPRINTF(Drain, "PacketQueue not drained\n");
drainManager = dm;
diff --git a/src/mem/packet_queue.hh b/src/mem/packet_queue.hh
index b3df8d71f..3ed3fae28 100644
--- a/src/mem/packet_queue.hh
+++ b/src/mem/packet_queue.hh
@@ -78,7 +78,6 @@ class PacketQueue : public Drainable
};
typedef std::list<DeferredPacket> DeferredPacketList;
- typedef std::list<DeferredPacket>::iterator DeferredPacketIterator;
/** A list of outgoing timing response packets that haven't been
* serviced yet. */
@@ -109,10 +108,10 @@ class PacketQueue : public Drainable
bool waitingOnRetry;
/** Check whether we have a packet ready to go on the transmit list. */
- bool deferredPacketReady()
+ bool deferredPacketReady() const
{ return !transmitList.empty() && transmitList.front().tick <= curTick(); }
- Tick deferredPacketReadyTime()
+ Tick deferredPacketReadyTime() const
{ return transmitList.empty() ? MaxTick : transmitList.front().tick; }
/**