From 88d34665d0db85d86b1e62388d0f34e296bf191f Mon Sep 17 00:00:00 2001 From: Jason Power Date: Tue, 9 Apr 2013 16:15:06 -0500 Subject: [PATCH] Ruby: More descriptive message buffer connection fatal When connecting message buffers between Ruby controllers, it is easy to mistakenly connect multiple controllers to the same message buffer. This patch prints a more descriptive fatal message than the previous assert statement in order to facilitate easier debugging. --- src/mem/ruby/buffers/MessageBuffer.hh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mem/ruby/buffers/MessageBuffer.hh b/src/mem/ruby/buffers/MessageBuffer.hh index ae1635b69..d45ec6bd9 100644 --- a/src/mem/ruby/buffers/MessageBuffer.hh +++ b/src/mem/ruby/buffers/MessageBuffer.hh @@ -79,7 +79,11 @@ class MessageBuffer void setPriority(int rank) { m_priority_rank = rank; } void setConsumer(Consumer* consumer) { - assert(m_consumer == NULL); + if (m_consumer != NULL) { + fatal("Trying to connect %s to MessageBuffer %s. \ + \n%s already connected. Check the cntrl_id's.\n", + *consumer, *this, *m_consumer); + } m_consumer = consumer; }