diff options
author | Nilay Vaish <nilay@cs.wisc.edu> | 2013-03-22 15:53:23 -0500 |
---|---|---|
committer | Nilay Vaish <nilay@cs.wisc.edu> | 2013-03-22 15:53:23 -0500 |
commit | 5aa43e130acec02bc616008a8758cf5096025c19 (patch) | |
tree | f1277ef0002aadfb911f126ec0537afa572f3789 /src/mem/ruby/network/Topology.cc | |
parent | 2d501276429ab674c146a86802e62538892fc500 (diff) | |
download | gem5-5aa43e130acec02bc616008a8758cf5096025c19.tar.xz |
ruby: convert Topology to regular class
The Topology class in Ruby does not need to inherit from SimObject class.
This patch turns it into a regular class. The topology object is now created
in the constructor of the Network class. All the parameters for the topology
class have been moved to the network class.
Diffstat (limited to 'src/mem/ruby/network/Topology.cc')
-rw-r--r-- | src/mem/ruby/network/Topology.cc | 44 |
1 files changed, 9 insertions, 35 deletions
diff --git a/src/mem/ruby/network/Topology.cc b/src/mem/ruby/network/Topology.cc index 58114d147..b8f6fb914 100644 --- a/src/mem/ruby/network/Topology.cc +++ b/src/mem/ruby/network/Topology.cc @@ -33,7 +33,6 @@ #include "mem/protocol/MachineType.hh" #include "mem/ruby/common/NetDest.hh" #include "mem/ruby/network/BasicLink.hh" -#include "mem/ruby/network/Network.hh" #include "mem/ruby/network/Topology.hh" #include "mem/ruby/slicc_interface/AbstractController.hh" @@ -58,10 +57,10 @@ bool link_is_shortest_path_to_node(SwitchID src, SwitchID next, NetDest shortest_path_to_node(SwitchID src, SwitchID next, const Matrix& weights, const Matrix& dist); -Topology::Topology(const Params *p) - : SimObject(p) +Topology::Topology(uint32_t num_routers, vector<BasicExtLink *> ext_links, + vector<BasicIntLink *> int_links) + : m_number_of_switches(num_routers) { - m_number_of_switches = p->num_routers; // initialize component latencies record m_component_latencies.resize(0); @@ -72,18 +71,17 @@ Topology::Topology(const Params *p) m_nodes = MachineType_base_number(MachineType_NUM); assert(m_nodes > 1); - if (m_nodes != params()->ext_links.size() && - m_nodes != params()->ext_links.size()) { + if (m_nodes != ext_links.size()) { fatal("m_nodes (%d) != ext_links vector length (%d)\n", - m_nodes, params()->ext_links.size()); + m_nodes, ext_links.size()); } // analyze both the internal and external links, create data structures // Note that the python created links are bi-directional, but that the // topology and networks utilize uni-directional links. Thus each // BasicLink is converted to two calls to add link, on for each direction - for (vector<BasicExtLink*>::const_iterator i = params()->ext_links.begin(); - i != params()->ext_links.end(); ++i) { + for (vector<BasicExtLink*>::const_iterator i = ext_links.begin(); + i != ext_links.end(); ++i) { BasicExtLink *ext_link = (*i); AbstractController *abs_cntrl = ext_link->params()->ext_node; BasicRouter *router = ext_link->params()->int_node; @@ -102,8 +100,8 @@ Topology::Topology(const Params *p) addLink(int_idx, ext_idx2, ext_link, LinkDirection_Out); } - for (vector<BasicIntLink*>::const_iterator i = params()->int_links.begin(); - i != params()->int_links.end(); ++i) { + for (vector<BasicIntLink*>::const_iterator i = int_links.begin(); + i != int_links.end(); ++i) { BasicIntLink *int_link = (*i); BasicRouter *router_a = int_link->params()->node_a; BasicRouter *router_b = int_link->params()->node_b; @@ -123,23 +121,6 @@ Topology::Topology(const Params *p) } void -Topology::init() -{ -} - - -void -Topology::initNetworkPtr(Network* net_ptr) -{ - for (vector<BasicExtLink*>::const_iterator i = params()->ext_links.begin(); - i != params()->ext_links.end(); ++i) { - BasicExtLink *ext_link = (*i); - AbstractController *abs_cntrl = ext_link->params()->ext_node; - abs_cntrl->initNetworkPtr(net_ptr); - } -} - -void Topology::createLinks(Network *net, bool isReconfiguration) { // Find maximum switchID @@ -354,10 +335,3 @@ shortest_path_to_node(SwitchID src, SwitchID next, const Matrix& weights, return result; } - -Topology * -TopologyParams::create() -{ - return new Topology(this); -} - |