forked from boostorg/container
* Fixed adaptive pool bugs
* Improved adaptive pool testing enabling invariant checking in debug mode. * New compile-time and runtime calculated parameters for adaptive_pool. * New test comparing set with default allocator or adaptive pool
This commit is contained in:
@@ -7,6 +7,10 @@
|
||||
// See http://www.boost.org/libs/container for documentation.
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//Enable checks in debug mode
|
||||
#ifndef NDEBUG
|
||||
#define BOOST_CONTAINER_ADAPTIVE_NODE_POOL_CHECK_INVARIANTS
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning (disable : 4512)
|
||||
@@ -273,12 +277,14 @@ int main(int argc, const char *argv[])
|
||||
#endif
|
||||
std::size_t numele [] = { 10000, 1000, 100, 10, 5, 2, 1 };
|
||||
#else
|
||||
#ifdef NDEBUG
|
||||
std::size_t numrep [] = { 150000 };
|
||||
#ifdef BOOST_CONTAINER_ADAPTIVE_NODE_POOL_CHECK_INVARIANTS
|
||||
std::size_t numrep[] = { 1000 };
|
||||
#elif defined(NDEBUG)
|
||||
std::size_t numrep [] = { 15000 };
|
||||
#else
|
||||
std::size_t numrep [] = { 10000 };
|
||||
std::size_t numrep [] = { 1000 };
|
||||
#endif
|
||||
std::size_t numele [] = { 10 };
|
||||
std::size_t numele [] = { 100 };
|
||||
#endif
|
||||
|
||||
bool csv_output = argc == 2 && (strcmp(argv[1], "--csv-output") == 0);
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// (C) Copyright Ion Gaztanaga 2013-2013. 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)
|
||||
//
|
||||
// See http://www.boost.org/libs/container for documentation.
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//Enable checks in debug mode
|
||||
#ifndef NDEBUG
|
||||
#define BOOST_CONTAINER_ADAPTIVE_NODE_POOL_CHECK_INVARIANTS
|
||||
#endif
|
||||
|
||||
#include "bench_set.hpp"
|
||||
#include <boost/container/set.hpp>
|
||||
#include <boost/container/allocator.hpp>
|
||||
#include <boost/container/adaptive_pool.hpp>
|
||||
|
||||
int main()
|
||||
{
|
||||
using namespace boost::container;
|
||||
|
||||
fill_range_ints();
|
||||
fill_range_strings();
|
||||
|
||||
//set<..., adaptive_pool> vs. set
|
||||
launch_tests< set<int, std::less<int>, private_adaptive_pool<int> >, set<int> >
|
||||
("set<int, ..., private_adaptive_pool<int>", "set<int>");
|
||||
launch_tests< set<string, std::less<string>, private_adaptive_pool<string> >, set<string> >
|
||||
("set<string, ..., private_adaptive_pool<string>", "set<string>");
|
||||
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user