139c139
<
---
>
143c143
< # instantiation. TopologyCreator is in src/mem/ruby/network/topologies/.
---
> # instantiation.
145,152c145,147
< from TopologyCreator import instantiateTopology
< try:
< net_topology = instantiateTopology(topology, options, \
< IntLinkClass, ExtLinkClass, \
< RouterClass)
< except:
< print "Error: could not make topology %s" % options.topology
< raise
---
> # gem5 SimObject defined in src/mem/ruby/network/Network.py
> net_topology = Topology()
> net_topology.description = topology.description
153a149,156
> routers, int_links, ext_links = topology.makeTopology(options,
> IntLinkClass, ExtLinkClass, RouterClass)
>
> net_topology.routers = routers
> net_topology.int_links = int_links
> net_topology.ext_links = ext_links
>
>
165c168
< # to physmem. However, if Ruby memory is using sparse memory in SE
---
> # to physmem. However, if Ruby memory is using sparse memory in SE
183c186
<
---
>
187c190
<
---
>