ruby: moved topology to the top network directory

Moved the Topology class to the top network directory because it is shared by
both the simple and Garnet networks.

--HG--
rename : src/mem/ruby/network/simple/Topology.cc => src/mem/ruby/network/Topology.cc
rename : src/mem/ruby/network/simple/Topology.hh => src/mem/ruby/network/Topology.hh
This commit is contained in:
Brad Beckmann 2011-04-28 17:18:12 -07:00
parent 7adb8fa94b
commit cf9ce2cf28
8 changed files with 6 additions and 6 deletions

View file

@ -28,8 +28,8 @@
#include "base/misc.hh"
#include "mem/protocol/MachineType.hh"
#include "mem/ruby/network/simple/Topology.hh"
#include "mem/ruby/network/Network.hh"
#include "mem/ruby/network/Topology.hh"
Network::Network(const Params *p)
: SimObject(p)

View file

@ -36,3 +36,4 @@ if not env['RUBY']:
SimObject('Network.py')
Source('Network.cc')
Source('Topology.cc')

View file

@ -33,8 +33,8 @@
#include "mem/protocol/Protocol.hh"
#include "mem/protocol/TopologyType.hh"
#include "mem/ruby/common/NetDest.hh"
#include "mem/ruby/network/simple/Topology.hh"
#include "mem/ruby/network/Network.hh"
#include "mem/ruby/network/Topology.hh"
#include "mem/ruby/slicc_interface/AbstractController.hh"
#include "mem/ruby/system/System.hh"

View file

@ -39,7 +39,7 @@
#include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh"
#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
#include "mem/ruby/network/simple/Topology.hh"
#include "mem/ruby/network/Topology.hh"
using namespace std;
using m5::stl_helpers::deletePointers;

View file

@ -40,7 +40,7 @@
#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh"
#include "mem/ruby/network/garnet/flexible-pipeline/Router.hh"
#include "mem/ruby/network/simple/SimpleNetwork.hh"
#include "mem/ruby/network/simple/Topology.hh"
#include "mem/ruby/network/Topology.hh"
using namespace std;
using m5::stl_helpers::deletePointers;

View file

@ -39,4 +39,3 @@ Source('PerfectSwitch.cc')
Source('SimpleNetwork.cc')
Source('Switch.cc')
Source('Throttle.cc')
Source('Topology.cc')

View file

@ -38,7 +38,7 @@
#include "mem/ruby/network/simple/SimpleNetwork.hh"
#include "mem/ruby/network/simple/Switch.hh"
#include "mem/ruby/network/simple/Throttle.hh"
#include "mem/ruby/network/simple/Topology.hh"
#include "mem/ruby/network/Topology.hh"
#include "mem/ruby/profiler/Profiler.hh"
#include "mem/ruby/system/System.hh"