|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r80958 - in branches/release: . boost boost/unordered boost/unordered/detail libs libs/unordered libs/unordered/doc libs/unordered/test/objects libs/unordered/test/unordered
From: dnljms_at_[hidden]
Date: 2012-10-11 13:29:20
Author: danieljames
Date: 2012-10-11 13:29:19 EDT (Thu, 11 Oct 2012)
New Revision: 80958
URL: http://svn.boost.org/trac/boost/changeset/80958
Log:
Unordered: Fix erasing ranges, and some tests. Fixes #7471
Properties modified:
branches/release/ (props changed)
branches/release/boost/ (props changed)
branches/release/boost/unordered/ (props changed)
branches/release/libs/ (props changed)
branches/release/libs/unordered/ (props changed)
Text files modified:
branches/release/boost/unordered/detail/equivalent.hpp | 4
branches/release/boost/unordered/detail/table.hpp | 11 +++
branches/release/libs/unordered/doc/changes.qbk | 4 +
branches/release/libs/unordered/test/objects/test.hpp | 120 ++++++++++++++++++++++++++++++++++++++++
branches/release/libs/unordered/test/unordered/erase_equiv_tests.cpp | 26 ++++++++
branches/release/libs/unordered/test/unordered/erase_tests.cpp | 14 ++++
branches/release/libs/unordered/test/unordered/insert_tests.cpp | 97 ++++++++++++++++++++++++++++---
branches/release/libs/unordered/test/unordered/rehash_tests.cpp | 64 ++++++++++++++++++---
branches/release/libs/unordered/test/unordered/unnecessary_copy_tests.cpp | 56 +++++++++++++++++-
9 files changed, 368 insertions(+), 28 deletions(-)
Modified: branches/release/boost/unordered/detail/equivalent.hpp
==============================================================================
--- branches/release/boost/unordered/detail/equivalent.hpp (original)
+++ branches/release/boost/unordered/detail/equivalent.hpp 2012-10-11 13:29:19 EDT (Thu, 11 Oct 2012)
@@ -676,9 +676,9 @@
if(begin == group2) {
link_pointer end1 = group1->group_prev_;
- link_pointer end2 = group2->group_prev_;
+ link_pointer end2 = end->group_prev_;
group1->group_prev_ = end2;
- group2->group_prev_ = end1;
+ end->group_prev_ = end1;
}
}
}
Modified: branches/release/boost/unordered/detail/table.hpp
==============================================================================
--- branches/release/boost/unordered/detail/table.hpp (original)
+++ branches/release/boost/unordered/detail/table.hpp 2012-10-11 13:29:19 EDT (Thu, 11 Oct 2012)
@@ -618,7 +618,16 @@
{
for(;;) {
n = static_cast<node_pointer>(n->next_);
- if (n == end) return;
+ if (n == end) {
+ if (n) {
+ std::size_t new_bucket_index =
+ policy::to_bucket(bucket_count_, n->hash_);
+ if (bucket_index != new_bucket_index) {
+ get_bucket(new_bucket_index)->next_ = prev;
+ }
+ }
+ return;
+ }
std::size_t new_bucket_index =
policy::to_bucket(bucket_count_, n->hash_);
Modified: branches/release/libs/unordered/doc/changes.qbk
==============================================================================
--- branches/release/libs/unordered/doc/changes.qbk (original)
+++ branches/release/libs/unordered/doc/changes.qbk 2012-10-11 13:29:19 EDT (Thu, 11 Oct 2012)
@@ -3,6 +3,9 @@
/ Distributed under the Boost Software License, Version 1.0. (See accompanying
/ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ]
+[template ticket[number]'''<ulink
+ url="https://svn.boost.org/trac/boost/ticket/'''[number]'''">'''#[number]'''</ulink>''']
+
[section:changes Change Log]
[h2 Review Version]
@@ -211,6 +214,7 @@
* Faster assign, which assigns to existing nodes where possible, rather than
creating entirely new nodes and copy constructing.
+* Fixed bug in `erase_range` ([ticket 7471]).
* Reverted some of the internal changes to how nodes are created, especially
for C++11 compilers. 'construct' and 'destroy' should work a little better
for C++11 allocators.
Modified: branches/release/libs/unordered/test/objects/test.hpp
==============================================================================
--- branches/release/libs/unordered/test/objects/test.hpp (original)
+++ branches/release/libs/unordered/test/objects/test.hpp 2012-10-11 13:29:19 EDT (Thu, 11 Oct 2012)
@@ -18,6 +18,7 @@
// Note that the default hash function will work for any equal_to (but not
// very well).
class object;
+ class movable;
class implicitly_convertible;
class hash;
class less;
@@ -25,6 +26,7 @@
template <class T> class allocator1;
template <class T> class allocator2;
object generate(object const*);
+ movable generate(movable const*);
implicitly_convertible generate(implicitly_convertible const*);
inline void ignore_variable(void const*) {}
@@ -67,6 +69,81 @@
}
};
+ class movable : private counted_object
+ {
+ friend class hash;
+ friend class equal_to;
+ friend class less;
+ int tag1_, tag2_;
+
+ BOOST_COPYABLE_AND_MOVABLE(movable)
+ public:
+ explicit movable(int t1 = 0, int t2 = 0) : tag1_(t1), tag2_(t2) {}
+
+ movable(movable const& x) :
+ counted_object(x), tag1_(x.tag1_), tag2_(x.tag2_)
+ {
+ BOOST_TEST(x.tag1_ != -1);
+ }
+
+ movable(BOOST_RV_REF(movable) x) :
+ counted_object(x), tag1_(x.tag1_), tag2_(x.tag2_)
+ {
+ BOOST_TEST(x.tag1_ != -1);
+ x.tag1_ = -1;
+ x.tag2_ = -1;
+ }
+
+ movable& operator=(BOOST_COPY_ASSIGN_REF(movable) x) // Copy assignment
+ {
+ BOOST_TEST(x.tag1_ != -1);
+ tag1_ = x.tag1_;
+ tag2_ = x.tag2_;
+ return *this;
+ }
+
+ movable& operator=(BOOST_RV_REF(movable) x) //Move assignment
+ {
+ BOOST_TEST(x.tag1_ != -1);
+ tag1_ = x.tag1_;
+ tag2_ = x.tag2_;
+ x.tag1_ = -1;
+ x.tag2_ = -1;
+ return *this;
+ }
+
+ ~movable() {
+ tag1_ = -1;
+ tag2_ = -1;
+ }
+
+ friend bool operator==(movable const& x1, movable const& x2) {
+ BOOST_TEST(x1.tag1_ != -1 && x2.tag1_ != -1);
+ return x1.tag1_ == x2.tag1_ && x1.tag2_ == x2.tag2_;
+ }
+
+ friend bool operator!=(movable const& x1, movable const& x2) {
+ BOOST_TEST(x1.tag1_ != -1 && x2.tag1_ != -1);
+ return x1.tag1_ != x2.tag1_ || x1.tag2_ != x2.tag2_;
+ }
+
+ friend bool operator<(movable const& x1, movable const& x2) {
+ BOOST_TEST(x1.tag1_ != -1 && x2.tag1_ != -1);
+ return x1.tag1_ < x2.tag1_ ||
+ (x1.tag1_ == x2.tag1_ && x1.tag2_ < x2.tag2_);
+ }
+
+ friend movable generate(movable const*) {
+ int* x = 0;
+ return movable(generate(x), generate(x));
+ }
+
+ friend std::ostream& operator<<(std::ostream& out, movable const& o)
+ {
+ return out<<"("<<o.tag1_<<","<<o.tag2_<<")";
+ }
+ };
+
class implicitly_convertible : private counted_object
{
int tag1_, tag2_;
@@ -81,6 +158,11 @@
return object(tag1_, tag2_);
}
+ operator movable() const
+ {
+ return movable(tag1_, tag2_);
+ }
+
friend implicitly_convertible generate(implicitly_convertible const*) {
int* x = 0;
return implicitly_convertible(generate(x), generate(x));
@@ -92,6 +174,7 @@
}
};
+ // Note: This is a deliberately bad hash function.
class hash
{
int type_;
@@ -109,6 +192,17 @@
}
}
+ std::size_t operator()(movable const& x) const {
+ switch(type_) {
+ case 1:
+ return x.tag1_;
+ case 2:
+ return x.tag2_;
+ default:
+ return x.tag1_ + x.tag2_;
+ }
+ }
+
std::size_t operator()(int x) const {
return x;
}
@@ -126,6 +220,10 @@
return hash()(x);
}
+ std::size_t hash_value(test::movable const& x) {
+ return hash()(x);
+ }
+
class less
{
int type_;
@@ -143,6 +241,17 @@
}
}
+ bool operator()(movable const& x1, movable const& x2) const {
+ switch(type_) {
+ case 1:
+ return x1.tag1_ < x2.tag1_;
+ case 2:
+ return x1.tag2_ < x2.tag2_;
+ default:
+ return x1 < x2;
+ }
+ }
+
std::size_t operator()(int x1, int x2) const {
return x1 < x2;
}
@@ -169,6 +278,17 @@
}
}
+ bool operator()(movable const& x1, movable const& x2) const {
+ switch(type_) {
+ case 1:
+ return x1.tag1_ == x2.tag1_;
+ case 2:
+ return x1.tag2_ == x2.tag2_;
+ default:
+ return x1 == x2;
+ }
+ }
+
std::size_t operator()(int x1, int x2) const {
return x1 == x2;
}
Modified: branches/release/libs/unordered/test/unordered/erase_equiv_tests.cpp
==============================================================================
--- branches/release/libs/unordered/test/unordered/erase_equiv_tests.cpp (original)
+++ branches/release/libs/unordered/test/unordered/erase_equiv_tests.cpp 2012-10-11 13:29:19 EDT (Thu, 11 Oct 2012)
@@ -12,6 +12,7 @@
#include "../helpers/test.hpp"
#include "../helpers/list.hpp"
+#include "../helpers/invariants.hpp"
#include <set>
#include <iostream>
#include <iterator>
@@ -51,12 +52,21 @@
int operator()(int x) const { return x & 1; }
};
+// For testing erase in lots of buckets.
+struct collision3_hash
+{
+ int operator()(int x) const { return x; }
+};
+
typedef boost::unordered_multimap<int, int,
collision_hash, std::equal_to<int>,
test::allocator1<std::pair<int const, int> > > collide_map;
typedef boost::unordered_multimap<int, int,
collision2_hash, std::equal_to<int>,
test::allocator2<std::pair<int const, int> > > collide_map2;
+typedef boost::unordered_multimap<int, int,
+ collision3_hash, std::equal_to<int>,
+ test::allocator2<std::pair<int const, int> > > collide_map3;
typedef collide_map::value_type collide_value;
typedef test::list<collide_value> collide_list;
@@ -66,6 +76,7 @@
x.erase(x.begin(), x.end());
x.erase(x.begin(), x.begin());
x.erase(x.end(), x.end());
+ test::check_equivalent_keys(x);
}
UNORDERED_AUTO_TEST(single_item_tests)
@@ -76,10 +87,13 @@
collide_map x(init.begin(), init.end());
x.erase(x.begin(), x.begin());
BOOST_TEST(x.count(1) == 1 && x.size() == 1);
+ test::check_equivalent_keys(x);
x.erase(x.end(), x.end());
BOOST_TEST(x.count(1) == 1 && x.size() == 1);
+ test::check_equivalent_keys(x);
x.erase(x.begin(), x.end());
BOOST_TEST(x.count(1) == 0 && x.size() == 0);
+ test::check_equivalent_keys(x);
}
UNORDERED_AUTO_TEST(two_equivalent_item_tests)
@@ -92,6 +106,7 @@
collide_map x(init.begin(), init.end());
x.erase(x.begin(), x.end());
BOOST_TEST(x.count(1) == 0 && x.size() == 0);
+ test::check_equivalent_keys(x);
}
{
@@ -100,6 +115,7 @@
x.erase(x.begin(), boost::next(x.begin()));
BOOST_TEST(x.count(1) == 1 && x.size() == 1 &&
x.begin()->first == 1 && x.begin()->second == value);
+ test::check_equivalent_keys(x);
}
{
@@ -108,6 +124,7 @@
x.erase(boost::next(x.begin()), x.end());
BOOST_TEST(x.count(1) == 1 && x.size() == 1 &&
x.begin()->first == 1 && x.begin()->second == value);
+ test::check_equivalent_keys(x);
}
}
@@ -129,6 +146,8 @@
collide_list l(x.begin(), x.end());
l.erase(boost::next(l.begin(), start), boost::next(l.begin(), end));
x.erase(boost::next(x.begin(), start), boost::next(x.begin(), end));
+
+ test::check_equivalent_keys(x);
return compare(l, x);
}
@@ -191,4 +210,11 @@
std::cout<<"\n";
}
+UNORDERED_AUTO_TEST(exhaustive_collide3_tests)
+{
+ std::cout<<"exhaustive_collide3_tests:\n";
+ exhaustive_erase_tests((collide_map3*) 0, 8, 4);
+ std::cout<<"\n";
+}
+
RUN_TESTS()
Modified: branches/release/libs/unordered/test/unordered/erase_tests.cpp
==============================================================================
--- branches/release/libs/unordered/test/unordered/erase_tests.cpp (original)
+++ branches/release/libs/unordered/test/unordered/erase_tests.cpp 2012-10-11 13:29:19 EDT (Thu, 11 Oct 2012)
@@ -15,6 +15,7 @@
#include "../helpers/tracker.hpp"
#include "../helpers/equivalent.hpp"
#include "../helpers/helpers.hpp"
+#include "../helpers/invariants.hpp"
#include <iostream>
@@ -32,6 +33,7 @@
test::random_values<Container> v(1000, generator);
Container x(v.begin(), v.end());
+ int iterations = 0;
for(BOOST_DEDUCED_TYPENAME test::random_values<Container>::iterator
it = v.begin(); it != v.end(); ++it)
{
@@ -41,6 +43,7 @@
BOOST_TEST(x.size() == old_size - count);
BOOST_TEST(x.count(test::get_key<Container>(*it)) == 0);
BOOST_TEST(x.find(test::get_key<Container>(*it)) == x.end());
+ if (++iterations % 20 == 0) test::check_equivalent_keys(x);
}
}
@@ -51,6 +54,7 @@
test::random_values<Container> v(1000, generator);
Container x(v.begin(), v.end());
std::size_t size = x.size();
+ int iterations = 0;
while(size > 0 && !x.empty())
{
BOOST_DEDUCED_TYPENAME Container::key_type
@@ -62,6 +66,7 @@
BOOST_TEST(pos == x.begin());
BOOST_TEST(x.count(key) == count - 1);
BOOST_TEST(x.size() == size);
+ if (++iterations % 20 == 0) test::check_equivalent_keys(x);
}
BOOST_TEST(x.empty());
}
@@ -73,6 +78,7 @@
test::random_values<Container> v(1000, generator);
Container x(v.begin(), v.end());
std::size_t size = x.size();
+ int iterations = 0;
while(size > 0 && !x.empty())
{
using namespace std;
@@ -96,6 +102,7 @@
next == boost::next(prev));
BOOST_TEST(x.count(key) == count - 1);
BOOST_TEST(x.size() == size);
+ if (++iterations % 20 == 0) test::check_equivalent_keys(x);
}
BOOST_TEST(x.empty());
}
@@ -116,12 +123,15 @@
BOOST_TEST(x.erase(x.end(), x.end()) == x.end());
BOOST_TEST(x.erase(x.begin(), x.begin()) == x.begin());
BOOST_TEST(x.size() == size);
+ test::check_equivalent_keys(x);
BOOST_TEST(x.erase(x.begin(), x.end()) == x.end());
BOOST_TEST(x.empty());
BOOST_TEST(x.begin() == x.end());
+ test::check_equivalent_keys(x);
BOOST_TEST(x.erase(x.begin(), x.end()) == x.begin());
+ test::check_equivalent_keys(x);
}
std::cerr<<"quick_erase(begin()).\n";
@@ -131,6 +141,7 @@
test::random_values<Container> v(1000, generator);
Container x(v.begin(), v.end());
std::size_t size = x.size();
+ int iterations = 0;
while(size > 0 && !x.empty())
{
BOOST_DEDUCED_TYPENAME Container::key_type
@@ -140,6 +151,7 @@
--size;
BOOST_TEST(x.count(key) == count - 1);
BOOST_TEST(x.size() == size);
+ if (++iterations % 20 == 0) test::check_equivalent_keys(x);
}
BOOST_TEST(x.empty());
}
@@ -151,6 +163,7 @@
test::random_values<Container> v(1000, generator);
Container x(v.begin(), v.end());
std::size_t size = x.size();
+ int iterations = 0;
while(size > 0 && !x.empty())
{
using namespace std;
@@ -174,6 +187,7 @@
next == boost::next(prev));
BOOST_TEST(x.count(key) == count - 1);
BOOST_TEST(x.size() == size);
+ if (++iterations % 20 == 0) test::check_equivalent_keys(x);
}
BOOST_TEST(x.empty());
}
Modified: branches/release/libs/unordered/test/unordered/insert_tests.cpp
==============================================================================
--- branches/release/libs/unordered/test/unordered/insert_tests.cpp (original)
+++ branches/release/libs/unordered/test/unordered/insert_tests.cpp 2012-10-11 13:29:19 EDT (Thu, 11 Oct 2012)
@@ -16,6 +16,7 @@
#include "../helpers/equivalent.hpp"
#include "../helpers/invariants.hpp"
#include "../helpers/input_iterator.hpp"
+#include "../helpers/helpers.hpp"
#include <iostream>
@@ -293,8 +294,6 @@
}
}
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_VARIADIC_TEMPLATES)
-
template <class X>
void unique_emplace_tests1(X*, test::random_generator generator)
{
@@ -361,7 +360,73 @@
test::check_equivalent_keys(x);
}
-#endif
+template <class X>
+void move_emplace_tests(X*, test::random_generator generator)
+{
+ typedef BOOST_DEDUCED_TYPENAME X::iterator iterator;
+ typedef test::ordered<X> ordered;
+
+ std::cerr<<"emplace(move(value)) tests for containers with unique keys.\n";
+
+ X x;
+ test::ordered<X> tracker = test::create_ordered(x);
+
+ test::random_values<X> v(1000, generator);
+
+ for(BOOST_DEDUCED_TYPENAME test::random_values<X>::iterator it = v.begin();
+ it != v.end(); ++it)
+ {
+
+ BOOST_DEDUCED_TYPENAME X::size_type old_bucket_count = x.bucket_count();
+ float b = x.max_load_factor();
+
+ typename X::value_type value = *it;
+ x.emplace(boost::move(value));
+ tracker.insert(*it);
+ tracker.compare_key(x, *it);
+
+ if(static_cast<double>(x.size()) < b * static_cast<double>(old_bucket_count))
+ BOOST_TEST(x.bucket_count() == old_bucket_count);
+ }
+
+ test::check_equivalent_keys(x);
+ tracker.compare(x);
+}
+
+template <class X>
+void default_emplace_tests(X*, test::random_generator)
+{
+ std::cerr<<"emplace() tests.\n";
+ bool is_unique = test::has_unique_keys<X>::value;
+
+ X x;
+
+ x.emplace();
+ BOOST_TEST(x.size() == 1);
+ x.emplace();
+ BOOST_TEST(x.size() == is_unique ? 1: 2);
+ x.emplace();
+ BOOST_TEST(x.size() == is_unique ? 1: 3);
+
+ typename X::value_type y;
+ BOOST_TEST(x.count(test::get_key<X>(y)) == is_unique ? 1: 3);
+ BOOST_TEST(*x.equal_range(test::get_key<X>(y)).first == y);
+
+ x.emplace(y);
+ BOOST_TEST(x.size() == is_unique ? 1: 4);
+ BOOST_TEST(x.count(test::get_key<X>(y)) == is_unique ? 1: 4);
+ BOOST_TEST(*x.equal_range(test::get_key<X>(y)).first == y);
+
+ x.clear();
+ BOOST_TEST(x.empty());
+ x.emplace(y);
+ BOOST_TEST(x.size() == 1);
+ x.emplace(y);
+ BOOST_TEST(x.size() == is_unique ? 1: 2);
+
+ BOOST_TEST(x.count(test::get_key<X>(y)) == is_unique ? 1: 2);
+ BOOST_TEST(*x.equal_range(test::get_key<X>(y)).first == y);
+}
template <class X>
void map_tests(X*, test::random_generator generator)
@@ -434,9 +499,9 @@
test::check_equivalent_keys(x);
}
-boost::unordered_set<test::object,
+boost::unordered_set<test::movable,
test::hash, test::equal_to,
- std::allocator<test::object> >* test_set_std_alloc;
+ std::allocator<test::movable> >* test_set_std_alloc;
boost::unordered_multimap<test::object, test::object,
test::hash, test::equal_to,
std::allocator<test::object> >* test_multimap_std_alloc;
@@ -444,12 +509,12 @@
boost::unordered_set<test::object,
test::hash, test::equal_to,
test::allocator1<test::object> >* test_set;
-boost::unordered_multiset<test::object,
+boost::unordered_multiset<test::movable,
test::hash, test::equal_to,
- test::allocator2<test::object> >* test_multiset;
-boost::unordered_map<test::object, test::object,
+ test::allocator2<test::movable> >* test_multiset;
+boost::unordered_map<test::movable, test::movable,
test::hash, test::equal_to,
- test::allocator2<test::object> >* test_map;
+ test::allocator2<test::movable> >* test_map;
boost::unordered_multimap<test::object, test::object,
test::hash, test::equal_to,
test::allocator1<test::object> >* test_multimap;
@@ -472,7 +537,6 @@
((default_generator)(generate_collisions))
)
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_VARIADIC_TEMPLATES)
UNORDERED_TEST(unique_emplace_tests1,
((test_set_std_alloc)(test_set)(test_map))
((default_generator)(generate_collisions))
@@ -482,7 +546,18 @@
((test_multimap_std_alloc)(test_multiset)(test_multimap))
((default_generator)(generate_collisions))
)
-#endif
+
+UNORDERED_TEST(move_emplace_tests,
+ ((test_set_std_alloc)(test_multimap_std_alloc)(test_set)(test_map)
+ (test_multiset)(test_multimap))
+ ((default_generator)(generate_collisions))
+)
+
+UNORDERED_TEST(default_emplace_tests,
+ ((test_set_std_alloc)(test_multimap_std_alloc)(test_set)(test_map)
+ (test_multiset)(test_multimap))
+ ((default_generator)(generate_collisions))
+)
UNORDERED_TEST(map_tests,
((test_map))
Modified: branches/release/libs/unordered/test/unordered/rehash_tests.cpp
==============================================================================
--- branches/release/libs/unordered/test/unordered/rehash_tests.cpp (original)
+++ branches/release/libs/unordered/test/unordered/rehash_tests.cpp 2012-10-11 13:29:19 EDT (Thu, 11 Oct 2012)
@@ -12,6 +12,7 @@
#include "../helpers/random_values.hpp"
#include "../helpers/tracker.hpp"
#include "../helpers/metafunctions.hpp"
+#include "../objects/test.hpp"
namespace rehash_tests
{
@@ -36,6 +37,9 @@
x.rehash(0);
BOOST_TEST(postcondition(x, 0));
+
+ x.rehash(10000000);
+ BOOST_TEST(postcondition(x, 10000000));
}
template <class X>
@@ -54,6 +58,10 @@
tracker.compare(x);
BOOST_TEST(postcondition(x, 10000));
+
+ x.rehash(10000000);
+ tracker.compare(x);
+ BOOST_TEST(postcondition(x, 10000000));
}
template <class X>
@@ -74,7 +82,6 @@
BOOST_TEST(postcondition(x, 0));
}
-
template <class X>
void rehash_test1(X*, test::random_generator generator)
{
@@ -99,6 +106,35 @@
}
template <class X>
+void reserve_empty_test1(X*)
+{
+ X x;
+
+ x.reserve(10000);
+ BOOST_TEST(x.bucket_count() >= 10000);
+
+ x.reserve(0);
+
+ x.reserve(10000000);
+ BOOST_TEST(x.bucket_count() >= 10000000);
+}
+
+template <class X>
+void reserve_empty_test2(X*)
+{
+ X x;
+ x.max_load_factor(0.25);
+
+ x.reserve(10000);
+ BOOST_TEST(x.bucket_count() >= 40000);
+
+ x.reserve(0);
+
+ x.reserve(10000000);
+ BOOST_TEST(x.bucket_count() >= 40000000);
+}
+
+template <class X>
void reserve_test1(X*, test::random_generator generator)
{
for (int random_mlf = 0; random_mlf < 2; ++random_mlf)
@@ -165,34 +201,44 @@
}
boost::unordered_set<int>* int_set_ptr;
-boost::unordered_multiset<int>* int_multiset_ptr;
-boost::unordered_map<int, int>* int_map_ptr;
+boost::unordered_multiset<test::object,
+ test::hash, test::equal_to,
+ test::allocator2<test::object> >* test_multiset_ptr;
+boost::unordered_map<test::movable, test::movable,
+ test::hash, test::equal_to,
+ test::allocator2<test::movable> >* test_map_ptr;
boost::unordered_multimap<int, int>* int_multimap_ptr;
using test::default_generator;
using test::generate_collisions;
UNORDERED_TEST(rehash_empty_test1,
- ((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
+ ((int_set_ptr)(test_multiset_ptr)(test_map_ptr)(int_multimap_ptr))
)
UNORDERED_TEST(rehash_empty_test2,
- ((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
+ ((int_set_ptr)(test_multiset_ptr)(test_map_ptr)(int_multimap_ptr))
((default_generator)(generate_collisions))
)
UNORDERED_TEST(rehash_empty_test3,
- ((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
+ ((int_set_ptr)(test_multiset_ptr)(test_map_ptr)(int_multimap_ptr))
((default_generator)(generate_collisions))
)
UNORDERED_TEST(rehash_test1,
- ((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
+ ((int_set_ptr)(test_multiset_ptr)(test_map_ptr)(int_multimap_ptr))
((default_generator)(generate_collisions))
)
+UNORDERED_TEST(reserve_empty_test1,
+ ((int_set_ptr)(test_multiset_ptr)(test_map_ptr)(int_multimap_ptr))
+)
+UNORDERED_TEST(reserve_empty_test2,
+ ((int_set_ptr)(test_multiset_ptr)(test_map_ptr)(int_multimap_ptr))
+)
UNORDERED_TEST(reserve_test1,
- ((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
+ ((int_set_ptr)(test_multiset_ptr)(test_map_ptr)(int_multimap_ptr))
((default_generator)(generate_collisions))
)
UNORDERED_TEST(reserve_test2,
- ((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
+ ((int_set_ptr)(test_multiset_ptr)(test_map_ptr)(int_multimap_ptr))
((default_generator)(generate_collisions))
)
Modified: branches/release/libs/unordered/test/unordered/unnecessary_copy_tests.cpp
==============================================================================
--- branches/release/libs/unordered/test/unordered/unnecessary_copy_tests.cpp (original)
+++ branches/release/libs/unordered/test/unordered/unnecessary_copy_tests.cpp 2012-10-11 13:29:19 EDT (Thu, 11 Oct 2012)
@@ -20,8 +20,17 @@
public:
static int copies;
static int moves;
- count_copies() : tag_(0) { ++copies; }
- explicit count_copies(int tag) : tag_(tag) { ++copies; }
+ static int id_count;
+
+ count_copies() : tag_(0), id_(++id_count) {
+ ++copies;
+ trace_op("Default construct");
+ }
+
+ explicit count_copies(int tag) : tag_(tag), id_(++id_count) {
+ ++copies;
+ trace_op("Tag construct");
+ }
// This bizarre constructor is an attempt to confuse emplace.
//
@@ -33,17 +42,30 @@
// The second emplace should use the single argument contructor for
// the key, and this constructor for the value.
count_copies(count_copies const&, count_copies const& x)
- : tag_(x.tag_) { ++copies; }
+ : tag_(x.tag_), id_(++id_count)
+ {
+ ++copies;
+ trace_op("Pair construct");
+ }
- count_copies(count_copies const& x) : tag_(x.tag_) { ++copies; }
- count_copies(BOOST_RV_REF(count_copies) x) : tag_(x.tag_) {
+ count_copies(count_copies const& x) : tag_(x.tag_), id_(++id_count)
+ {
+ ++copies;
+ trace_op("Copy construct");
+ }
+
+ count_copies(BOOST_RV_REF(count_copies) x) :
+ tag_(x.tag_), id_(++id_count)
+ {
x.tag_ = -1; ++moves;
+ trace_op("Move construct");
}
count_copies& operator=(BOOST_COPY_ASSIGN_REF(count_copies) p) // Copy assignment
{
tag_ = p.tag_;
++copies;
+ trace_op("Copy assign");
return *this;
}
@@ -51,10 +73,21 @@
{
tag_ = p.tag_;
++moves;
+ trace_op("Move assign");
return *this;
}
+ ~count_copies() {
+ trace_op("Destruct");
+ }
+
+ void trace_op(char const* str) {
+ BOOST_LIGHTWEIGHT_TEST_OSTREAM << str << ": " << tag_
+ << " (#" << id_ << ")" <<std::endl;
+ }
+
int tag_;
+ int id_;
};
bool operator==(count_copies const& x, count_copies const& y) {
@@ -69,6 +102,9 @@
void reset() {
count_copies::copies = 0;
count_copies::moves = 0;
+
+ BOOST_LIGHTWEIGHT_TEST_OSTREAM
+ << "\nReset\n" << std::endl;
}
}
@@ -122,6 +158,7 @@
{
int count_copies::copies;
int count_copies::moves;
+ int count_copies::id_count;
template <class T>
void unnecessary_copy_insert_test(T*)
@@ -337,7 +374,16 @@
// COPY_COUNT(1) would be okay here.
reset();
x.emplace();
+# if BOOST_WORKAROUND(BOOST_MSVC, >= 1700)
+ // This is a little odd, Visual C++ 11 seems to move the pair, which
+ // results in one copy (for the const key) and one move (for the
+ // non-const mapped value). Since 'emplace(boost::move(a))' (see below)
+ // has the normal result, it must be some odd consequence of how
+ // Visual C++ 11 handles calling move for default arguments.
+ COPY_COUNT(3); MOVE_COUNT(1);
+# else
COPY_COUNT(2); MOVE_COUNT(0);
+# endif
#endif
reset();
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk