| Ruby.py (9841:69c158420c51) | Ruby.py (9862:54d6728d99cf) |
|---|---|
| 1# Copyright (c) 2012 ARM Limited 2# All rights reserved. 3# 4# The license below extends only to copyright in the software and shall 5# not be construed as granting a license to any other intellectual 6# property including but not limited to intellectual property relating 7# to a hardware implementation of the functionality of the software 8# licensed hereunder. You may use the software subject to the license --- 131 unchanged lines hidden (view full) --- 140 class ExtLinkClass(GarnetExtLink): pass 141 class RouterClass(GarnetRouter): pass 142 else: 143 class NetworkClass(SimpleNetwork): pass 144 class IntLinkClass(SimpleIntLink): pass 145 class ExtLinkClass(SimpleExtLink): pass 146 class RouterClass(Switch): pass 147 | 1# Copyright (c) 2012 ARM Limited 2# All rights reserved. 3# 4# The license below extends only to copyright in the software and shall 5# not be construed as granting a license to any other intellectual 6# property including but not limited to intellectual property relating 7# to a hardware implementation of the functionality of the software 8# licensed hereunder. You may use the software subject to the license --- 131 unchanged lines hidden (view full) --- 140 class ExtLinkClass(GarnetExtLink): pass 141 class RouterClass(GarnetRouter): pass 142 else: 143 class NetworkClass(SimpleNetwork): pass 144 class IntLinkClass(SimpleIntLink): pass 145 class ExtLinkClass(SimpleExtLink): pass 146 class RouterClass(Switch): pass 147 |
| 148 # 149 # Important: the topology must be instantiated before the network and after 150 # the controllers. Hence the separation between topology definition and 151 # instantiation. 152 # | |
| 153 | 148 |
| 154 routers, int_links, ext_links = topology.makeTopology(options, 155 IntLinkClass, ExtLinkClass, RouterClass) 156 network = NetworkClass(ruby_system = ruby, routers = routers, 157 int_links = int_links, ext_links = ext_links, 158 topology = topology.description) | 149 # Create the network topology 150 network = NetworkClass(ruby_system = ruby, topology = topology.description, 151 routers = [], ext_links = [], int_links = []) 152 topology.makeTopology(options, network, IntLinkClass, ExtLinkClass, 153 RouterClass) |
| 159 160 if options.network_fault_model: 161 assert(options.garnet_network == "fixed") 162 network.enable_fault_model = True 163 network.fault_model = FaultModel() 164 165 # 166 # Loop through the directory controlers. --- 34 unchanged lines hidden --- | 154 155 if options.network_fault_model: 156 assert(options.garnet_network == "fixed") 157 network.enable_fault_model = True 158 network.fault_model = FaultModel() 159 160 # 161 # Loop through the directory controlers. --- 34 unchanged lines hidden --- |