From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Fri, 6 Sep 2013 21:21:30 +0000 (-0500)
Subject: ruby: network: removes reset functionality
X-Git-Tag: stable_2014_02_15~144
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0280997fbfa3b762a269d9ad97e14aca57316976;p=gem5.git

ruby: network: removes reset functionality
---

diff --git a/src/mem/ruby/network/Network.hh b/src/mem/ruby/network/Network.hh
index c2c8f322b..400972020 100644
--- a/src/mem/ruby/network/Network.hh
+++ b/src/mem/ruby/network/Network.hh
@@ -88,8 +88,6 @@ class Network : public ClockedObject
                                   LinkDirection direction,
                                   const NetDest& routing_table_entry) = 0;
 
-    virtual void reset() = 0;
-
     virtual void printStats(std::ostream& out) const = 0;
     virtual void clearStats() = 0;
     virtual void print(std::ostream& out) const = 0;
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
index 0254e1a86..238006881 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
@@ -128,17 +128,6 @@ GarnetNetwork_d::~GarnetNetwork_d()
     delete m_topology_ptr;
 }
 
-void
-GarnetNetwork_d::reset()
-{
-    for (int node = 0; node < m_nodes; node++) {
-        for (int j = 0; j < m_virtual_networks; j++) {
-            m_toNetQueues[node][j]->clear();
-            m_fromNetQueues[node][j]->clear();
-        }
-    }
-}
-
 /*
  * This function creates a link from the Network Interface (NI)
  * into the Network.
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
index ee3277896..919e6703e 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
@@ -74,8 +74,6 @@ class GarnetNetwork_d : public BaseGarnetNetwork
         return m_vnet_type[vnet];
     }
 
-    void reset();
-
     // Methods used by Topology to setup the network
     void makeOutLink(SwitchID src, NodeID dest, BasicLink* link, 
                      LinkDirection direction,
diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
index 6ec0bc1e8..ea08a054b 100644
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
@@ -97,17 +97,6 @@ GarnetNetwork::~GarnetNetwork()
     delete m_topology_ptr;
 }
 
-void
-GarnetNetwork::reset()
-{
-    for (int node = 0; node < m_nodes; node++) {
-        for (int j = 0; j < m_virtual_networks; j++) {
-            m_toNetQueues[node][j]->clear();
-            m_fromNetQueues[node][j]->clear();
-        }
-    }
-}
-
 void
 GarnetNetwork::makeInLink(NodeID src, SwitchID dest, BasicLink* link, 
                           LinkDirection direction, 
diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh
index 1255b6a1b..fb4f99d19 100644
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh
@@ -61,8 +61,6 @@ class GarnetNetwork : public BaseGarnetNetwork
 
     int getNumNodes(){ return m_nodes; }
 
-    void reset();
-
     void printLinkStats(std::ostream& out) const;
     void printPowerStats(std::ostream& out) const;
     void print(std::ostream& out) const;
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc
index 19b323948..b71631d26 100644
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc
@@ -99,21 +99,6 @@ SimpleNetwork::init()
     m_topology_ptr->createLinks(this);
 }
 
-void
-SimpleNetwork::reset()
-{
-    for (int node = 0; node < m_nodes; node++) {
-        for (int j = 0; j < m_virtual_networks; j++) {
-            m_toNetQueues[node][j]->clear();
-            m_fromNetQueues[node][j]->clear();
-        }
-    }
-
-    for(int i = 0; i < m_switches.size(); i++){
-        m_switches[i]->clearBuffers();
-    }
-}
-
 SimpleNetwork::~SimpleNetwork()
 {
     for (int i = 0; i < m_nodes; i++) {
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.hh b/src/mem/ruby/network/simple/SimpleNetwork.hh
index ae151429d..e720d8445 100644
--- a/src/mem/ruby/network/simple/SimpleNetwork.hh
+++ b/src/mem/ruby/network/simple/SimpleNetwork.hh
@@ -58,7 +58,6 @@ class SimpleNetwork : public Network
 
     void printStats(std::ostream& out) const;
     void clearStats();
-    void reset();
 
     // returns the queue requested for the given component
     MessageBuffer* getToNetQueue(NodeID id, bool ordered, int network_num, std::string vnet_type);