36d35
< #include "mem/ruby/network/Network.hh"
61,62c60,62
< 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)
64d63
< m_number_of_switches = p->num_routers;
75,76c74
< if (m_nodes != params()->ext_links.size() &&
< m_nodes != params()->ext_links.size()) {
---
> if (m_nodes != ext_links.size()) {
78c76
< m_nodes, params()->ext_links.size());
---
> m_nodes, ext_links.size());
85,86c83,84
< 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) {
105,106c103,104
< 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) {
126,142d123
< 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
357,363d337
<
< Topology *
< TopologyParams::create()
< {
< return new Topology(this);
< }
<