changeset e15e445c21a6 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=e15e445c21a6
description:
ruby: Fix overflow reported by ASAN in MessageBuffer.
In MessageBuffer the m_not_avail_count member is incremented but not
used.
This causes an overflow reported by ASAN. This patch changes from an
int to
Stats::Scalar, since the count is useful in debugging finite
MessageBuffers.
diffstat:
src/mem/ruby/network/MessageBuffer.cc | 10 +++++++++-
src/mem/ruby/network/MessageBuffer.hh | 6 ++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diffs (50 lines):
diff -r c473ca7cc650 -r e15e445c21a6 src/mem/ruby/network/MessageBuffer.cc
--- a/src/mem/ruby/network/MessageBuffer.cc Wed Nov 30 17:12:59 2016 -0500
+++ b/src/mem/ruby/network/MessageBuffer.cc Fri Dec 02 11:40:40 2016 -0500
@@ -51,7 +51,6 @@
m_size_last_time_size_checked = 0;
m_size_at_cycle_start = 0;
m_msgs_this_cycle = 0;
- m_not_avail_count = 0;
m_priority_rank = 0;
m_stall_msg_map.clear();
@@ -350,6 +349,15 @@
(m_prio_heap.front()->getLastEnqueueTime() <= current_time));
}
+void
+MessageBuffer::regStats()
+{
+ m_not_avail_count
+ .name(name() + ".not_avail_count")
+ .desc("Number of times this buffer did not have N slots available")
+ .flags(Stats::nozero);
+}
+
uint32_t
MessageBuffer::functionalWrite(Packet *pkt)
{
diff -r c473ca7cc650 -r e15e445c21a6 src/mem/ruby/network/MessageBuffer.hh
--- a/src/mem/ruby/network/MessageBuffer.hh Wed Nov 30 17:12:59 2016 -0500
+++ b/src/mem/ruby/network/MessageBuffer.hh Fri Dec 02 11:40:40 2016 -0500
@@ -116,6 +116,8 @@
void setIncomingLink(int link_id) { m_input_link_id = link_id; }
void setVnet(int net) { m_vnet_id = net; }
+ void regStats();
+
// Function for figuring out if any of the messages in the buffer need
// to be updated with the data from the packet.
// Return value indicates the number of messages that were updated.
@@ -150,8 +152,8 @@
unsigned int m_size_at_cycle_start;
unsigned int m_msgs_this_cycle;
- int m_not_avail_count; // count the # of times I didn't have N
- // slots available
+ Stats::Scalar m_not_avail_count; // count the # of times I didn't have N
+ // slots available
uint64_t m_msg_counter;
int m_priority_rank;
const bool m_strict_fifo;
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
