From 4a453e8c95bb030d6b50cab8d42825142b093df2 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Thu, 9 Oct 2014 17:51:52 -0400 Subject: mem: Allow packet queue to move next send event forward This patch changes the packet queue such that when scheduling a send, the queue is allowed to move the event forward. --- src/mem/packet_queue.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/mem/packet_queue.cc') diff --git a/src/mem/packet_queue.cc b/src/mem/packet_queue.cc index 428f8c13f..e9fe72ead 100644 --- a/src/mem/packet_queue.cc +++ b/src/mem/packet_queue.cc @@ -168,13 +168,19 @@ PacketQueue::scheduleSend(Tick time) { // the next ready time is either determined by the next deferred packet, // or in the cache through the MSHR ready time - Tick nextReady = std::min(deferredPacketReadyTime(), time); + Tick nextReady = std::max(std::min(deferredPacketReadyTime(), time), + curTick() + 1); if (nextReady != MaxTick) { // if the sendTiming caused someone else to call our // recvTiming we could already have an event scheduled, check - if (!sendEvent.scheduled()) - em.schedule(&sendEvent, std::max(nextReady, curTick() + 1)); + if (!sendEvent.scheduled()) { + em.schedule(&sendEvent, nextReady); + } else if (nextReady < sendEvent.when()) { + // if the new time is earlier than when the event + // currently is scheduled, move it forward + em.reschedule(&sendEvent, nextReady); + } } else { // no more to send, so if we're draining, we may be done if (drainManager && transmitList.empty() && !sendEvent.scheduled()) { -- cgit v1.2.3