style: another ruby style pass

1 files changed, 135 insertions, 124 deletions

diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc
index 88695250c..30403cd67 100644
--- a/src/mem/ruby/network/simple/Switch.cc
+++ b/src/mem/ruby/network/simple/Switch.cc
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
  * All rights reserved.
@@ -27,182 +26,194 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
- * Switch.cc
- *
- * Description: See Switch.hh
- *
- * $Id$
- *
- */
-
-
-#include "mem/ruby/network/simple/Switch.hh"
-#include "mem/ruby/network/simple/PerfectSwitch.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
-#include "mem/ruby/network/simple/Throttle.hh"
 #include "mem/protocol/MessageSizeType.hh"
-#include "mem/ruby/network/Network.hh"
 #include "mem/protocol/Protocol.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/ruby/network/simple/PerfectSwitch.hh"
+#include "mem/ruby/network/simple/Switch.hh"
+#include "mem/ruby/network/simple/Throttle.hh"
 
 Switch::Switch(SwitchID sid, SimpleNetwork* network_ptr)
 {
-  m_perfect_switch_ptr = new PerfectSwitch(sid, network_ptr);
-  m_switch_id = sid;
-  m_throttles.setSize(0);
+    m_perfect_switch_ptr = new PerfectSwitch(sid, network_ptr);
+    m_switch_id = sid;
+    m_throttles.setSize(0);
 }
 
 Switch::~Switch()
 {
-  delete m_perfect_switch_ptr;
+    delete m_perfect_switch_ptr;
 
-  // Delete throttles (one per output port)
-  m_throttles.deletePointers();
+    // Delete throttles (one per output port)
+    m_throttles.deletePointers();
 
-  // Delete MessageBuffers
-  m_buffers_to_free.deletePointers();
+    // Delete MessageBuffers
+    m_buffers_to_free.deletePointers();
 }
 
-void Switch::addInPort(const Vector<MessageBuffer*>& in)
+void
+Switch::addInPort(const Vector<MessageBuffer*>& in)
 {
-  m_perfect_switch_ptr->addInPort(in);
+    m_perfect_switch_ptr->addInPort(in);
 }
 
