From 8bf41e41c142b2c8618eed0b786c64e10dcacb1e Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Fri, 23 May 2014 06:07:02 -0500
Subject: ruby: message buffer: drop dequeue_getDelayCycles() The functionality
 of updating and returning the delay cycles would now be performed by the
 dequeue() function itself.

---
 src/mem/ruby/buffers/MessageBuffer.cc | 17 ++++++-----------
 src/mem/ruby/buffers/MessageBuffer.hh |  6 ++----
 2 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'src/mem/ruby/buffers')

diff --git a/src/mem/ruby/buffers/MessageBuffer.cc b/src/mem/ruby/buffers/MessageBuffer.cc
index 19ad9ee7d..298fdb3c3 100644
--- a/src/mem/ruby/buffers/MessageBuffer.cc
+++ b/src/mem/ruby/buffers/MessageBuffer.cc
@@ -220,8 +220,11 @@ MessageBuffer::enqueue(MsgPtr message, Cycles delta)
 }
 
 Cycles
-MessageBuffer::dequeue_getDelayCycles()
+MessageBuffer::dequeue()
 {
+    DPRINTF(RubyQueue, "Popping\n");
+    assert(isReady());
+
     // get MsgPtr of the message about to be dequeued
     MsgPtr message = m_prio_heap.front().m_msgptr;
 
@@ -229,16 +232,6 @@ MessageBuffer::dequeue_getDelayCycles()
     message->updateDelayedTicks(m_receiver->clockEdge());
     Cycles delayCycles =
         m_receiver->ticksToCycles(message->getDelayedTicks());
-    dequeue();
-
-    return delayCycles;
-}
-
-void
-MessageBuffer::dequeue()
-{
-    DPRINTF(RubyQueue, "Popping\n");
-    assert(isReady());
 
     // record previous size and time so the current buffer size isn't
     // adjusted until next cycle
@@ -250,6 +243,8 @@ MessageBuffer::dequeue()
     pop_heap(m_prio_heap.begin(), m_prio_heap.end(),
         greater<MessageBufferNode>());
     m_prio_heap.pop_back();
+
+    return delayCycles;
 }
 
 void
diff --git a/src/mem/ruby/buffers/MessageBuffer.hh b/src/mem/ruby/buffers/MessageBuffer.hh
index 6019f3d6c..3b3a69a3e 100644
--- a/src/mem/ruby/buffers/MessageBuffer.hh
+++ b/src/mem/ruby/buffers/MessageBuffer.hh
@@ -118,11 +118,9 @@ class MessageBuffer
     void enqueue(MsgPtr message) { enqueue(message, Cycles(1)); }
     void enqueue(MsgPtr message, Cycles delta);
 
-    //! Updates the delay cycles of the message at the of the queue,
+    //! Updates the delay cycles of the message at the head of the queue,
     //! removes it from the queue and returns its total delay.
-    Cycles dequeue_getDelayCycles();
-
-    void dequeue();
+    Cycles dequeue();
 
     void recycle();
     bool isEmpty() const { return m_prio_heap.size() == 0; }
-- 
cgit v1.2.3