diff options
author | Nathan Binkert <nate@binkert.org> | 2010-06-10 23:17:07 -0700 |
---|---|---|
committer | Nathan Binkert <nate@binkert.org> | 2010-06-10 23:17:07 -0700 |
commit | 006818aeea6176c4500c5f7414e9f2a822c77062 (patch) | |
tree | 74adbd6cc14951943bd6eafc4aba2fb98be7a526 /src/mem/ruby/filters | |
parent | bc87fa30d72df7db6265be50b2c39dc218076f9f (diff) | |
download | gem5-006818aeea6176c4500c5f7414e9f2a822c77062.tar.xz |
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
Diffstat (limited to 'src/mem/ruby/filters')
-rw-r--r-- | src/mem/ruby/filters/BlockBloomFilter.cc | 2 | ||||
-rw-r--r-- | src/mem/ruby/filters/BlockBloomFilter.hh | 4 | ||||
-rw-r--r-- | src/mem/ruby/filters/BulkBloomFilter.cc | 4 | ||||
-rw-r--r-- | src/mem/ruby/filters/BulkBloomFilter.hh | 6 | ||||
-rw-r--r-- | src/mem/ruby/filters/H3BloomFilter.cc | 2 | ||||
-rw-r--r-- | src/mem/ruby/filters/H3BloomFilter.hh | 4 | ||||
-rw-r--r-- | src/mem/ruby/filters/LSB_CountingBloomFilter.cc | 2 | ||||
-rw-r--r-- | src/mem/ruby/filters/LSB_CountingBloomFilter.hh | 4 | ||||
-rw-r--r-- | src/mem/ruby/filters/MultiBitSelBloomFilter.cc | 2 | ||||
-rw-r--r-- | src/mem/ruby/filters/MultiBitSelBloomFilter.hh | 4 | ||||
-rw-r--r-- | src/mem/ruby/filters/MultiGrainBloomFilter.cc | 4 | ||||
-rw-r--r-- | src/mem/ruby/filters/MultiGrainBloomFilter.hh | 6 | ||||
-rw-r--r-- | src/mem/ruby/filters/NonCountingBloomFilter.cc | 2 | ||||
-rw-r--r-- | src/mem/ruby/filters/NonCountingBloomFilter.hh | 4 |
14 files changed, 25 insertions, 25 deletions
diff --git a/src/mem/ruby/filters/BlockBloomFilter.cc b/src/mem/ruby/filters/BlockBloomFilter.cc index 875a0d015..04e548fea 100644 --- a/src/mem/ruby/filters/BlockBloomFilter.cc +++ b/src/mem/ruby/filters/BlockBloomFilter.cc @@ -48,7 +48,7 @@ BlockBloomFilter::BlockBloomFilter(string str) m_filter_size = atoi(head.c_str()); m_filter_size_bits = floorLog2(m_filter_size); - m_filter.setSize(m_filter_size); + m_filter.resize(m_filter_size); clear(); } diff --git a/src/mem/ruby/filters/BlockBloomFilter.hh b/src/mem/ruby/filters/BlockBloomFilter.hh index be31b025f..ade599f42 100644 --- a/src/mem/ruby/filters/BlockBloomFilter.hh +++ b/src/mem/ruby/filters/BlockBloomFilter.hh @@ -31,8 +31,8 @@ #include <iostream> #include <string> +#include <vector> -#include "mem/gems_common/Map.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/filters/AbstractBloomFilter.hh" @@ -62,7 +62,7 @@ class BlockBloomFilter : public AbstractBloomFilter private: int get_index(const Address& addr); - Vector<int> m_filter; + std::vector<int> m_filter; int m_filter_size; int m_filter_size_bits; diff --git a/src/mem/ruby/filters/BulkBloomFilter.cc b/src/mem/ruby/filters/BulkBloomFilter.cc index a03cba37b..887c024dd 100644 --- a/src/mem/ruby/filters/BulkBloomFilter.cc +++ b/src/mem/ruby/filters/BulkBloomFilter.cc @@ -49,8 +49,8 @@ BulkBloomFilter::BulkBloomFilter(string str) // split the filter bits in half, c0 and c1 m_sector_bits = m_filter_size_bits - 1; - m_temp_filter.setSize(m_filter_size); - m_filter.setSize(m_filter_size); + m_temp_filter.resize(m_filter_size); + m_filter.resize(m_filter_size); clear(); // clear temp filter diff --git a/src/mem/ruby/filters/BulkBloomFilter.hh b/src/mem/ruby/filters/BulkBloomFilter.hh index 5a3117a60..50b24732f 100644 --- a/src/mem/ruby/filters/BulkBloomFilter.hh +++ b/src/mem/ruby/filters/BulkBloomFilter.hh @@ -31,8 +31,8 @@ #include <iostream> #include <string> +#include <vector> -#include "mem/gems_common/Map.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/filters/AbstractBloomFilter.hh" @@ -63,8 +63,8 @@ class BulkBloomFilter : public AbstractBloomFilter int get_index(const Address& addr); Address permute(const Address & addr); - Vector<int> m_filter; - Vector<int> m_temp_filter; + std::vector<int> m_filter; + std::vector<int> m_temp_filter; int m_filter_size; int m_filter_size_bits; diff --git a/src/mem/ruby/filters/H3BloomFilter.cc b/src/mem/ruby/filters/H3BloomFilter.cc index d0a4f400d..683dbc1fc 100644 --- a/src/mem/ruby/filters/H3BloomFilter.cc +++ b/src/mem/ruby/filters/H3BloomFilter.cc @@ -401,7 +401,7 @@ H3BloomFilter::H3BloomFilter(string str) m_par_filter_size = m_filter_size / m_num_hashes; m_par_filter_size_bits = floorLog2(m_par_filter_size); - m_filter.setSize(m_filter_size); + m_filter.resize(m_filter_size); clear(); } diff --git a/src/mem/ruby/filters/H3BloomFilter.hh b/src/mem/ruby/filters/H3BloomFilter.hh index babd86657..b040af42f 100644 --- a/src/mem/ruby/filters/H3BloomFilter.hh +++ b/src/mem/ruby/filters/H3BloomFilter.hh @@ -31,8 +31,8 @@ #include <iostream> #include <string> +#include <vector> -#include "mem/gems_common/Map.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/filters/AbstractBloomFilter.hh" @@ -72,7 +72,7 @@ class H3BloomFilter : public AbstractBloomFilter int hash_H3(uint64 value, int index); - Vector<int> m_filter; + std::vector<int> m_filter; int m_filter_size; int m_num_hashes; int m_filter_size_bits; diff --git a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc index 029ce1501..5cd4a6be1 100644 --- a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc +++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc @@ -49,7 +49,7 @@ LSB_CountingBloomFilter::LSB_CountingBloomFilter(string str) m_count = atoi(tail.c_str()); m_count_bits = floorLog2(m_count); - m_filter.setSize(m_filter_size); + m_filter.resize(m_filter_size); clear(); } diff --git a/src/mem/ruby/filters/LSB_CountingBloomFilter.hh b/src/mem/ruby/filters/LSB_CountingBloomFilter.hh index 1ce65edcf..252f61682 100644 --- a/src/mem/ruby/filters/LSB_CountingBloomFilter.hh +++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.hh @@ -31,8 +31,8 @@ #include <iostream> #include <string> +#include <vector> -#include "mem/gems_common/Map.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/filters/AbstractBloomFilter.hh" @@ -62,7 +62,7 @@ class LSB_CountingBloomFilter : public AbstractBloomFilter private: int get_index(const Address& addr); - Vector<int> m_filter; + std::vector<int> m_filter; int m_filter_size; int m_filter_size_bits; diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc index 466e3fccb..e57bc3d30 100644 --- a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc +++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc @@ -61,7 +61,7 @@ MultiBitSelBloomFilter::MultiBitSelBloomFilter(string str) m_par_filter_size = m_filter_size / m_num_hashes; m_par_filter_size_bits = floorLog2(m_par_filter_size); - m_filter.setSize(m_filter_size); + m_filter.resize(m_filter_size); clear(); } diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh index f53b2595a..5263309a4 100644 --- a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh +++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh @@ -31,8 +31,8 @@ #include <iostream> #include <string> +#include <vector> -#include "mem/gems_common/Map.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/filters/AbstractBloomFilter.hh" @@ -73,7 +73,7 @@ class MultiBitSelBloomFilter : public AbstractBloomFilter int hash_bitsel(uint64 value, int index, int jump, int maxBits, int numBits); - Vector<int> m_filter; + std::vector<int> m_filter; int m_filter_size; int m_num_hashes; int m_filter_size_bits; diff --git a/src/mem/ruby/filters/MultiGrainBloomFilter.cc b/src/mem/ruby/filters/MultiGrainBloomFilter.cc index 7b3976473..d05ca925d 100644 --- a/src/mem/ruby/filters/MultiGrainBloomFilter.cc +++ b/src/mem/ruby/filters/MultiGrainBloomFilter.cc @@ -52,8 +52,8 @@ MultiGrainBloomFilter::MultiGrainBloomFilter(string str) m_page_filter_size = atoi(tail.c_str()); m_page_filter_size_bits = floorLog2(m_page_filter_size); - m_filter.setSize(m_filter_size); - m_page_filter.setSize(m_page_filter_size); + m_filter.resize(m_filter_size); + m_page_filter.resize(m_page_filter_size); clear(); } diff --git a/src/mem/ruby/filters/MultiGrainBloomFilter.hh b/src/mem/ruby/filters/MultiGrainBloomFilter.hh index 8be226c02..dfe9c3e98 100644 --- a/src/mem/ruby/filters/MultiGrainBloomFilter.hh +++ b/src/mem/ruby/filters/MultiGrainBloomFilter.hh @@ -31,8 +31,8 @@ #include <iostream> #include <string> +#include <vector> -#include "mem/gems_common/Map.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/filters/AbstractBloomFilter.hh" @@ -64,11 +64,11 @@ class MultiGrainBloomFilter : public AbstractBloomFilter int get_page_index(const Address & addr); // The block filter - Vector<int> m_filter; + std::vector<int> m_filter; int m_filter_size; int m_filter_size_bits; // The page number filter - Vector<int> m_page_filter; + std::vector<int> m_page_filter; int m_page_filter_size; int m_page_filter_size_bits; diff --git a/src/mem/ruby/filters/NonCountingBloomFilter.cc b/src/mem/ruby/filters/NonCountingBloomFilter.cc index 909aaf76b..14a16de20 100644 --- a/src/mem/ruby/filters/NonCountingBloomFilter.cc +++ b/src/mem/ruby/filters/NonCountingBloomFilter.cc @@ -48,7 +48,7 @@ NonCountingBloomFilter::NonCountingBloomFilter(string str) m_offset = atoi(tail.c_str()); m_filter_size_bits = floorLog2(m_filter_size); - m_filter.setSize(m_filter_size); + m_filter.resize(m_filter_size); clear(); } diff --git a/src/mem/ruby/filters/NonCountingBloomFilter.hh b/src/mem/ruby/filters/NonCountingBloomFilter.hh index 414de4bc8..57274ef87 100644 --- a/src/mem/ruby/filters/NonCountingBloomFilter.hh +++ b/src/mem/ruby/filters/NonCountingBloomFilter.hh @@ -31,8 +31,8 @@ #include <iostream> #include <string> +#include <vector> -#include "mem/gems_common/Map.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/filters/AbstractBloomFilter.hh" @@ -69,7 +69,7 @@ class NonCountingBloomFilter : public AbstractBloomFilter private: int get_index(const Address& addr); - Vector<int> m_filter; + std::vector<int> m_filter; int m_filter_size; int m_offset; int m_filter_size_bits; |