ruby: get rid of Vector and use STL

add a couple of helper functions to base for deleteing all pointers in
a container and outputting containers to a stream

4 files changed, 26 insertions, 19 deletions

diff --git a/src/mem/ruby/tester/DeterministicDriver.cc b/src/mem/ruby/tester/DeterministicDriver.cc
index e09f633b5..8dce1c702 100644
--- a/src/mem/ruby/tester/DeterministicDriver.cc
+++ b/src/mem/ruby/tester/DeterministicDriver.cc
@@ -39,6 +39,8 @@
 //#include "DMAGenerator.hh"
 #include "mem/ruby/tester/DetermGETXGenerator.hh"
 
+using namespace std;
+
 #define DATA_BLOCK_BYTES 64
 
 DeterministicDriver::DeterministicDriver(string generator_type, int num_completions, int num_procs, Time g_think_time, Time g_wait_time, int g_tester_length)
@@ -56,22 +58,22 @@ DeterministicDriver::DeterministicDriver(string generator_type, int num_completi
   m_wait_time = g_wait_time;
   m_tester_length = g_tester_length;
   
-  m_last_progress_vector.setSize(num_procs);
+  m_last_progress_vector.resize(num_procs);
   for (int i=0; i<m_last_progress_vector.size(); i++) {
     m_last_progress_vector[i] = 0;
   }
 
-  m_load_vector.setSize(10);
+  m_load_vector.resize(10);
   for (int i=0; i<m_load_vector.size(); i++) {
     m_load_vector[i] = -1;  // No processor last held it
   }
 
-  m_store_vector.setSize(10);
+  m_store_vector.resize(10);
   for (int i=0; i<m_store_vector.size(); i++) {
     m_store_vector[i] = -1;  // No processor last held it
   }
 
-  m_generator_vector.setSize(num_procs);
+  m_generator_vector.resize(num_procs);
 
   int generator = string_to_SpecifiedGeneratorType(generator_type);
 
@@ -156,7 +158,7 @@ bool DeterministicDriver::isLoadReady(NodeID node, Address addr)
 }
 
 // searches for any address in the addr_vector
