ruby: network: removes unused code.

diff --git a/src/mem/ruby/network/Network.cc b/src/mem/ruby/network/Network.cc
index 5e44c435ea60805066c59ad11f096d066f3ee04e..1c6dd9da4e7c4242430966cbb016bd05991966ae 100644 (file)
--- a/src/mem/ruby/network/Network.cc
+++ b/src/mem/ruby/network/Network.cc
@@ -98,9 +98,3 @@ Network::MessageSizeType_to_int(MessageSizeType size_type)
         break;
     }
 }
-
-const std::vector<Throttle*>*
-Network::getThrottles(NodeID id) const
-{
-    return NULL;
-}

diff --git a/src/mem/ruby/network/Network.hh b/src/mem/ruby/network/Network.hh
index 33a3fc33fb9386140b052fc9d0d915b5a1c4f355..527f22ca26d506ad42e28dbdc74b40a61536a359 100644 (file)
--- a/src/mem/ruby/network/Network.hh
+++ b/src/mem/ruby/network/Network.hh
@@ -75,7 +75,6 @@ class Network : public ClockedObject
         int netNumber, std::string vnet_type) = 0;
     virtual MessageBuffer* getFromNetQueue(NodeID id, bool ordered,
         int netNumber, std::string vnet_type) = 0;
-    virtual const std::vector<Throttle*>* getThrottles(NodeID id) const;
     virtual int getNumNodes() {return 1;}
 
     virtual void makeOutLink(SwitchID src, NodeID dest, BasicLink* link,

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
index f3457ebc7e369f9c0a131dba9de6ec51cfbf9ab0..b48efb6329a1cfb4b5ef1c596a76e4c73a3492b7 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
@@ -343,7 +343,7 @@ NetworkInterface_d::scheduleOutputLink()
 int
 NetworkInterface_d::get_vnet(int vc)
 {
-    for (int i = 0; i < m_net_ptr->getNumberOfVirtualNetworks(); i++) {
+    for (int i = 0; i < m_virtual_networks; i++) {
         if (vc >= (i*m_vc_per_vnet) && vc < ((i+1)*m_vc_per_vnet)) {
             return i;
         }

diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc
index a3848a8e325f841496973b31d43c8e6704b5944c..9ab1f886648dc332374f6b6bdd35a1c167b1f394 100644 (file)
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc
@@ -196,15 +196,6 @@ SimpleNetwork::getFromNetQueue(NodeID id, bool ordered, int network_num,
     return m_fromNetQueues[id][network_num];
 }
 
-const std::vector<Throttle*>*
-SimpleNetwork::getThrottles(NodeID id) const
-{
-    assert(id >= 0);
-    assert(id < m_nodes);
-    assert(m_endpoint_switches[id] != NULL);
-    return m_endpoint_switches[id]->getThrottles();
-}
-
 void
 SimpleNetwork::regStats()
 {

diff --git a/src/mem/ruby/network/simple/SimpleNetwork.hh b/src/mem/ruby/network/simple/SimpleNetwork.hh
index 69aeeffb70e894f206086c421aeb08aeada57d28..e0193f2e0ac9a90dd6aeb5a7d412d1a1ab5520fb 100644 (file)
--- a/src/mem/ruby/network/simple/SimpleNetwork.hh
+++ b/src/mem/ruby/network/simple/SimpleNetwork.hh
@@ -62,7 +62,6 @@ class SimpleNetwork : public Network
     // returns the queue requested for the given component
     MessageBuffer* getToNetQueue(NodeID id, bool ordered, int network_num, std::string vnet_type);
     MessageBuffer* getFromNetQueue(NodeID id, bool ordered, int network_num, std::string vnet_type);
-    virtual const std::vector<Throttle*>* getThrottles(NodeID id) const;
 
     bool isVNetOrdered(int vnet) { return m_ordered[vnet]; }
     bool validVirtualNetwork(int vnet) { return m_in_use[vnet]; }

diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc
index d5c32016e7c9de1062687761ead787b6780cb46c..1e153be767c1a615bdcc00c8a99cd5de90e4db7d 100644 (file)
--- a/src/mem/ruby/network/simple/Switch.cc
+++ b/src/mem/ruby/network/simple/Switch.cc
@@ -116,12 +116,6 @@ Switch::getThrottle(LinkID link_number) const
     return m_throttles[link_number];
 }
 
-const vector<Throttle*>*
-Switch::getThrottles() const
-{
-    return &m_throttles;
-}
-
 void
 Switch::regStats()
 {

diff --git a/src/mem/ruby/network/simple/Switch.hh b/src/mem/ruby/network/simple/Switch.hh
index 85f1b6d6f19b3892beac1972c5fb87ec3beeecd7..58193d42d627cdd73ef61c3579d9007414b5d31b 100644 (file)
--- a/src/mem/ruby/network/simple/Switch.hh
+++ b/src/mem/ruby/network/simple/Switch.hh
@@ -67,7 +67,6 @@ class Switch : public BasicRouter
         const NetDest& routing_table_entry, Cycles link_latency,
         int bw_multiplier);
     const Throttle* getThrottle(LinkID link_number) const;
-    const std::vector<Throttle*>* getThrottles() const;
 
     void resetStats();
     void collateStats();

diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc
index df5e624b3069f532f2af1279a0378ee69f4b98cc..778436c6d96d0dece93ccbd7d875b74388efff53 100644 (file)
--- a/src/mem/ruby/network/simple/Throttle.cc
+++ b/src/mem/ruby/network/simple/Throttle.cc
@@ -39,8 +39,6 @@
 
 using namespace std;
 
-const int HIGH_RANGE = 256;
-const int ADJUST_INTERVAL = 50000;
 const int MESSAGE_SIZE_MULTIPLIER = 1000;
 //const int BROADCAST_SCALING = 4; // Have a 16p system act like a 64p systems
 const int BROADCAST_SCALING = 1;