rose_build: reduce size/scope of context objects

This commit is contained in:
Alex Coyte
2017-03-30 14:34:33 +11:00
committed by Matthew Barr
parent a2b2940f85
commit 37cb93e60f
14 changed files with 520 additions and 458 deletions

View File

@@ -782,7 +782,6 @@ TEST_P(MultiBitTest, InitRangePlanChunked) {
TEST(MultiBit, SparseIteratorBegin1) {
const u32 test_size = 100;
vector<mmbit_sparse_iter> it;
vector<u32> bits;
bits.push_back(1);
@@ -791,7 +790,7 @@ TEST(MultiBit, SparseIteratorBegin1) {
bits.push_back(35);
bits.push_back(68);
mmbBuildSparseIterator(it, bits, test_size);
auto it = mmbBuildSparseIterator(bits, test_size);
//ASSERT_EQ(4U, it.size());
// Trivial initial test: all bits in 'bits' are on, all others are off
@@ -820,7 +819,6 @@ TEST(MultiBit, SparseIteratorBegin1) {
TEST(MultiBit, SparseIteratorBegin2) {
const u32 test_size = 40000;
vector<mmbit_sparse_iter> it;
vector<u32> bits;
bits.push_back(1);
@@ -830,7 +828,7 @@ TEST(MultiBit, SparseIteratorBegin2) {
bits.push_back(8920);
bits.push_back(37000);
mmbBuildSparseIterator(it, bits, test_size);
auto it = mmbBuildSparseIterator(bits, test_size);
//ASSERT_EQ(12U, it.size());
// Trivial initial test: all bits in 'bits' are on, all others are off
@@ -859,7 +857,6 @@ TEST(MultiBit, SparseIteratorBegin2) {
TEST(MultiBit, SparseIteratorNext1) {
const u32 test_size = 100;
vector<mmbit_sparse_iter> it;
vector<u32> bits;
bits.push_back(1);
@@ -868,7 +865,7 @@ TEST(MultiBit, SparseIteratorNext1) {
bits.push_back(35);
bits.push_back(68);
mmbBuildSparseIterator(it, bits, test_size);
auto it = mmbBuildSparseIterator(bits, test_size);
// Trivial initial test: all bits in 'bits' are on, all others are off
mmbit_holder ba(test_size);
@@ -924,7 +921,6 @@ TEST(MultiBit, SparseIteratorNext1) {
TEST(MultiBit, SparseIteratorNext2) {
const u32 test_size = 40000;
vector<mmbit_sparse_iter> it;
vector<u32> bits;
bits.push_back(1);
@@ -939,7 +935,7 @@ TEST(MultiBit, SparseIteratorNext2) {
bits.push_back(37000);
bits.push_back(39999);
mmbBuildSparseIterator(it, bits, test_size);
auto it = mmbBuildSparseIterator(bits, test_size);
// Trivial initial test: all bits in 'bits' are on, all others are off
mmbit_holder ba(test_size);
@@ -995,7 +991,6 @@ TEST(MultiBit, SparseIteratorNext2) {
TEST(MultiBit, SparseIteratorNextSmall) {
const u32 test_size = 15;
vector<mmbit_sparse_iter> it;
vector<u32> bits;
bits.push_back(1);
@@ -1005,7 +1000,7 @@ TEST(MultiBit, SparseIteratorNextSmall) {
bits.push_back(12);
bits.push_back(14);
mmbBuildSparseIterator(it, bits, test_size);
auto it = mmbBuildSparseIterator(bits, test_size);
// Trivial initial test: all bits in 'bits' are on, all others are off
mmbit_holder ba(test_size);
@@ -1064,13 +1059,12 @@ TEST_P(MultiBitTest, SparseIteratorBeginAll) {
ASSERT_TRUE(ba != nullptr);
// Put all our bits into the sparse iterator.
vector<mmbit_sparse_iter> it;
vector<u32> bits;
bits.reserve(test_size / stride);
for (u64a i = 0; i < test_size; i += stride) {
bits.push_back(i);
}
mmbBuildSparseIterator(it, bits, test_size);
auto it = mmbBuildSparseIterator(bits, test_size);
// Switch all bits on in state.
mmbit_clear(ba, test_size);
@@ -1104,12 +1098,11 @@ TEST_P(MultiBitTest, SparseIteratorBeginThirds) {
}
// Put all our bits into the sparse iterator
vector<mmbit_sparse_iter> it;
vector<u32> bits(test_size);
for (u32 i = 0; i != test_size; i++) {
bits[i] = i;
}
mmbBuildSparseIterator(it, bits, test_size);
auto it = mmbBuildSparseIterator(bits, test_size);
// Switch every third bits on in state
mmbit_clear(ba, test_size);
@@ -1139,13 +1132,12 @@ TEST_P(MultiBitTest, SparseIteratorNextAll) {
ASSERT_TRUE(ba != nullptr);
// Put all our bits into the sparse iterator.
vector<mmbit_sparse_iter> it;
vector<u32> bits;
bits.reserve(test_size / stride);
for (u64a i = 0; i < test_size; i += stride) {
bits.push_back(i);
}
mmbBuildSparseIterator(it, bits, test_size);
auto it = mmbBuildSparseIterator(bits, test_size);
// Switch all bits on in state
mmbit_clear(ba, test_size);
@@ -1182,14 +1174,13 @@ TEST_P(MultiBitTest, SparseIteratorNextExactStrided) {
// Put all our bits into the sparse iterator and switch them on in the
// state.
mmbit_clear(ba, test_size);
vector<mmbit_sparse_iter> it;
vector<u32> bits;
bits.reserve(test_size / stride);
for (u64a i = 0; i < test_size; i += stride) {
bits.push_back(i);
mmbit_set(ba, test_size, i);
}
mmbBuildSparseIterator(it, bits, test_size);
auto it = mmbBuildSparseIterator(bits, test_size);
// Iterate over all bits.
vector<mmbit_sparse_state> state(mmbit_sparse_iter_state_size(test_size));
@@ -1214,13 +1205,12 @@ TEST_P(MultiBitTest, SparseIteratorNextNone) {
ASSERT_TRUE(ba != nullptr);
// Put all our bits into the sparse iterator.
vector<mmbit_sparse_iter> it;
vector<u32> bits;
bits.reserve(test_size / stride);
for (u64a i = 0; i < test_size; i += stride) {
bits.push_back(i);
}
mmbBuildSparseIterator(it, bits, test_size);
auto it = mmbBuildSparseIterator(bits, test_size);
// Switch only the first bit on
mmbit_clear(ba, test_size);
@@ -1243,13 +1233,12 @@ TEST_P(MultiBitTest, SparseIteratorUnsetAll) {
ASSERT_TRUE(ba != nullptr);
// Put all our bits into the sparse iterator
vector<mmbit_sparse_iter> it;
vector<u32> bits;
bits.reserve(test_size / stride);
for (u64a i = 0; i < test_size; i += stride) {
bits.push_back(i);
}
mmbBuildSparseIterator(it, bits, test_size);
auto it = mmbBuildSparseIterator(bits, test_size);
// Switch all bits on
mmbit_clear(ba, test_size);
@@ -1283,9 +1272,8 @@ TEST_P(MultiBitTest, SparseIteratorUnsetHalves) {
odd.push_back(i);
}
vector<mmbit_sparse_iter> it_even, it_odd;
mmbBuildSparseIterator(it_even, even, test_size);
mmbBuildSparseIterator(it_odd, odd, test_size);
auto it_even = mmbBuildSparseIterator(even, test_size);
auto it_odd = mmbBuildSparseIterator(odd, test_size);
// Switch all bits on
mmbit_clear(ba, test_size);