diff options
| author | Korey Sewell <ksewell@umich.edu> | 2011-05-02 00:16:14 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2011-05-02 00:16:14 -0400 |
| commit | dd95bc4d44d124abec3580f95db725895027bd1c (patch) | |
| tree | 772abc2ba41853356ea3cd932eb9256cbd9be704 /src/mem/ruby/buffers | |
| parent | 947a5ba9a50d9d19db1028f04c76c5e3f3e9d2b7 (diff) | |
| download | gem5-dd95bc4d44d124abec3580f95db725895027bd1c.tar.xz | |
ruby: dbg: use system ticks instead of cycles
Diffstat (limited to 'src/mem/ruby/buffers')
| -rw-r--r-- | src/mem/ruby/buffers/MessageBuffer.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mem/ruby/buffers/MessageBuffer.cc b/src/mem/ruby/buffers/MessageBuffer.cc index e5df19cab..9bb166e05 100644 --- a/src/mem/ruby/buffers/MessageBuffer.cc +++ b/src/mem/ruby/buffers/MessageBuffer.cc @@ -126,8 +126,7 @@ MessageBuffer::getMsgPtrCopy() const const Message* MessageBuffer::peekAtHeadOfQueue() const { - DPRINTF(RubyQueue, "Peeking at head of queue time: %lld\n", - g_eventQueue_ptr->getTime()); + DPRINTF(RubyQueue, "Peeking at head of queue.\n"); assert(isReady()); const Message* msg_ptr = m_prio_heap.front().m_msgptr.get(); @@ -196,8 +195,11 @@ MessageBuffer::enqueue(MsgPtr message, Time delta) if (arrival_time < m_last_arrival_time) { panic("FIFO ordering violated: %s name: %s current time: %d " "delta: %d arrival_time: %d last arrival_time: %d\n", - *this, m_name, current_time, delta, arrival_time, - m_last_arrival_time); + *this, m_name, + current_time * g_eventQueue_ptr->getClock(), + delta * g_eventQueue_ptr->getClock(), + arrival_time * g_eventQueue_ptr->getClock(), + m_last_arrival_time * g_eventQueue_ptr->getClock()); } } m_last_arrival_time = arrival_time; @@ -220,8 +222,8 @@ MessageBuffer::enqueue(MsgPtr message, Time delta) push_heap(m_prio_heap.begin(), m_prio_heap.end(), greater<MessageBufferNode>()); - DPRINTF(RubyQueue, "Enqueue with arrival_time %lld (cur_time: %lld).\n", - arrival_time, g_eventQueue_ptr->getTime()); + DPRINTF(RubyQueue, "Enqueue with arrival_time %lld.\n", + arrival_time * g_eventQueue_ptr->getClock()); DPRINTF(RubyQueue, "Enqueue Message: %s.\n", (*(message.get()))); // Schedule the wakeup |