-----Original Message----- From: g...@cmdmail.amd.com [mailto:g...@cmdmail.amd.com] Sent: Monday, November 09, 2009 10:33 AM To: Beckmann, Brad Subject: [PATCH 22 of 31] ruby: Added default names to message buffers
# HG changeset patch # User Brad Beckmann <brad.beckm...@amd.com> # Date 1257791383 28800 # Node ID bfc4d38fbdd95a84ad6125ccd5917a86931b8266 # Parent 78d1b223c7b0b5d347ade7d7bc1ca193234efba5 ruby: Added default names to message buffers Added default names to message buffers created by the simple network. diff -r 78d1b223c7b0 -r bfc4d38fbdd9 src/mem/ruby/buffers/MessageBuffer.cc --- a/src/mem/ruby/buffers/MessageBuffer.cc Mon Nov 09 10:29:43 2009 -0800 +++ b/src/mem/ruby/buffers/MessageBuffer.cc Mon Nov 09 10:29:43 2009 -0800 @@ -34,7 +34,8 @@ #include "mem/ruby/buffers/MessageBuffer.hh" #include "mem/ruby/system/System.hh" -MessageBuffer::MessageBuffer() +MessageBuffer::MessageBuffer(const Chip* chip_ptr, + const string &name) { m_msg_counter = 0; m_consumer_ptr = NULL; @@ -52,26 +53,7 @@ m_msgs_this_cycle = 0; m_not_avail_count = 0; m_priority_rank = 0; -} - -MessageBuffer::MessageBuffer(const Chip* chip_ptr) // The chip_ptr is ignored, but could be used for extra debugging -{ - m_msg_counter = 0; - m_consumer_ptr = NULL; - m_ordering_set = false; - m_strict_fifo = true; - m_size = 0; - m_max_size = -1; - m_last_arrival_time = 0; - m_randomization = true; - m_size_last_time_size_checked = 0; - m_time_last_time_size_checked = 0; - m_time_last_time_enqueue = 0; - m_time_last_time_pop = 0; - m_size_at_cycle_start = 0; - m_msgs_this_cycle = 0; - m_not_avail_count = 0; - m_priority_rank = 0; + m_name = name; } int MessageBuffer::getSize() diff -r 78d1b223c7b0 -r bfc4d38fbdd9 src/mem/ruby/buffers/MessageBuffer.hh --- a/src/mem/ruby/buffers/MessageBuffer.hh Mon Nov 09 10:29:43 2009 -0800 +++ b/src/mem/ruby/buffers/MessageBuffer.hh Mon Nov 09 10:29:43 2009 -0800 @@ -51,10 +51,10 @@ class MessageBuffer { public: // Constructors - MessageBuffer(); - MessageBuffer(const Chip* chip_ptr); // The chip_ptr is ignored, but could be used for extra debugging + // The chip_ptr is ignored, but could be used for extra debugging + MessageBuffer(const Chip* chip_ptr = NULL, + const string &name = ""); - // Use Default Destructor // ~MessageBuffer() // Public Methods diff -r 78d1b223c7b0 -r bfc4d38fbdd9 src/mem/ruby/network/simple/SimpleNetwork.cc --- a/src/mem/ruby/network/simple/SimpleNetwork.cc Mon Nov 09 10:29:43 2009 -0800 +++ b/src/mem/ruby/network/simple/SimpleNetwork.cc Mon Nov 09 10:29:43 2009 -0800 @@ -87,8 +87,10 @@ m_toNetQueues[node].setSize(m_virtual_networks); m_fromNetQueues[node].setSize(m_virtual_networks); for (int j = 0; j < m_virtual_networks; j++) { - m_toNetQueues[node][j] = new MessageBuffer; - m_fromNetQueues[node][j] = new MessageBuffer; + m_toNetQueues[node][j] = new MessageBuffer(NULL, + "toNet node "+int_to_string(node)+" j "+int_to_string(j)); + m_fromNetQueues[node][j] = new MessageBuffer(NULL, + "fromNet node "+int_to_string(node)+" j "+int_to_string(j)); } } _______________________________________________ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev