[Boost-commit] svn:boost r78296 - in sandbox/pool: boost/pool libs/pool/test

Subject: [Boost-commit] svn:boost r78296 - in sandbox/pool: boost/pool libs/pool/test
From: svart.riddare_at_[hidden]
Date: 2012-05-01 10:01:47

Author: edupuis
Date: 2012-05-01 10:01:46 EDT (Tue, 01 May 2012)
New Revision: 78296
URL: http://svn.boost.org/trac/boost/changeset/78296

Log:
GCC compilation and forgotten file.
Added:
   sandbox/pool/boost/pool/array_pool.hpp   (contents, props changed)
Text files modified: 
   sandbox/pool/boost/pool/object_pool.hpp              |     2 ++                                      
   sandbox/pool/libs/pool/test/test_poisoned_macros.cpp |     5 +++++                                   
   sandbox/pool/libs/pool/test/test_static_pool.cpp     |     2 +-                                      
   3 files changed, 8 insertions(+), 1 deletions(-)

Added: sandbox/pool/boost/pool/array_pool.hpp
==============================================================================
--- (empty file)
+++ sandbox/pool/boost/pool/array_pool.hpp	2012-05-01 10:01:46 EDT (Tue, 01 May 2012)
@@ -0,0 +1,83 @@
+// Copyright (C) 2012 Étienne Dupuis
+//
+// 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 for updates, documentation, and revision history.
+
+#ifndef BOOST_ARRAY_POOL_HPP
+#define BOOST_ARRAY_POOL_HPP
+/*!
+\file
+\brief  Provides a template type boost::static_pool<T, UserAllocator>
+that can be used for fast and efficient memory allocation of objects of type T.
+It also provides automatic destruction of non-deallocated objects.
+*/
+
+#include <boost/pool/poolfwd.hpp>
+
+// boost::static_pool
+#include <boost/pool/static_pool.hpp>
+
+namespace boost
+{
+
+// HELPER CLASS
+
+struct array_pool_allocator
+{
+  typedef std::size_t size_type; //!< An unsigned integral type that can represent the size of the largest object to be allocated.
+  typedef std::ptrdiff_t difference_type; //!< A signed integral type that can represent the difference of any two pointers.
+
+  static char * malloc BOOST_PREVENT_MACRO_SUBSTITUTION(const size_type /*bytes*/)
+  { //! Returns NULL as it should not be called
+    return NULL;
+  }
+
+  static void free BOOST_PREVENT_MACRO_SUBSTITUTION(char * const /*block*/)
+  { //! Ignore any given pointer
+  }
+};
+
+
+// DOCUMENTATION TO BE INSERTED
+
+template<size_t RequestedSize, size_t PoolSize>
+class array_pool: public static_pool<array_pool_allocator>
+{
+  public :
+    typedef typename static_pool<array_pool_allocator>::user_allocator user_allocator;
+    typedef typename static_pool<array_pool_allocator>::size_type size_type;
+    typedef typename static_pool<array_pool_allocator>::difference_type difference_type;
+
+  public:
+    explicit array_pool(const size_type /*nrequested_size*/ = RequestedSize, const size_type /*nrequested_items*/ = PoolSize)
+    :
+    static_pool<array_pool_allocator>(RequestedSize, PoolSize)
+    { 
+      const details::PODptr<size_type> node(memory, sizeof(memory));
+
+      store().add_block(node.begin(), node.element_size(), s_alloc_size);
+      node.next(list);
+      list = node;
+    }
+
+  private :
+    BOOST_STATIC_CONSTANT(size_type, min_alloc_size =
+      (::boost::math::static_lcm<sizeof(void *), sizeof(size_type)>::value));
+    BOOST_STATIC_CONSTANT(size_type, max_alloc_size =
+      (::boost::static_unsigned_max<RequestedSize, min_alloc_size>::value));
+    BOOST_STATIC_CONSTANT(size_type, min_align =
+      (::boost::math::static_lcm<boost::alignment_of<void *>::value, boost::alignment_of<size_type>::value>::value));
+    BOOST_STATIC_CONSTANT(size_type, s_alloc_size =
+      ((max_alloc_size % min_align) ? max_alloc_size + min_align - max_alloc_size % min_align : max_alloc_size));
+    BOOST_STATIC_CONSTANT(size_type, s_pod_size =
+      (PoolSize * s_alloc_size + math::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type)));
+
+    char memory[s_pod_size];
+};
+
+} // namespace boost
+
+#endif

Modified: sandbox/pool/boost/pool/object_pool.hpp
==============================================================================
--- sandbox/pool/boost/pool/object_pool.hpp	(original)
+++ sandbox/pool/boost/pool/object_pool.hpp	2012-05-01 10:01:46 EDT (Tue, 01 May 2012)
@@ -21,6 +21,8 @@
 #include <boost/pool/pool.hpp>
 // boost::static_pool
 #include <boost/pool/static_pool.hpp>
+// boost::array_pool
+#include <boost/pool/array_pool.hpp>
 
 // The following code will be put into Boost.Config in a later revision
 #if defined(BOOST_MSVC) || defined(__KCC)

Modified: sandbox/pool/libs/pool/test/test_poisoned_macros.cpp
==============================================================================
--- sandbox/pool/libs/pool/test/test_poisoned_macros.cpp	(original)
+++ sandbox/pool/libs/pool/test/test_poisoned_macros.cpp	2012-05-01 10:01:46 EDT (Tue, 01 May 2012)
@@ -24,6 +24,8 @@
 
 #include <boost/pool/pool.hpp>
 #include <boost/pool/object_pool.hpp>
+#include <boost/pool/static_pool.hpp>
+#include <boost/pool/array_pool.hpp>
 #include <boost/pool/pool_alloc.hpp>
 #include <boost/pool/singleton_pool.hpp>
 
@@ -39,6 +41,9 @@
 template class boost::static_object_pool<int, boost::default_user_allocator_new_delete>;
 template class boost::static_object_pool<int, boost::default_user_allocator_malloc_free>;
 
+template class boost::array_pool<1, 1>;
+template class boost::array_object_pool<int, 1>;
+
 template class boost::pool_allocator<int, boost::default_user_allocator_new_delete>;
 template class boost::pool_allocator<int, boost::default_user_allocator_malloc_free>;
 template class boost::fast_pool_allocator<int, boost::default_user_allocator_new_delete>;

Modified: sandbox/pool/libs/pool/test/test_static_pool.cpp
==============================================================================
--- sandbox/pool/libs/pool/test/test_static_pool.cpp	(original)
+++ sandbox/pool/libs/pool/test/test_static_pool.cpp	2012-05-01 10:01:46 EDT (Tue, 01 May 2012)
@@ -131,7 +131,7 @@
 {
   static const int num_random_iterations = 200;        // Number of iterations f
 
-  Pool::element_type **p = new Pool::element_type *[pool_size];
+  typename Pool::element_type **p = new typename Pool::element_type *[pool_size];
 
   // TEST #1