From b913af440b17b1eb146afafb2ce5a1577910dde1 Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Thu, 12 Jul 2012 08:39:19 -0500
Subject: Ruby: remove config information from ruby.stats This patch removes
 printConfig() functions from all structures in Ruby. Most of the information
 is already part of config.ini, and where ever it is not, it would become in
 due course.

---
 src/mem/ruby/network/simple/PerfectSwitch.cc |  5 -----
 src/mem/ruby/network/simple/PerfectSwitch.hh |  2 --
 src/mem/ruby/network/simple/SimpleNetwork.cc | 33 ----------------------------
 src/mem/ruby/network/simple/SimpleNetwork.hh |  2 --
 src/mem/ruby/network/simple/Switch.cc        | 10 ---------
 src/mem/ruby/network/simple/Switch.hh        |  2 --
 src/mem/ruby/network/simple/Throttle.cc      |  5 -----
 src/mem/ruby/network/simple/Throttle.hh      |  1 -
 8 files changed, 60 deletions(-)

(limited to 'src/mem/ruby/network/simple')

diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc
index 885e93796..50b2055b5 100644
--- a/src/mem/ruby/network/simple/PerfectSwitch.cc
+++ b/src/mem/ruby/network/simple/PerfectSwitch.cc
@@ -333,11 +333,6 @@ PerfectSwitch::clearStats()
 {
 }
 
-void
-PerfectSwitch::printConfig(std::ostream& out) const
-{
-}
-
 void
 PerfectSwitch::print(std::ostream& out) const
 {
diff --git a/src/mem/ruby/network/simple/PerfectSwitch.hh b/src/mem/ruby/network/simple/PerfectSwitch.hh
index d761c398d..65a52eb08 100644
--- a/src/mem/ruby/network/simple/PerfectSwitch.hh
+++ b/src/mem/ruby/network/simple/PerfectSwitch.hh
@@ -76,8 +76,6 @@ class PerfectSwitch : public Consumer
 
     void printStats(std::ostream& out) const;
     void clearStats();
-    void printConfig(std::ostream& out) const;
-
     void print(std::ostream& out) const;
 
   private:
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc
index c2bf5c955..84d2ee97f 100644
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc
@@ -313,45 +313,12 @@ SimpleNetwork::clearStats()
     m_topology_ptr->clearStats();
 }
 
-void
-SimpleNetwork::printConfig(ostream& out) const
-{
-    out << endl;
-    out << "Network Configuration" << endl;
-    out << "---------------------" << endl;
-    out << "network: SIMPLE_NETWORK" << endl;
-    out << "topology: " << m_topology_ptr->getName() << endl;
-    out << endl;
-
-    for (int i = 0; i < m_virtual_networks; i++) {
-        out << "virtual_net_" << i << ": ";
-        if (m_in_use[i]) {
-            out << "active, ";
-            if (m_ordered[i]) {
-                out << "ordered" << endl;
-            } else {
-                out << "unordered" << endl;
-            }
-        } else {
-            out << "inactive" << endl;
-        }
-    }
-    out << endl;
-
-    for(int i = 0; i < m_switch_ptr_vector.size(); i++) {
-        m_switch_ptr_vector[i]->printConfig(out);
-    }
-
-    m_topology_ptr->printConfig(out);
-}
-
 void
 SimpleNetwork::print(ostream& out) const
 {
     out << "[SimpleNetwork]";
 }
 
-
 SimpleNetwork *
 SimpleNetworkParams::create()
 {
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.hh b/src/mem/ruby/network/simple/SimpleNetwork.hh
index 54e1ee36e..6dfaa2724 100644
--- a/src/mem/ruby/network/simple/SimpleNetwork.hh
+++ b/src/mem/ruby/network/simple/SimpleNetwork.hh
@@ -58,8 +58,6 @@ class SimpleNetwork : public Network
 
     void printStats(std::ostream& out) const;
     void clearStats();
-    void printConfig(std::ostream& out) const;
-
     void reset();
 
     // returns the queue requested for the given component
diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc
index d9dadbd00..922807a0b 100644
--- a/src/mem/ruby/network/simple/Switch.cc
+++ b/src/mem/ruby/network/simple/Switch.cc
@@ -208,16 +208,6 @@ Switch::clearStats()
     }
 }
 
-void
-Switch::printConfig(std::ostream& out) const
-{
-    m_perfect_switch_ptr->printConfig(out);
-    for (int i = 0; i < m_throttles.size(); i++) {
-        if (m_throttles[i] != NULL)
-            m_throttles[i]->printConfig(out);
-    }
-}
-
 void
 Switch::print(std::ostream& out) const
 {
diff --git a/src/mem/ruby/network/simple/Switch.hh b/src/mem/ruby/network/simple/Switch.hh
index c7630f200..31ea6add1 100644
--- a/src/mem/ruby/network/simple/Switch.hh
+++ b/src/mem/ruby/network/simple/Switch.hh
@@ -68,8 +68,6 @@ class Switch
 
     void printStats(std::ostream& out) const;
     void clearStats();
-    void printConfig(std::ostream& out) const;
-
     void print(std::ostream& out) const;
 
   private:
diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc
index 80697cb58..7936e71dc 100644
--- a/src/mem/ruby/network/simple/Throttle.cc
+++ b/src/mem/ruby/network/simple/Throttle.cc
@@ -238,11 +238,6 @@ Throttle::clearStats()
     }
 }
 
-void
-Throttle::printConfig(ostream& out) const
-{
-}
-
 double
 Throttle::getUtilization() const
 {
diff --git a/src/mem/ruby/network/simple/Throttle.hh b/src/mem/ruby/network/simple/Throttle.hh
index 28fe046b4..37a53b80a 100644
--- a/src/mem/ruby/network/simple/Throttle.hh
+++ b/src/mem/ruby/network/simple/Throttle.hh
@@ -67,7 +67,6 @@ class Throttle : public Consumer
 
     void printStats(std::ostream& out) const;
     void clearStats();
-    void printConfig(std::ostream& out) const;
     // The average utilization (a percent) since last clearStats()
     double getUtilization() const;
     int
-- 
cgit v1.2.3