diff options
-rw-r--r-- | src/mem/ruby/network/MessageBuffer.cc | 26 | ||||
-rw-r--r-- | src/mem/ruby/network/MessageBuffer.hh | 5 | ||||
-rw-r--r-- | src/mem/ruby/network/simple/SimpleNetwork.cc | 6 | ||||
-rw-r--r-- | src/mem/ruby/network/simple/Switch.cc | 6 |
4 files changed, 0 insertions, 43 deletions
diff --git a/src/mem/ruby/network/MessageBuffer.cc b/src/mem/ruby/network/MessageBuffer.cc index 72c03457a..3f1586916 100644 --- a/src/mem/ruby/network/MessageBuffer.cc +++ b/src/mem/ruby/network/MessageBuffer.cc @@ -350,32 +350,6 @@ MessageBuffer::isReady(Tick current_time) const (m_prio_heap.front()->getLastEnqueueTime() <= current_time)); } -bool -MessageBuffer::functionalRead(Packet *pkt) -{ - // Check the priority heap and read any messages that may - // correspond to the address in the packet. - for (unsigned int i = 0; i < m_prio_heap.size(); ++i) { - Message *msg = m_prio_heap[i].get(); - if (msg->functionalRead(pkt)) return true; - } - - // Read the messages in the stall queue that correspond - // to the address in the packet. - for (StallMsgMapType::iterator map_iter = m_stall_msg_map.begin(); - map_iter != m_stall_msg_map.end(); - ++map_iter) { - - for (std::list<MsgPtr>::iterator it = (map_iter->second).begin(); - it != (map_iter->second).end(); ++it) { - - Message *msg = (*it).get(); - if (msg->functionalRead(pkt)) return true; - } - } - return false; -} - uint32_t MessageBuffer::functionalWrite(Packet *pkt) { diff --git a/src/mem/ruby/network/MessageBuffer.hh b/src/mem/ruby/network/MessageBuffer.hh index 4fdf4978d..5c9e1089b 100644 --- a/src/mem/ruby/network/MessageBuffer.hh +++ b/src/mem/ruby/network/MessageBuffer.hh @@ -116,11 +116,6 @@ class MessageBuffer : public SimObject void setIncomingLink(int link_id) { m_input_link_id = link_id; } void setVnet(int net) { m_vnet_id = net; } - // Function for figuring out if any of the messages in the buffer can - // satisfy the read request for the address in the packet. - // Return value, if true, indicates that the request was fulfilled. - bool functionalRead(Packet *pkt); - // 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. diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc index 3d76254fc..25d0b6f4b 100644 --- a/src/mem/ruby/network/simple/SimpleNetwork.cc +++ b/src/mem/ruby/network/simple/SimpleNetwork.cc @@ -189,12 +189,6 @@ SimpleNetwork::functionalRead(Packet *pkt) } } - for (unsigned int i = 0; i < m_int_link_buffers.size(); ++i) { - if (m_int_link_buffers[i]->functionalRead(pkt)) { - return true; - } - } - return false; } diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc index 0951ef138..747884f16 100644 --- a/src/mem/ruby/network/simple/Switch.cc +++ b/src/mem/ruby/network/simple/Switch.cc @@ -171,12 +171,6 @@ Switch::print(std::ostream& out) const bool Switch::functionalRead(Packet *pkt) { - // Access the buffers in the switch for performing a functional read - for (unsigned int i = 0; i < m_port_buffers.size(); ++i) { - if (m_port_buffers[i]->functionalRead(pkt)) { - return true; - } - } return false; } |