diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2014-09-01 16:55:42 -0500 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2014-09-01 16:55:42 -0500 |
| commit | 00dbadcbb09c51b8d05a22c21193b55d7e9a0cf1 (patch) | |
| tree | fc8e8e99d2f1e48176e0f00c7cf3c567aa5ddbec /src/mem/ruby/network/garnet/fixed-pipeline | |
| parent | cc2cc588693bb73b1892aea82fd0ac9729196f25 (diff) | |
| download | gem5-00dbadcbb09c51b8d05a22c21193b55d7e9a0cf1.tar.xz | |
ruby: network: move getNumNodes() to base class
All the implementations were doing the same things.
Diffstat (limited to 'src/mem/ruby/network/garnet/fixed-pipeline')
3 files changed, 1 insertions, 9 deletions
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc index 6de60b285..baf6a9687 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc @@ -108,15 +108,10 @@ GarnetNetwork_d::init() GarnetNetwork_d::~GarnetNetwork_d() { - for (int i = 0; i < m_nodes; i++) { - deletePointers(m_toNetQueues[i]); - deletePointers(m_fromNetQueues[i]); - } deletePointers(m_routers); deletePointers(m_nis); deletePointers(m_links); deletePointers(m_creditlinks); - delete m_topology_ptr; } /* diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh index 5aef42f3a..507d8bbd6 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh @@ -52,11 +52,8 @@ class GarnetNetwork_d : public BaseGarnetNetwork GarnetNetwork_d(const Params *p); ~GarnetNetwork_d(); - void init(); - int getNumNodes() { return m_nodes; } - int getBuffersPerDataVC() {return m_buffers_per_data_vc; } int getBuffersPerCtrlVC() {return m_buffers_per_ctrl_vc; } diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc index db71c9974..2f1b5ee46 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc @@ -114,8 +114,8 @@ NetworkInterface_d::addNode(vector<MessageBuffer *>& in, assert(in.size() == m_virtual_networks); inNode_ptr = in; outNode_ptr = out; - for (int j = 0; j < m_virtual_networks; j++) { + for (int j = 0; j < m_virtual_networks; j++) { // the protocol injects messages into the NI inNode_ptr[j]->setConsumer(this); inNode_ptr[j]->setReceiver(this); |