sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

+ use std::move in tests

Browse source
This commit is contained in:
artemp 2013-04-19 12:00:58 +01:00
parent 3a2b1dc027
commit d8fcf26560
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
benchmark/run.cpp
View file

@ -410,14 +410,11 @@ struct test8
#include <mapnik/rule_cache.hpp> #include <mapnik/rule_cache.hpp>
#if BOOST_VERSION >= 105300
//#include <boost/container/vector.hpp>
//#include <boost/move/utility.hpp>
class rule_cache_move class rule_cache_move
{ {
private: private:
BOOST_MOVABLE_BUT_NOT_COPYABLE(rule_cache_move) rule_cache_move(rule_cache_move const& other) = delete; // no copy ctor
rule_cache_move& operator=(rule_cache_move const& other) = delete; // no assignment op
public: public:
typedef std::vector<rule const*> rule_ptrs; typedef std::vector<rule const*> rule_ptrs;
rule_cache_move() rule_cache_move()
@ -425,13 +422,13 @@ public:
else_rules_(), else_rules_(),
also_rules_() {} also_rules_() {}
rule_cache_move(BOOST_RV_REF(rule_cache_move) rhs) // move ctor rule_cache_move(rule_cache_move && rhs) // move ctor
: if_rules_(boost::move(rhs.if_rules_)), : if_rules_(std::move(rhs.if_rules_)),
else_rules_(boost::move(rhs.else_rules_)), else_rules_(std::move(rhs.else_rules_)),
also_rules_(boost::move(rhs.also_rules_)) also_rules_(std::move(rhs.also_rules_))
{} {}
rule_cache_move& operator=(BOOST_RV_REF(rule_cache_move) rhs) // move assign rule_cache_move& operator=(rule_cache_move && rhs) // move assign
{ {
std::swap(if_rules_, rhs.if_rules_); std::swap(if_rules_, rhs.if_rules_);
std::swap(else_rules_,rhs.else_rules_); std::swap(else_rules_,rhs.else_rules_);
@ -491,9 +488,11 @@ struct test9
threads_(threads), threads_(threads),
num_rules_(num_rules), num_rules_(num_rules),
num_styles_(num_styles), num_styles_(num_styles),
rules_() { rules_()
{
mapnik::rule r("test"); mapnik::rule r("test");
for (unsigned i=0;i<num_rules_;++i) { for (unsigned i=0;i<num_rules_;++i)
{
rules_.push_back(r); rules_.push_back(r);
} }
} }
@ -505,20 +504,20 @@ struct test9
void operator()() void operator()()
{ {
for (unsigned i=0;i<iter_;++i) { for (unsigned i=0;i<iter_;++i) {
boost::container::vector<rule_cache_move> rule_caches; std::vector<rule_cache_move> rule_caches;
for (unsigned i=0;i<num_styles_;++i) { for (unsigned i=0;i<num_styles_;++i)
{
rule_cache_move rc; rule_cache_move rc;
for (unsigned i=0;i<num_rules_;++i) { for (unsigned i=0;i<num_rules_;++i)
{
rc.add_rule(rules_[i]); rc.add_rule(rules_[i]);
} }
rule_caches.push_back(boost::move(rc)); rule_caches.push_back(std::move(rc));
} }
} }
} }
}; };
#endif
class rule_cache_heap class rule_cache_heap
{ {
public: public:
@ -860,9 +859,9 @@ int main( int argc, char** argv)
{ {
#if BOOST_VERSION >= 105300 #if BOOST_VERSION >= 105300
test9 runner(1000,10,200,50); test9 runner(1000,10,200,50);
benchmark(runner,"rule caching using boost::move"); benchmark(runner,"rule caching using move semantics");
#else #else
std::clog << "not running: 'rule caching using boost::move'\n"; std::clog << "not running: 'rule caching using move semantics'\n";
#endif #endif
} }