-void Switch::addOutPort(const Vector<MessageBuffer*>& out, const NetDest& routing_table_entry, int link_latency, int bw_multiplier)
+void
+Switch::addOutPort(const Vector<MessageBuffer*>& out,
+    const NetDest& routing_table_entry, int link_latency, int bw_multiplier)
 {
-  Throttle* throttle_ptr = NULL;
-
-  // Create a throttle
-  throttle_ptr = new Throttle(m_switch_id, m_throttles.size(), link_latency, bw_multiplier);
-  m_throttles.insertAtBottom(throttle_ptr);
-
-  // Create one buffer per vnet (these are intermediaryQueues)
-  Vector<MessageBuffer*> intermediateBuffers;
-  for (int i=0; i<out.size(); i++) {
-    MessageBuffer* buffer_ptr = new MessageBuffer;
-    // Make these queues ordered
-    buffer_ptr->setOrdering(true);
-    Network* net_ptr = RubySystem::getNetwork();
-    if(net_ptr->getBufferSize() > 0) {
-      buffer_ptr->setSize(net_ptr->getBufferSize());
-    }
-    intermediateBuffers.insertAtBottom(buffer_ptr);
-    m_buffers_to_free.insertAtBottom(buffer_ptr);
+    Throttle* throttle_ptr = NULL;
+
+    // Create a throttle
+    throttle_ptr = new Throttle(m_switch_id, m_throttles.size(), link_latency,
+        bw_multiplier);
+    m_throttles.insertAtBottom(throttle_ptr);
+
+    // Create one buffer per vnet (these are intermediaryQueues)
+    Vector<MessageBuffer*> intermediateBuffers;
+    for (int i = 0; i < out.size(); i++) {
+        MessageBuffer* buffer_ptr = new MessageBuffer;
+        // Make these queues ordered
+        buffer_ptr->setOrdering(true);
+        Network* net_ptr = RubySystem::getNetwork();
+        if (net_ptr->getBufferSize() > 0) {
+            buffer_ptr->setSize(net_ptr->getBufferSize());
+        }
+        intermediateBuffers.insertAtBottom(buffer_ptr);
+        m_buffers_to_free.insertAtBottom(buffer_ptr);
   }
 
-  // Hook the queues to the PerfectSwitch
-  m_perfect_switch_ptr->addOutPort(intermediateBuffers, routing_table_entry);
-
-  // Hook the queues to the Throttle
-  throttle_ptr->addLinks(intermediateBuffers, out);
+    // Hook the queues to the PerfectSwitch
+    m_perfect_switch_ptr->addOutPort(intermediateBuffers, routing_table_entry);
 
+    // Hook the queues to the Throttle
+    throttle_ptr->addLinks(intermediateBuffers, out);
 }
 
-void Switch::clearRoutingTables()
+void
+Switch::clearRoutingTables()
 {
-  m_perfect_switch_ptr->clearRoutingTables();
+    m_perfect_switch_ptr->clearRoutingTables();
 }
 
-void Switch::clearBuffers()
+void
+Switch::clearBuffers()
 {
-  m_perfect_switch_ptr->clearBuffers();
-  for (int i=0; i<m_throttles.size(); i++) {
-    if (m_throttles[i] != NULL) {
-      m_throttles[i]->clear();
+    m_perfect_switch_ptr->clearBuffers();
+    for (int i = 0; i < m_throttles.size(); i++) {
+        if (m_throttles[i] != NULL) {
+            m_throttles[i]->clear();
+        }
     }
-  }
 }
 
-void Switch::reconfigureOutPort(const NetDest& routing_table_entry)
+void
+Switch::reconfigureOutPort(const NetDest& routing_table_entry)
 {
-  m_perfect_switch_ptr->reconfigureOutPort(routing_table_entry);
+    m_perfect_switch_ptr->reconfigureOutPort(routing_table_entry);
 }
 
-const Throttle* Switch::getThrottle(LinkID link_number) const
+const Throttle*
+Switch::getThrottle(LinkID link_number) const
 {
-  assert(m_throttles[link_number] != NULL);
-  return m_throttles[link_number];
+    assert(m_throttles[link_number] != NULL);
+    return m_throttles[link_number];
 }
 
-const Vector<Throttle*>* Switch::getThrottles() const
+const Vector<Throttle*>*
+Switch::getThrottles() const
 {
-  return &m_throttles;
+    return &m_throttles;
 }
 
-void Switch::printStats(std::ostream& out) const
+void
+Switch::printStats(std::ostream& out) const
 {
-  using namespace std;
-
-  out << "switch_" << m_switch_id << "_inlinks: " << m_perfect_switch_ptr->getInLinks() << endl;
-  out << "switch_" << m_switch_id << "_outlinks: " << m_perfect_switch_ptr->getOutLinks() << endl;
-
-  // Average link utilizations
-  double average_utilization = 0.0;
-  int throttle_count = 0;
-
-  for (int i=0; i<m_throttles.size(); i++) {
-    Throttle* throttle_ptr = m_throttles[i];
-    if (throttle_ptr != NULL) {
-      average_utilization += throttle_ptr->getUtilization();
-      throttle_count++;
+    using namespace std;
+
+    ccprintf(out, "switch_%d_inlinks: %d\n", m_switch_id,
+        m_perfect_switch_ptr->getInLinks());
+    ccprintf(out, "switch_%d_outlinks: %d\n", m_switch_id,
+        m_perfect_switch_ptr->getOutLinks());
+
+    // Average link utilizations
+    double average_utilization = 0.0;
+    int throttle_count = 0;
+
+    for (int i = 0; i < m_throttles.size(); i++) {
+        Throttle* throttle_ptr = m_throttles[i];
+        if (throttle_ptr) {
+            average_utilization += throttle_ptr->getUtilization();
+            throttle_count++;
+        }
     }
-  }
-  average_utilization = (throttle_count == 0) ? 0 : average_utilization / float(throttle_count);
-
-  // Individual link utilizations
-  out << "links_utilized_percent_switch_" << m_switch_id << ": " << average_utilization << endl;
-  for (int link=0; link<m_throttles.size(); link++) {
-    Throttle* throttle_ptr = m_throttles[link];
-    if (throttle_ptr != NULL) {
-      out << "  links_utilized_percent_switch_" << m_switch_id << "_link_" << link << ": "
-          << throttle_ptr->getUtilization() << " bw: " << throttle_ptr->getLinkBandwidth()
-          << " base_latency: " << throttle_ptr->getLatency() << endl;
+    average_utilization =
+        throttle_count == 0 ? 0 : average_utilization / throttle_count;
+
+    // Individual link utilizations
+    out << "links_utilized_percent_switch_" << m_switch_id << ": "
+        << average_utilization << endl;
+
+    for (int link = 0; link < m_throttles.size(); link++) {
+        Throttle* throttle_ptr = m_throttles[link];
+        if (throttle_ptr != NULL) {
+            out << "  links_utilized_percent_switch_" << m_switch_id
+                << "_link_" << link << ": "
+                << throttle_ptr->getUtilization() << " bw: "
+                << throttle_ptr->getLinkBandwidth()
+                << " base_latency: " << throttle_ptr->getLatency() << endl;
+        }
     }
-  }
-  out << endl;
-
-  // Traffic breakdown
-  for (int link=0; link<m_throttles.size(); link++) {
-    Throttle* throttle_ptr = m_throttles[link];
-    if (throttle_ptr != NULL) {
-      const Vector<Vector<int> >& message_counts = throttle_ptr->getCounters();
-      for (int int_type=0; int_type<MessageSizeType_NUM; int_type++) {
-        MessageSizeType type = MessageSizeType(int_type);
-        int sum = message_counts[type].sum();
-        if (sum != 0) {
-          out << "  outgoing_messages_switch_" << m_switch_id << "_link_" << link << "_" << type
-              << ": " << sum << " " << sum * (RubySystem::getNetwork()->MessageSizeType_to_int(type))
-              << " " << message_counts[type] << " base_latency: " << throttle_ptr->getLatency() << endl;
+    out << endl;
+
+    // Traffic breakdown
+    for (int link = 0; link < m_throttles.size(); link++) {
+        Throttle* throttle_ptr = m_throttles[link];
+        if (!throttle_ptr)
+            continue;
+
+        const Vector<Vector<int> >& message_counts =
+            throttle_ptr->getCounters();
+        for (int int_type = 0; int_type < MessageSizeType_NUM; int_type++) {
+            MessageSizeType type = MessageSizeType(int_type);
+            int sum = message_counts[type].sum();
+            if (sum == 0)
+                continue;
+
+            out << "  outgoing_messages_switch_" << m_switch_id
+                << "_link_" << link << "_" << type << ": " << sum << " "
+                << sum * RubySystem::getNetwork()->MessageSizeType_to_int(type)
+                << " " << message_counts[type] << " base_latency: "
+                << throttle_ptr->getLatency() << endl;
         }
-      }
     }
-  }
-  out << endl;
+    out << endl;
 }
 
-void Switch::clearStats()
+void
+Switch::clearStats()
 {
-  m_perfect_switch_ptr->clearStats();
-  for (int i=0; i<m_throttles.size(); i++) {
-    if (m_throttles[i] != NULL) {
-      m_throttles[i]->clearStats();
+    m_perfect_switch_ptr->clearStats();
+    for (int i = 0; i < m_throttles.size(); i++) {
+        if (m_throttles[i] != NULL)
+            m_throttles[i]->clearStats();
     }
-  }
 }
 
-void Switch::printConfig(std::ostream& out) const
+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);
+    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
+void
+Switch::print(std::ostream& out) const
 {
-  // FIXME printing
-  out << "[Switch]";
+    // FIXME printing
+    out << "[Switch]";
 }