45a46,47
> m_port_buffers = p->port_buffers;
> m_num_connected_buffers = 0;
56c58
< deletePointers(m_buffers_to_free);
---
> deletePointers(m_port_buffers);
100,106c102,104
< MessageBuffer* buffer_ptr = new MessageBuffer;
< // Make these queues ordered
< buffer_ptr->setOrdering(true);
< if (m_network_ptr->getBufferSize() > 0) {
< buffer_ptr->resize(m_network_ptr->getBufferSize());
< }
<
---
> assert(m_num_connected_buffers < m_port_buffers.size());
> MessageBuffer* buffer_ptr = m_port_buffers[m_num_connected_buffers];
> m_num_connected_buffers++;
108d105
< m_buffers_to_free.push_back(buffer_ptr);
191,192c188,189
< for (unsigned int i = 0; i < m_buffers_to_free.size(); ++i) {
< if (m_buffers_to_free[i]->functionalRead(pkt)) {
---
> for (unsigned int i = 0; i < m_port_buffers.size(); ++i) {
> if (m_port_buffers[i]->functionalRead(pkt)) {
204,205c201,202
< for (unsigned int i = 0; i < m_buffers_to_free.size(); ++i) {
< num_functional_writes += m_buffers_to_free[i]->functionalWrite(pkt);
---
> for (unsigned int i = 0; i < m_port_buffers.size(); ++i) {
> num_functional_writes += m_port_buffers[i]->functionalWrite(pkt);