ruby: continue style pass

1 files changed, 92 insertions, 95 deletions

diff --git a/src/mem/ruby/profiler/StoreTrace.cc b/src/mem/ruby/profiler/StoreTrace.cc
index 4d4e4798d..ce42560b6 100644
--- a/src/mem/ruby/profiler/StoreTrace.cc
+++ b/src/mem/ruby/profiler/StoreTrace.cc
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
  * All rights reserved.
@@ -27,132 +26,130 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
- * $Id$
- *
- */
-
-#include "mem/ruby/profiler/StoreTrace.hh"
 #include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/profiler/StoreTrace.hh"
 
-bool StoreTrace::s_init = false; // Total number of store lifetimes of all lines
-int64 StoreTrace::s_total_samples = 0; // Total number of store lifetimes of all lines
+bool StoreTrace::s_init = false; // Total number of store lifetimes of
+                                 // all lines
+int64 StoreTrace::s_total_samples = 0; // Total number of store
+                                       // lifetimes of all lines
 Histogram* StoreTrace::s_store_count_ptr = NULL;
 Histogram* StoreTrace::s_store_first_to_stolen_ptr = NULL;
 Histogram* StoreTrace::s_store_last_to_stolen_ptr = NULL;
 Histogram* StoreTrace::s_store_first_to_last_ptr = NULL;
 
-StoreTrace::StoreTrace(const Address& addr) :
-  m_store_count(-1), m_store_first_to_stolen(-1), m_store_last_to_stolen(-1), m_store_first_to_last(-1)
+StoreTrace::StoreTrace(const Address& addr)
+    : m_store_count(-1), m_store_first_to_stolen(-1),
+      m_store_last_to_stolen(-1), m_store_first_to_last(-1)
 {
-  StoreTrace::initSummary();
-  m_addr = addr;
-  m_total_samples = 0;
-  m_last_writer = -1;  // Really -1 isn't valid, so this will trigger the initilization code
-  m_stores_this_interval = 0;
+    StoreTrace::initSummary();
+    m_addr = addr;
+    m_total_samples = 0;
+
+    // Really -1 isn't valid, so this will trigger the initilization code
+    m_last_writer = -1;
+    m_stores_this_interval = 0;
 }
 
 StoreTrace::~StoreTrace()
 {
 }
 
-void StoreTrace::print(ostream& out) const
+void
+StoreTrace::print(ostream& out) const
 {
-  out << m_addr;
-  out << " total_samples: " << m_total_samples << endl;
-  out << "store_count: " << m_store_count << endl;
-  out << "store_first_to_stolen: " << m_store_first_to_stolen << endl;
-  out << "store_last_to_stolen: " << m_store_last_to_stolen << endl;
-  out << "store_first_to_last: " << m_store_first_to_last  << endl;
+    out << m_addr
+        << " total_samples: " << m_total_samples << endl
+        << "store_count: " << m_store_count << endl
+        << "store_first_to_stolen: " << m_store_first_to_stolen << endl
+        << "store_last_to_stolen: " << m_store_last_to_stolen << endl
+        << "store_first_to_last: " << m_store_first_to_last  << endl;
 }
 
-// Class method
-void StoreTrace::initSummary()
+void
+StoreTrace::initSummary()
 {
-  if (!s_init) {
-    s_total_samples = 0;
-    s_store_count_ptr = new Histogram(-1);
-    s_store_first_to_stolen_ptr = new Histogram(-1);
-    s_store_last_to_stolen_ptr = new Histogram(-1);
-    s_store_first_to_last_ptr = new Histogram(-1);
-  }
-  s_init = true;
+    if (!s_init) {
+        s_total_samples = 0;
+        s_store_count_ptr = new Histogram(-1);
+        s_store_first_to_stolen_ptr = new Histogram(-1);
+        s_store_last_to_stolen_ptr = new Histogram(-1);
+        s_store_first_to_last_ptr = new Histogram(-1);
+    }
+    s_init = true;
 }
 
-// Class method
-void StoreTrace::printSummary(ostream& out)
+void
+StoreTrace::printSummary(ostream& out)
 {
-  out << "total_samples: " << s_total_samples << endl;
-  out << "store_count: " << (*s_store_count_ptr) << endl;
-  out << "store_first_to_stolen: " << (*s_store_first_to_stolen_ptr) << endl;
-  out << "store_last_to_stolen: " << (*s_store_last_to_stolen_ptr) << endl;
-  out << "store_first_to_last: " << (*s_store_first_to_last_ptr) << endl;
+    out << "total_samples: " << s_total_samples << endl;
+    out << "store_count: " << (*s_store_count_ptr) << endl;
+    out << "store_first_to_stolen: " << (*s_store_first_to_stolen_ptr) << endl;
+    out << "store_last_to_stolen: " << (*s_store_last_to_stolen_ptr) << endl;
+    out << "store_first_to_last: " << (*s_store_first_to_last_ptr) << endl;
 }
 