-bool DeterministicDriver::isAddrReady(NodeID node, Vector<NodeID> addr_vector)
+bool DeterministicDriver::isAddrReady(NodeID node, vector<NodeID> addr_vector)
 {
   for (int i=0; i<addr_vector.size(); i++) {
     if (((addr_vector[i]+1)%m_num_procs == node) &&
@@ -170,7 +172,7 @@ bool DeterministicDriver::isAddrReady(NodeID node, Vector<NodeID> addr_vector)
 }
 
 // test for a particular addr
-bool DeterministicDriver::isAddrReady(NodeID node, Vector<NodeID> addr_vector, Address addr)
+bool DeterministicDriver::isAddrReady(NodeID node, vector<NodeID> addr_vector, Address addr)
 {
   int addr_number = addr.getAddress()/DATA_BLOCK_BYTES;
 
@@ -197,7 +199,7 @@ void DeterministicDriver::storeCompleted(NodeID node, Address addr)
   setNextAddr(node, addr, m_store_vector);
 }
 
-void DeterministicDriver::setNextAddr(NodeID node, Address addr, Vector<NodeID>& addr_vector)
+void DeterministicDriver::setNextAddr(NodeID node, Address addr, vector<NodeID>& addr_vector)
 {
   // mark the addr vector that this proc was the last to use the particular address
   int addr_number = addr.getAddress()/DATA_BLOCK_BYTES;
@@ -214,7 +216,7 @@ Address DeterministicDriver::getNextStoreAddr(NodeID node)
   return getNextAddr(node, m_store_vector);
 }
 
-Address DeterministicDriver::getNextAddr(NodeID node, Vector<NodeID> addr_vector)
+Address DeterministicDriver::getNextAddr(NodeID node, vector<NodeID> addr_vector)
 {
 
   // This method deterministically picks the next addr the node should acquirer
diff --git a/src/mem/ruby/tester/DeterministicDriver.hh b/src/mem/ruby/tester/DeterministicDriver.hh
index 7c77666be..ddc7bc99b 100644
--- a/src/mem/ruby/tester/DeterministicDriver.hh
+++ b/src/mem/ruby/tester/DeterministicDriver.hh
@@ -36,7 +36,10 @@
 
 #ifndef DETERMINISTICDRIVER_H
 #define DETERMINISTICDRIVER_H
+
 #include <map>
+#include <vector>
+
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/tester/Tester_Globals.hh"
 #include "mem/ruby/common/Histogram.hh"            // includes global, but doesn't use anything, so it should be fine
@@ -96,18 +99,18 @@ public:
 private:
   // Private Methods
 
-  Address getNextAddr(NodeID node, Vector<NodeID> addr_vector);
-  bool isAddrReady(NodeID node, Vector<NodeID> addr_vector);
-  bool isAddrReady(NodeID node, Vector<NodeID> addr_vector, Address addr);
-  void setNextAddr(NodeID node, Address addr, Vector<NodeID>& addr_vector);
+  Address getNextAddr(NodeID node, std::vector<NodeID> addr_vector);
+  bool isAddrReady(NodeID node, std::vector<NodeID> addr_vector);
+  bool isAddrReady(NodeID node, std::vector<NodeID> addr_vector, Address addr);
+  void setNextAddr(NodeID node, Address addr, std::vector<NodeID>& addr_vector);
 
   
   // Data Members (m_ prefix)
-  Vector<Time> m_last_progress_vector;
-  Vector<SpecifiedGenerator*> m_generator_vector;
+  std::vector<Time> m_last_progress_vector;
+  std::vector<SpecifiedGenerator*> m_generator_vector;
   //DMAGenerator* m_dma_generator;
-  Vector<NodeID> m_load_vector;  // Processor last to load the addr
-  Vector<NodeID> m_store_vector;  // Processor last to store the addr
+  std::vector<NodeID> m_load_vector;  // Processor last to load the addr
+  std::vector<NodeID> m_store_vector;  // Processor last to store the addr
 
   int last_proc;
   int m_done_counter;
diff --git a/src/mem/ruby/tester/RaceyDriver.cc b/src/mem/ruby/tester/RaceyDriver.cc
index 57445d252..a9f716334 100644
--- a/src/mem/ruby/tester/RaceyDriver.cc
+++ b/src/mem/ruby/tester/RaceyDriver.cc
@@ -50,7 +50,7 @@ RaceyDriver::RaceyDriver(int num_procs, int tester_length)
   assert(m_num_procs >= 2);
 
   // init all racey pseudo threads
-  m_racey_pseudo_threads.setSize(m_num_procs);
+  m_racey_pseudo_threads.resize(m_num_procs);
   for (int i=0; i<m_racey_pseudo_threads.size(); i++) {
     m_racey_pseudo_threads[i] = new RaceyPseudoThread(i, *this);
   }
diff --git a/src/mem/ruby/tester/RaceyDriver.hh b/src/mem/ruby/tester/RaceyDriver.hh
index e9b4e3425..9a4702ba8 100644
--- a/src/mem/ruby/tester/RaceyDriver.hh
+++ b/src/mem/ruby/tester/RaceyDriver.hh
@@ -37,11 +37,13 @@
 #ifndef RACEYDRIVER_H
 #define RACEYDRIVER_H
 
+#include <map>
+#include <vector>
+
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/tester/Tester_Globals.hh"
 #include "mem/ruby/common/Driver.hh"
 #include "mem/ruby/tester/RaceyPseudoThread.hh"
-#include <map>
 #include "mem/ruby/libruby.hh"
 
 #define g_DEADLOCK_THRESHOLD 5000
@@ -100,7 +102,7 @@ private:
   RaceyDriver& operator=(const RaceyDriver& obj);
   
   // Data Members (m_ prefix)
-  Vector<RaceyPseudoThread*> m_racey_pseudo_threads;
+  std::vector<RaceyPseudoThread*> m_racey_pseudo_threads;
   int m_done_counter;
   bool m_wakeup_thread0;
   Time m_finish_time;