74c74
<
---
>
75a76,94
> # Set the network classes based on the command line options
> #
> if options.garnet_network == "fixed":
> class NetworkClass(GarnetNetwork_d): pass
> class IntLinkClass(GarnetIntLink_d): pass
> class ExtLinkClass(GarnetExtLink_d): pass
> class RouterClass(GarnetRouter_d): pass
> elif options.garnet_network == "flexible":
> class NetworkClass(GarnetNetwork): pass
> class IntLinkClass(GarnetIntLink): pass
> class ExtLinkClass(GarnetExtLink): pass
> class RouterClass(GarnetRouter): pass
> else:
> class NetworkClass(SimpleNetwork): pass
> class IntLinkClass(BasicIntLink): pass
> class ExtLinkClass(BasicExtLink): pass
> class RouterClass(BasicRouter): pass
>
> #
81c100,102
< net_topology = eval("%s.makeTopology(all_cntrls, options)" \
---
> net_topology = eval("%s.makeTopology(all_cntrls, options, \
> IntLinkClass, ExtLinkClass, \
> RouterClass)" \
86,92d106
<
< if options.garnet_network == "fixed":
< network = GarnetNetwork_d(topology = net_topology)
< elif options.garnet_network == "flexible":
< network = GarnetNetwork(topology = net_topology)
< else:
< network = SimpleNetwork(topology = net_topology)
93a108,109
> network = NetworkClass(topology = net_topology)
>