-// Class method
-void StoreTrace::clearSummary()
+void
+StoreTrace::clearSummary()
 {
-  StoreTrace::initSummary();
-  s_total_samples = 0;
-  s_store_count_ptr->clear();
-  s_store_first_to_stolen_ptr->clear();
-  s_store_last_to_stolen_ptr->clear();
-  s_store_first_to_last_ptr->clear();
+    StoreTrace::initSummary();
+    s_total_samples = 0;
+    s_store_count_ptr->clear();
+    s_store_first_to_stolen_ptr->clear();
+    s_store_last_to_stolen_ptr->clear();
+    s_store_first_to_last_ptr->clear();
 }
 
-void StoreTrace::store(NodeID node)
+void
+StoreTrace::store(NodeID node)
 {
-  Time current = g_eventQueue_ptr->getTime();
-
-  assert((m_last_writer == -1) || (m_last_writer == node));
+    Time current = g_eventQueue_ptr->getTime();
 
-  m_last_writer = node;
-  if (m_last_writer == -1) {
-    assert(m_stores_this_interval == 0);
-  }
+    assert((m_last_writer == -1) || (m_last_writer == node));
 
-  if (m_stores_this_interval == 0) {
-    // A new proessor just wrote the line, so reset the stats
-    m_first_store = current;
-  }
+    m_last_writer = node;
+    if (m_last_writer == -1) {
+        assert(m_stores_this_interval == 0);
+    }
 
-  m_last_store = current;
-  m_stores_this_interval++;
-}
+    if (m_stores_this_interval == 0) {
+        // A new proessor just wrote the line, so reset the stats
+        m_first_store = current;
+    }
 
-void StoreTrace::downgrade(NodeID node)
-{
-  if (node == m_last_writer) {
-    Time current = g_eventQueue_ptr->getTime();
-    assert(m_stores_this_interval != 0);
-    assert(m_last_store != 0);
-    assert(m_first_store != 0);
-    assert(m_last_writer != -1);
-
-    // Per line stats
-    m_store_first_to_stolen.add(current - m_first_store);
-    m_store_count.add(m_stores_this_interval);
-    m_store_last_to_stolen.add(current - m_last_store);
-    m_store_first_to_last.add(m_last_store - m_first_store);
-    m_total_samples++;
-
-    // Global stats
-    assert(s_store_first_to_stolen_ptr != NULL);
-    s_store_first_to_stolen_ptr->add(current - m_first_store);
-    s_store_count_ptr->add(m_stores_this_interval);
-    s_store_last_to_stolen_ptr->add(current - m_last_store);
-    s_store_first_to_last_ptr->add(m_last_store - m_first_store);
-    s_total_samples++;
-
-    // Initilize for next go round
-    m_stores_this_interval = 0;
-    m_last_store = 0;
-    m_first_store = 0;
-    m_last_writer = -1;
-  }
+    m_last_store = current;
+    m_stores_this_interval++;
 }
 
-bool node_less_then_eq(const StoreTrace* n1, const StoreTrace* n2)
+void
+StoreTrace::downgrade(NodeID node)
 {
-  return (n1->getTotal() > n2->getTotal());
+    if (node == m_last_writer) {
+        Time current = g_eventQueue_ptr->getTime();
+        assert(m_stores_this_interval != 0);
+        assert(m_last_store != 0);
+        assert(m_first_store != 0);
+        assert(m_last_writer != -1);
+
+        // Per line stats
+        m_store_first_to_stolen.add(current - m_first_store);
+        m_store_count.add(m_stores_this_interval);
+        m_store_last_to_stolen.add(current - m_last_store);
+        m_store_first_to_last.add(m_last_store - m_first_store);
+        m_total_samples++;
+
+        // Global stats
+        assert(s_store_first_to_stolen_ptr != NULL);
+        s_store_first_to_stolen_ptr->add(current - m_first_store);
+        s_store_count_ptr->add(m_stores_this_interval);
+        s_store_last_to_stolen_ptr->add(current - m_last_store);
+        s_store_first_to_last_ptr->add(m_last_store - m_first_store);
+        s_total_samples++;
+
+        // Initilize for next go round
+        m_stores_this_interval = 0;
+        m_last_store = 0;
+        m_first_store = 0;
+        m_last_writer = -1;
+    }
 }