diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2014-02-21 08:02:05 -0600 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2014-02-21 08:02:05 -0600 |
| commit | cd33f9bc42816e812298e726fe40a8c68934f965 (patch) | |
| tree | 3d94a6044f3dde64c3910cea27a1d825248751f9 /src/mem/ruby/network/simple | |
| parent | bd8f954526bc33ab2b57fbc91f2caa82b2115db8 (diff) | |
| download | gem5-cd33f9bc42816e812298e726fe40a8c68934f965.tar.xz | |
ruby: network: move message buffers to base network class.
Diffstat (limited to 'src/mem/ruby/network/simple')
| -rw-r--r-- | src/mem/ruby/network/simple/SimpleNetwork.cc | 2 | ||||
| -rw-r--r-- | src/mem/ruby/network/simple/SimpleNetwork.hh | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc index 9ab1f8866..05b729183 100644 --- a/src/mem/ruby/network/simple/SimpleNetwork.cc +++ b/src/mem/ruby/network/simple/SimpleNetwork.cc @@ -33,12 +33,10 @@ #include "base/stl_helpers.hh" #include "mem/ruby/buffers/MessageBuffer.hh" #include "mem/ruby/common/NetDest.hh" -#include "mem/ruby/network/BasicLink.hh" #include "mem/ruby/network/simple/SimpleLink.hh" #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/Topology.hh" #include "mem/ruby/profiler/Profiler.hh" #include "mem/ruby/system/System.hh" diff --git a/src/mem/ruby/network/simple/SimpleNetwork.hh b/src/mem/ruby/network/simple/SimpleNetwork.hh index e0193f2e0..335ba15a0 100644 --- a/src/mem/ruby/network/simple/SimpleNetwork.hh +++ b/src/mem/ruby/network/simple/SimpleNetwork.hh @@ -32,16 +32,13 @@ #include <iostream> #include <vector> -#include "mem/ruby/common/Global.hh" #include "mem/ruby/network/Network.hh" #include "params/SimpleNetwork.hh" -#include "sim/sim_object.hh" class NetDest; class MessageBuffer; class Throttle; class Switch; -class Topology; class SimpleNetwork : public Network { @@ -94,13 +91,6 @@ class SimpleNetwork : public Network // Private copy constructor and assignment operator SimpleNetwork(const SimpleNetwork& obj); SimpleNetwork& operator=(const SimpleNetwork& obj); - - // vector of queues from the components - std::vector<std::vector<MessageBuffer*> > m_toNetQueues; - std::vector<std::vector<MessageBuffer*> > m_fromNetQueues; - - std::vector<bool> m_in_use; - std::vector<bool> m_ordered; std::vector<Switch*> m_switches; std::vector<MessageBuffer*> m_buffers_to_free; std::vector<Switch*> m_endpoint_switches; |