ruby: simple network: refactor code

Drops an unused variable and marks three variables as const.
This commit is contained in:
Nilay Vaish 2015-09-24 08:41:24 -05:00
parent b3a3b0b6cf
commit 4647e4e961
2 changed files with 6 additions and 18 deletions

View file

@ -38,23 +38,15 @@
#include "mem/ruby/network/simple/Switch.hh"
#include "mem/ruby/network/simple/Throttle.hh"
#include "mem/ruby/profiler/Profiler.hh"
#include "mem/ruby/system/RubySystem.hh"
using namespace std;
using m5::stl_helpers::deletePointers;
SimpleNetwork::SimpleNetwork(const Params *p)
: Network(p)
: Network(p), m_buffer_size(p->buffer_size),
m_endpoint_bandwidth(p->endpoint_bandwidth),
m_adaptive_routing(p->adaptive_routing)
{
m_buffer_size = p->buffer_size;
m_endpoint_bandwidth = p->endpoint_bandwidth;
m_adaptive_routing = p->adaptive_routing;
// Note: the parent Network Object constructor is called before the
// SimpleNetwork child constructor. Therefore, the member variables
// used below should already be initialized.
m_endpoint_switches.resize(m_nodes);
// record the routers
for (vector<BasicRouter*>::const_iterator i = p->routers.begin();
i != p->routers.end(); ++i) {
@ -99,8 +91,6 @@ SimpleNetwork::makeOutLink(SwitchID src, NodeID dest, BasicLink* link,
m_switches[src]->addOutPort(m_fromNetQueues[dest], routing_table_entry,
simple_link->m_latency,
simple_link->m_bw_multiplier);
m_endpoint_switches[dest] = m_switches[src];
}
// From an endpoint node to a switch

View file

@ -87,11 +87,9 @@ class SimpleNetwork : public Network
std::vector<Switch*> m_switches;
std::vector<MessageBuffer*> m_int_link_buffers;
int m_num_connected_buffers;
std::vector<Switch*> m_endpoint_switches;
int m_buffer_size;
int m_endpoint_bandwidth;
bool m_adaptive_routing;
const int m_buffer_size;
const int m_endpoint_bandwidth;
const bool m_adaptive_routing;
//Statistical variables
Stats::Formula m_msg_counts[MessageSizeType_NUM];