Add initial version of C++17 <memory_resource> header
This is missing the synchronized_pool_resource and
unsynchronized_pool_resource classes but is otherwise complete.
This is a new implementation, not based on the existing code in
<experimental/memory_resource>, but memory_resource and
polymorphic_allocator ended up looking almost the same anyway.
The constant_init kluge in src/c++17/memory_resource.cc is apparently
due to Richard Smith and ensures that the objects are constructed during
constant initialiation phase and not destroyed (because the
constant_init destructor doesn't destroy the union member and the
storage is not reused).
* config/abi/pre/gnu.ver: Export new symbols.
* configure: Regenerate.
* include/Makefile.am: Add new <memory_resource> header.
* include/Makefile.in: Regenerate.
* include/precompiled/stdc++.h: Include <memory_resource> for C++17.
* include/std/memory_resource: New header.
(memory_resource, polymorphic_allocator, new_delete_resource)
(null_memory_resource, set_default_resource, get_default_resource)
(pool_options, monotonic_buffer_resource): Define.
* src/Makefile.am: Add c++17 directory.
* src/Makefile.in: Regenerate.
* src/c++11/Makefile.am: Fix comment.
* src/c++17/Makefile.am: Add makefile for new sub-directory.
* src/c++17/Makefile.in: Generate.
* src/c++17/memory_resource.cc: New.
(newdel_res_t, null_res_t, constant_init, newdel_res, null_res)
(default_res, new_delete_resource, null_memory_resource)
(set_default_resource, get_default_resource): Define.
* testsuite/20_util/memory_resource/1.cc: New test.
* testsuite/20_util/memory_resource/2.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/1.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/allocate.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/deallocate.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/release.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc:
New test.
* testsuite/20_util/polymorphic_allocator/1.cc: New test.
* testsuite/20_util/polymorphic_allocator/resource.cc: New test.
* testsuite/20_util/polymorphic_allocator/select.cc: New test.
* testsuite/util/testsuite_allocator.h (__gnu_test::memory_resource):
Define concrete memory resource for testing.
(__gnu_test::default_resource_mgr): Define RAII helper for changing
default resource.
From-SVN: r262953
2018-07-24 23:09:55 +02:00
|
|
|
// <memory_resource> -*- C++ -*-
|
|
|
|
|
|
|
|
// Copyright (C) 2018 Free Software Foundation, Inc.
|
|
|
|
//
|
|
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
|
|
// software; you can redistribute it and/or modify it under the
|
|
|
|
// terms of the GNU General Public License as published by the
|
|
|
|
// Free Software Foundation; either version 3, or (at your option)
|
|
|
|
// any later version.
|
|
|
|
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License for more details.
|
|
|
|
|
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
/** @file include/memory_resource
|
|
|
|
* This is a Standard C++ Library header.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _GLIBCXX_MEMORY_RESOURCE
|
|
|
|
#define _GLIBCXX_MEMORY_RESOURCE 1
|
|
|
|
|
|
|
|
#pragma GCC system_header
|
|
|
|
|
|
|
|
#if __cplusplus >= 201703L
|
|
|
|
|
|
|
|
#include <bit> // __ceil2, __log2p1
|
|
|
|
#include <memory> // align, allocator_arg_t, __uses_alloc
|
|
|
|
#include <utility> // pair, index_sequence
|
|
|
|
#include <cstddef> // size_t, max_align_t
|
|
|
|
#include <debug/assertions.h>
|
|
|
|
|
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
|
|
{
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
|
|
namespace pmr
|
|
|
|
{
|
|
|
|
// #define __cpp_lib_memory_resource 201603
|
|
|
|
|
|
|
|
class memory_resource;
|
|
|
|
|
|
|
|
template<typename _Tp>
|
|
|
|
class polymorphic_allocator;
|
|
|
|
|
|
|
|
// Global memory resources
|
|
|
|
memory_resource* new_delete_resource() noexcept;
|
|
|
|
memory_resource* null_memory_resource() noexcept;
|
|
|
|
memory_resource* set_default_resource(memory_resource* __r) noexcept;
|
|
|
|
memory_resource* get_default_resource() noexcept
|
|
|
|
__attribute__((__returns_nonnull__));
|
|
|
|
|
|
|
|
// Pool resource classes
|
|
|
|
struct pool_options;
|
|
|
|
class synchronized_pool_resource;
|
|
|
|
class unsynchronized_pool_resource;
|
|
|
|
class monotonic_buffer_resource;
|
|
|
|
|
|
|
|
/// Class memory_resource
|
|
|
|
class memory_resource
|
|
|
|
{
|
|
|
|
static constexpr size_t _S_max_align = alignof(max_align_t);
|
|
|
|
|
|
|
|
public:
|
|
|
|
memory_resource() = default;
|
|
|
|
memory_resource(const memory_resource&) = default;
|
|
|
|
virtual ~memory_resource() = default;
|
|
|
|
|
|
|
|
memory_resource& operator=(const memory_resource&) = default;
|
|
|
|
|
|
|
|
[[nodiscard]]
|
|
|
|
void*
|
|
|
|
allocate(size_t __bytes, size_t __alignment = _S_max_align)
|
|
|
|
__attribute__((__returns_nonnull__,__alloc_size__(2),__alloc_align__(3)))
|
|
|
|
{ return do_allocate(__bytes, __alignment); }
|
|
|
|
|
|
|
|
void
|
|
|
|
deallocate(void* __p, size_t __bytes, size_t __alignment = _S_max_align)
|
|
|
|
__attribute__((__nonnull__))
|
|
|
|
{ return do_deallocate(__p, __bytes, __alignment); }
|
|
|
|
|
|
|
|
bool
|
|
|
|
is_equal(const memory_resource& __other) const noexcept
|
|
|
|
{ return do_is_equal(__other); }
|
|
|
|
|
|
|
|
private:
|
|
|
|
virtual void*
|
|
|
|
do_allocate(size_t __bytes, size_t __alignment) = 0;
|
|
|
|
|
|
|
|
virtual void
|
|
|
|
do_deallocate(void* __p, size_t __bytes, size_t __alignment) = 0;
|
|
|
|
|
|
|
|
virtual bool
|
|
|
|
do_is_equal(const memory_resource& __other) const noexcept = 0;
|
|
|
|
};
|
|
|
|
|
|
|
|
inline bool
|
|
|
|
operator==(const memory_resource& __a, const memory_resource& __b) noexcept
|
|
|
|
{ return &__a == &__b || __a.is_equal(__b); }
|
|
|
|
|
|
|
|
inline bool
|
|
|
|
operator!=(const memory_resource& __a, const memory_resource& __b) noexcept
|
|
|
|
{ return !(__a == __b); }
|
|
|
|
|
|
|
|
|
|
|
|
// C++17 23.12.3 Class template polymorphic_allocator
|
|
|
|
template<typename _Tp>
|
|
|
|
class polymorphic_allocator
|
|
|
|
{
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 2975. Missing case for pair construction in polymorphic allocators
|
|
|
|
template<typename _Up>
|
|
|
|
struct __not_pair { using type = void; };
|
|
|
|
|
|
|
|
template<typename _Up1, typename _Up2>
|
|
|
|
struct __not_pair<pair<_Up1, _Up2>> { };
|
|
|
|
|
|
|
|
public:
|
|
|
|
using value_type = _Tp;
|
|
|
|
|
|
|
|
polymorphic_allocator() noexcept
|
|
|
|
: _M_resource(get_default_resource())
|
|
|
|
{ }
|
|
|
|
|
|
|
|
polymorphic_allocator(memory_resource* __r) noexcept
|
|
|
|
__attribute__((__nonnull__))
|
|
|
|
: _M_resource(__r)
|
|
|
|
{ _GLIBCXX_DEBUG_ASSERT(__r); }
|
|
|
|
|
|
|
|
polymorphic_allocator(const polymorphic_allocator& __other) = default;
|
|
|
|
|
|
|
|
template<typename _Up>
|
|
|
|
polymorphic_allocator(const polymorphic_allocator<_Up>& __x) noexcept
|
|
|
|
: _M_resource(__x.resource())
|
|
|
|
{ }
|
|
|
|
|
|
|
|
polymorphic_allocator&
|
|
|
|
operator=(const polymorphic_allocator&) = delete;
|
|
|
|
|
|
|
|
[[nodiscard]]
|
|
|
|
_Tp*
|
|
|
|
allocate(size_t __n)
|
|
|
|
__attribute__((__returns_nonnull__))
|
|
|
|
{
|
|
|
|
if (__n > (numeric_limits<size_t>::max() / sizeof(_Tp)))
|
|
|
|
std::__throw_bad_alloc();
|
|
|
|
return static_cast<_Tp*>(_M_resource->allocate(__n * sizeof(_Tp),
|
|
|
|
alignof(_Tp)));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
deallocate(_Tp* __p, size_t __n) noexcept
|
|
|
|
__attribute__((__nonnull__))
|
|
|
|
{ _M_resource->deallocate(__p, __n * sizeof(_Tp), alignof(_Tp)); }
|
|
|
|
|
|
|
|
template<typename _Tp1, typename... _Args>
|
|
|
|
__attribute__((__nonnull__))
|
|
|
|
typename __not_pair<_Tp>::type
|
|
|
|
construct(_Tp1* __p, _Args&&... __args)
|
|
|
|
{
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 2969. polymorphic_allocator::construct() shouldn't pass resource()
|
|
|
|
auto __use_tag
|
|
|
|
= __use_alloc<_Tp1, polymorphic_allocator, _Args...>(*this);
|
|
|
|
_S_construct(__use_tag, __p, std::forward<_Args>(__args)...);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _Tp1, typename _Tp2,
|
|
|
|
typename... _Args1, typename... _Args2>
|
|
|
|
__attribute__((__nonnull__))
|
|
|
|
void
|
|
|
|
construct(pair<_Tp1, _Tp2>* __p, piecewise_construct_t,
|
|
|
|
tuple<_Args1...> __x, tuple<_Args2...> __y)
|
|
|
|
{
|
|
|
|
auto __x_tag =
|
|
|
|
__use_alloc<_Tp1, polymorphic_allocator, _Args1...>(*this);
|
|
|
|
auto __y_tag =
|
|
|
|
__use_alloc<_Tp2, polymorphic_allocator, _Args2...>(*this);
|
|
|
|
index_sequence_for<_Args1...> __x_i;
|
|
|
|
index_sequence_for<_Args2...> __y_i;
|
|
|
|
|
|
|
|
::new(__p) pair<_Tp1, _Tp2>(piecewise_construct,
|
|
|
|
_S_construct_p(__x_tag, __x, __x_i),
|
|
|
|
_S_construct_p(__y_tag, __y, __y_i));
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _Tp1, typename _Tp2>
|
|
|
|
__attribute__((__nonnull__))
|
|
|
|
void
|
|
|
|
construct(pair<_Tp1, _Tp2>* __p)
|
|
|
|
{ this->construct(__p, piecewise_construct, tuple<>(), tuple<>()); }
|
|
|
|
|
|
|
|
template<typename _Tp1, typename _Tp2, typename _Up, typename _Vp>
|
|
|
|
__attribute__((__nonnull__))
|
|
|
|
void
|
|
|
|
construct(pair<_Tp1, _Tp2>* __p, _Up&& __x, _Vp&& __y)
|
|
|
|
{
|
|
|
|
this->construct(__p, piecewise_construct,
|
|
|
|
forward_as_tuple(std::forward<_Up>(__x)),
|
|
|
|
forward_as_tuple(std::forward<_Vp>(__y)));
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename _Tp1, typename _Tp2, typename _Up, typename _Vp>
|
|
|
|
__attribute__((__nonnull__))
|
|
|
|
void
|
|
|
|
construct(pair<_Tp1, _Tp2>* __p, const std::pair<_Up, _Vp>& __pr)
|
|
|
|
{
|
|
|
|
this->construct(__p, piecewise_construct,
|
|
|
|
forward_as_tuple(__pr.first),
|
|
|
|
forward_as_tuple(__pr.second));
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _Tp1, typename _Tp2, typename _Up, typename _Vp>
|
|
|
|
__attribute__((__nonnull__))
|
|
|
|
void
|
|
|
|
construct(pair<_Tp1, _Tp2>* __p, pair<_Up, _Vp>&& __pr)
|
|
|
|
{
|
|
|
|
this->construct(__p, piecewise_construct,
|
|
|
|
forward_as_tuple(std::forward<_Up>(__pr.first)),
|
|
|
|
forward_as_tuple(std::forward<_Vp>(__pr.second)));
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _Up>
|
|
|
|
__attribute__((__nonnull__))
|
|
|
|
void
|
|
|
|
destroy(_Up* __p)
|
|
|
|
{ __p->~_Up(); }
|
|
|
|
|
|
|
|
polymorphic_allocator
|
|
|
|
select_on_container_copy_construction() const noexcept
|
|
|
|
{ return polymorphic_allocator(); }
|
|
|
|
|
|
|
|
memory_resource*
|
|
|
|
resource() const noexcept
|
|
|
|
__attribute__((__returns_nonnull__))
|
|
|
|
{ return _M_resource; }
|
|
|
|
|
|
|
|
private:
|
|
|
|
using __uses_alloc1_ = __uses_alloc1<polymorphic_allocator>;
|
|
|
|
using __uses_alloc2_ = __uses_alloc2<polymorphic_allocator>;
|
|
|
|
|
|
|
|
template<typename _Tp1, typename... _Args>
|
|
|
|
static void
|
|
|
|
_S_construct(__uses_alloc0, _Tp1* __p, _Args&&... __args)
|
|
|
|
{ ::new(__p) _Tp1(std::forward<_Args>(__args)...); }
|
|
|
|
|
|
|
|
template<typename _Tp1, typename... _Args>
|
|
|
|
static void
|
|
|
|
_S_construct(__uses_alloc1_ __ua, _Tp1* __p, _Args&&... __args)
|
|
|
|
{
|
|
|
|
::new(__p) _Tp1(allocator_arg, *__ua._M_a,
|
|
|
|
std::forward<_Args>(__args)...);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _Tp1, typename... _Args>
|
|
|
|
static void
|
|
|
|
_S_construct(__uses_alloc2_ __ua, _Tp1* __p, _Args&&... __args)
|
|
|
|
{ ::new(__p) _Tp1(std::forward<_Args>(__args)..., *__ua._M_a); }
|
|
|
|
|
|
|
|
template<typename _Ind, typename... _Args>
|
|
|
|
static tuple<_Args&&...>
|
|
|
|
_S_construct_p(__uses_alloc0, _Ind, tuple<_Args...>& __t)
|
|
|
|
{ return std::move(__t); }
|
|
|
|
|
|
|
|
template<size_t... _Ind, typename... _Args>
|
|
|
|
static tuple<allocator_arg_t, polymorphic_allocator&, _Args&&...>
|
|
|
|
_S_construct_p(__uses_alloc1_ __ua, index_sequence<_Ind...>,
|
|
|
|
tuple<_Args...>& __t)
|
|
|
|
{
|
|
|
|
return {
|
|
|
|
allocator_arg, *__ua._M_a, std::get<_Ind>(std::move(__t))...
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
template<size_t... _Ind, typename... _Args>
|
|
|
|
static tuple<_Args&&..., polymorphic_allocator&>
|
|
|
|
_S_construct_p(__uses_alloc2_ __ua, index_sequence<_Ind...>,
|
|
|
|
tuple<_Args...>& __t)
|
|
|
|
{ return { std::get<_Ind>(std::move(__t))..., *__ua._M_a }; }
|
|
|
|
|
|
|
|
memory_resource* _M_resource;
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _Tp1, typename _Tp2>
|
|
|
|
inline bool
|
|
|
|
operator==(const polymorphic_allocator<_Tp1>& __a,
|
|
|
|
const polymorphic_allocator<_Tp2>& __b) noexcept
|
|
|
|
{ return *__a.resource() == *__b.resource(); }
|
|
|
|
|
|
|
|
template<typename _Tp1, typename _Tp2>
|
|
|
|
inline bool
|
|
|
|
operator!=(const polymorphic_allocator<_Tp1>& __a,
|
|
|
|
const polymorphic_allocator<_Tp2>& __b) noexcept
|
|
|
|
{ return !(__a == __b); }
|
|
|
|
|
|
|
|
|
|
|
|
struct pool_options
|
|
|
|
{
|
|
|
|
size_t max_blocks_per_chunk = 0;
|
|
|
|
size_t largest_required_pool_block = 0;
|
|
|
|
};
|
|
|
|
|
|
|
|
// TODO class synchronized_pool_resource;
|
|
|
|
// TODO class unsynchronized_pool_resource;
|
|
|
|
|
|
|
|
class monotonic_buffer_resource : public memory_resource
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
explicit
|
|
|
|
monotonic_buffer_resource(memory_resource* __upstream) noexcept
|
|
|
|
__attribute__((__nonnull__))
|
|
|
|
: _M_upstream(__upstream)
|
|
|
|
{ _GLIBCXX_DEBUG_ASSERT(__upstream != nullptr); }
|
|
|
|
|
|
|
|
monotonic_buffer_resource(size_t __initial_size,
|
|
|
|
memory_resource* __upstream) noexcept
|
|
|
|
__attribute__((__nonnull__))
|
|
|
|
: _M_next_bufsiz(__initial_size),
|
|
|
|
_M_upstream(__upstream)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_ASSERT(__upstream != nullptr);
|
|
|
|
_GLIBCXX_DEBUG_ASSERT(__initial_size > 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
monotonic_buffer_resource(void* __buffer, size_t __buffer_size,
|
|
|
|
memory_resource* __upstream) noexcept
|
|
|
|
__attribute__((__nonnull__(4)))
|
|
|
|
: _M_current_buf(__buffer), _M_avail(__buffer_size),
|
|
|
|
_M_next_bufsiz(_S_next_bufsize(__buffer_size)),
|
|
|
|
_M_upstream(__upstream),
|
|
|
|
_M_orig_buf(__buffer), _M_orig_size(__buffer_size)
|
|
|
|
{
|
|
|
|
_GLIBCXX_DEBUG_ASSERT(__upstream != nullptr);
|
|
|
|
_GLIBCXX_DEBUG_ASSERT(__buffer != nullptr || __buffer_size == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
monotonic_buffer_resource() noexcept
|
|
|
|
: monotonic_buffer_resource(get_default_resource())
|
|
|
|
{ }
|
|
|
|
|
|
|
|
explicit
|
|
|
|
monotonic_buffer_resource(size_t __initial_size) noexcept
|
|
|
|
: monotonic_buffer_resource(__initial_size, get_default_resource())
|
|
|
|
{ }
|
|
|
|
|
|
|
|
monotonic_buffer_resource(void* __buffer, size_t __buffer_size) noexcept
|
|
|
|
: monotonic_buffer_resource(__buffer, __buffer_size, get_default_resource())
|
|
|
|
{ }
|
|
|
|
|
|
|
|
monotonic_buffer_resource(const monotonic_buffer_resource&) = delete;
|
|
|
|
|
|
|
|
virtual ~monotonic_buffer_resource() { release(); }
|
|
|
|
|
|
|
|
monotonic_buffer_resource&
|
|
|
|
operator=(const monotonic_buffer_resource&) = delete;
|
|
|
|
|
|
|
|
void
|
|
|
|
release() noexcept
|
|
|
|
{
|
2018-08-07 13:31:16 +02:00
|
|
|
if (_M_head)
|
|
|
|
_M_release_buffers();
|
Add initial version of C++17 <memory_resource> header
This is missing the synchronized_pool_resource and
unsynchronized_pool_resource classes but is otherwise complete.
This is a new implementation, not based on the existing code in
<experimental/memory_resource>, but memory_resource and
polymorphic_allocator ended up looking almost the same anyway.
The constant_init kluge in src/c++17/memory_resource.cc is apparently
due to Richard Smith and ensures that the objects are constructed during
constant initialiation phase and not destroyed (because the
constant_init destructor doesn't destroy the union member and the
storage is not reused).
* config/abi/pre/gnu.ver: Export new symbols.
* configure: Regenerate.
* include/Makefile.am: Add new <memory_resource> header.
* include/Makefile.in: Regenerate.
* include/precompiled/stdc++.h: Include <memory_resource> for C++17.
* include/std/memory_resource: New header.
(memory_resource, polymorphic_allocator, new_delete_resource)
(null_memory_resource, set_default_resource, get_default_resource)
(pool_options, monotonic_buffer_resource): Define.
* src/Makefile.am: Add c++17 directory.
* src/Makefile.in: Regenerate.
* src/c++11/Makefile.am: Fix comment.
* src/c++17/Makefile.am: Add makefile for new sub-directory.
* src/c++17/Makefile.in: Generate.
* src/c++17/memory_resource.cc: New.
(newdel_res_t, null_res_t, constant_init, newdel_res, null_res)
(default_res, new_delete_resource, null_memory_resource)
(set_default_resource, get_default_resource): Define.
* testsuite/20_util/memory_resource/1.cc: New test.
* testsuite/20_util/memory_resource/2.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/1.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/allocate.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/deallocate.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/release.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc:
New test.
* testsuite/20_util/polymorphic_allocator/1.cc: New test.
* testsuite/20_util/polymorphic_allocator/resource.cc: New test.
* testsuite/20_util/polymorphic_allocator/select.cc: New test.
* testsuite/util/testsuite_allocator.h (__gnu_test::memory_resource):
Define concrete memory resource for testing.
(__gnu_test::default_resource_mgr): Define RAII helper for changing
default resource.
From-SVN: r262953
2018-07-24 23:09:55 +02:00
|
|
|
|
|
|
|
// reset to initial state at contruction:
|
|
|
|
if ((_M_current_buf = _M_orig_buf))
|
|
|
|
{
|
|
|
|
_M_avail = _M_orig_size;
|
|
|
|
_M_next_bufsiz = _S_next_bufsize(_M_orig_size);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
_M_avail = 0;
|
|
|
|
_M_next_bufsiz = _M_orig_size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
memory_resource*
|
|
|
|
upstream_resource() const noexcept
|
|
|
|
__attribute__((__returns_nonnull__))
|
|
|
|
{ return _M_upstream; }
|
|
|
|
|
|
|
|
protected:
|
|
|
|
void*
|
|
|
|
do_allocate(size_t __bytes, size_t __alignment) override
|
|
|
|
{
|
|
|
|
if (__bytes == 0)
|
|
|
|
__bytes = 1; // Ensures we don't return the same pointer twice.
|
|
|
|
|
2018-08-07 13:31:16 +02:00
|
|
|
void* __p = std::align(__alignment, __bytes, _M_current_buf, _M_avail);
|
|
|
|
if (!__p)
|
Add initial version of C++17 <memory_resource> header
This is missing the synchronized_pool_resource and
unsynchronized_pool_resource classes but is otherwise complete.
This is a new implementation, not based on the existing code in
<experimental/memory_resource>, but memory_resource and
polymorphic_allocator ended up looking almost the same anyway.
The constant_init kluge in src/c++17/memory_resource.cc is apparently
due to Richard Smith and ensures that the objects are constructed during
constant initialiation phase and not destroyed (because the
constant_init destructor doesn't destroy the union member and the
storage is not reused).
* config/abi/pre/gnu.ver: Export new symbols.
* configure: Regenerate.
* include/Makefile.am: Add new <memory_resource> header.
* include/Makefile.in: Regenerate.
* include/precompiled/stdc++.h: Include <memory_resource> for C++17.
* include/std/memory_resource: New header.
(memory_resource, polymorphic_allocator, new_delete_resource)
(null_memory_resource, set_default_resource, get_default_resource)
(pool_options, monotonic_buffer_resource): Define.
* src/Makefile.am: Add c++17 directory.
* src/Makefile.in: Regenerate.
* src/c++11/Makefile.am: Fix comment.
* src/c++17/Makefile.am: Add makefile for new sub-directory.
* src/c++17/Makefile.in: Generate.
* src/c++17/memory_resource.cc: New.
(newdel_res_t, null_res_t, constant_init, newdel_res, null_res)
(default_res, new_delete_resource, null_memory_resource)
(set_default_resource, get_default_resource): Define.
* testsuite/20_util/memory_resource/1.cc: New test.
* testsuite/20_util/memory_resource/2.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/1.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/allocate.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/deallocate.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/release.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc:
New test.
* testsuite/20_util/polymorphic_allocator/1.cc: New test.
* testsuite/20_util/polymorphic_allocator/resource.cc: New test.
* testsuite/20_util/polymorphic_allocator/select.cc: New test.
* testsuite/util/testsuite_allocator.h (__gnu_test::memory_resource):
Define concrete memory resource for testing.
(__gnu_test::default_resource_mgr): Define RAII helper for changing
default resource.
From-SVN: r262953
2018-07-24 23:09:55 +02:00
|
|
|
{
|
2018-08-07 13:31:16 +02:00
|
|
|
_M_new_buffer(__bytes, __alignment);
|
|
|
|
__p = _M_current_buf;
|
Add initial version of C++17 <memory_resource> header
This is missing the synchronized_pool_resource and
unsynchronized_pool_resource classes but is otherwise complete.
This is a new implementation, not based on the existing code in
<experimental/memory_resource>, but memory_resource and
polymorphic_allocator ended up looking almost the same anyway.
The constant_init kluge in src/c++17/memory_resource.cc is apparently
due to Richard Smith and ensures that the objects are constructed during
constant initialiation phase and not destroyed (because the
constant_init destructor doesn't destroy the union member and the
storage is not reused).
* config/abi/pre/gnu.ver: Export new symbols.
* configure: Regenerate.
* include/Makefile.am: Add new <memory_resource> header.
* include/Makefile.in: Regenerate.
* include/precompiled/stdc++.h: Include <memory_resource> for C++17.
* include/std/memory_resource: New header.
(memory_resource, polymorphic_allocator, new_delete_resource)
(null_memory_resource, set_default_resource, get_default_resource)
(pool_options, monotonic_buffer_resource): Define.
* src/Makefile.am: Add c++17 directory.
* src/Makefile.in: Regenerate.
* src/c++11/Makefile.am: Fix comment.
* src/c++17/Makefile.am: Add makefile for new sub-directory.
* src/c++17/Makefile.in: Generate.
* src/c++17/memory_resource.cc: New.
(newdel_res_t, null_res_t, constant_init, newdel_res, null_res)
(default_res, new_delete_resource, null_memory_resource)
(set_default_resource, get_default_resource): Define.
* testsuite/20_util/memory_resource/1.cc: New test.
* testsuite/20_util/memory_resource/2.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/1.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/allocate.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/deallocate.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/release.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc:
New test.
* testsuite/20_util/polymorphic_allocator/1.cc: New test.
* testsuite/20_util/polymorphic_allocator/resource.cc: New test.
* testsuite/20_util/polymorphic_allocator/select.cc: New test.
* testsuite/util/testsuite_allocator.h (__gnu_test::memory_resource):
Define concrete memory resource for testing.
(__gnu_test::default_resource_mgr): Define RAII helper for changing
default resource.
From-SVN: r262953
2018-07-24 23:09:55 +02:00
|
|
|
}
|
2018-08-07 13:31:16 +02:00
|
|
|
_M_current_buf = (char*)_M_current_buf + __bytes;
|
|
|
|
_M_avail -= __bytes;
|
Add initial version of C++17 <memory_resource> header
This is missing the synchronized_pool_resource and
unsynchronized_pool_resource classes but is otherwise complete.
This is a new implementation, not based on the existing code in
<experimental/memory_resource>, but memory_resource and
polymorphic_allocator ended up looking almost the same anyway.
The constant_init kluge in src/c++17/memory_resource.cc is apparently
due to Richard Smith and ensures that the objects are constructed during
constant initialiation phase and not destroyed (because the
constant_init destructor doesn't destroy the union member and the
storage is not reused).
* config/abi/pre/gnu.ver: Export new symbols.
* configure: Regenerate.
* include/Makefile.am: Add new <memory_resource> header.
* include/Makefile.in: Regenerate.
* include/precompiled/stdc++.h: Include <memory_resource> for C++17.
* include/std/memory_resource: New header.
(memory_resource, polymorphic_allocator, new_delete_resource)
(null_memory_resource, set_default_resource, get_default_resource)
(pool_options, monotonic_buffer_resource): Define.
* src/Makefile.am: Add c++17 directory.
* src/Makefile.in: Regenerate.
* src/c++11/Makefile.am: Fix comment.
* src/c++17/Makefile.am: Add makefile for new sub-directory.
* src/c++17/Makefile.in: Generate.
* src/c++17/memory_resource.cc: New.
(newdel_res_t, null_res_t, constant_init, newdel_res, null_res)
(default_res, new_delete_resource, null_memory_resource)
(set_default_resource, get_default_resource): Define.
* testsuite/20_util/memory_resource/1.cc: New test.
* testsuite/20_util/memory_resource/2.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/1.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/allocate.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/deallocate.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/release.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc:
New test.
* testsuite/20_util/polymorphic_allocator/1.cc: New test.
* testsuite/20_util/polymorphic_allocator/resource.cc: New test.
* testsuite/20_util/polymorphic_allocator/select.cc: New test.
* testsuite/util/testsuite_allocator.h (__gnu_test::memory_resource):
Define concrete memory resource for testing.
(__gnu_test::default_resource_mgr): Define RAII helper for changing
default resource.
From-SVN: r262953
2018-07-24 23:09:55 +02:00
|
|
|
return __p;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
do_deallocate(void*, size_t, size_t) override
|
|
|
|
{ }
|
|
|
|
|
|
|
|
bool
|
|
|
|
do_is_equal(const memory_resource& __other) const noexcept override
|
|
|
|
{ return this == &__other; }
|
|
|
|
|
|
|
|
private:
|
2018-08-07 13:31:16 +02:00
|
|
|
// Update _M_current_buf and _M_avail to refer to a new buffer with
|
|
|
|
// at least the specified size and alignment, allocated from upstream.
|
|
|
|
void
|
|
|
|
_M_new_buffer(size_t __bytes, size_t __alignment);
|
|
|
|
|
|
|
|
// Deallocate all buffers obtained from upstream.
|
|
|
|
void
|
|
|
|
_M_release_buffers() noexcept;
|
|
|
|
|
Add initial version of C++17 <memory_resource> header
This is missing the synchronized_pool_resource and
unsynchronized_pool_resource classes but is otherwise complete.
This is a new implementation, not based on the existing code in
<experimental/memory_resource>, but memory_resource and
polymorphic_allocator ended up looking almost the same anyway.
The constant_init kluge in src/c++17/memory_resource.cc is apparently
due to Richard Smith and ensures that the objects are constructed during
constant initialiation phase and not destroyed (because the
constant_init destructor doesn't destroy the union member and the
storage is not reused).
* config/abi/pre/gnu.ver: Export new symbols.
* configure: Regenerate.
* include/Makefile.am: Add new <memory_resource> header.
* include/Makefile.in: Regenerate.
* include/precompiled/stdc++.h: Include <memory_resource> for C++17.
* include/std/memory_resource: New header.
(memory_resource, polymorphic_allocator, new_delete_resource)
(null_memory_resource, set_default_resource, get_default_resource)
(pool_options, monotonic_buffer_resource): Define.
* src/Makefile.am: Add c++17 directory.
* src/Makefile.in: Regenerate.
* src/c++11/Makefile.am: Fix comment.
* src/c++17/Makefile.am: Add makefile for new sub-directory.
* src/c++17/Makefile.in: Generate.
* src/c++17/memory_resource.cc: New.
(newdel_res_t, null_res_t, constant_init, newdel_res, null_res)
(default_res, new_delete_resource, null_memory_resource)
(set_default_resource, get_default_resource): Define.
* testsuite/20_util/memory_resource/1.cc: New test.
* testsuite/20_util/memory_resource/2.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/1.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/allocate.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/deallocate.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/release.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc:
New test.
* testsuite/20_util/polymorphic_allocator/1.cc: New test.
* testsuite/20_util/polymorphic_allocator/resource.cc: New test.
* testsuite/20_util/polymorphic_allocator/select.cc: New test.
* testsuite/util/testsuite_allocator.h (__gnu_test::memory_resource):
Define concrete memory resource for testing.
(__gnu_test::default_resource_mgr): Define RAII helper for changing
default resource.
From-SVN: r262953
2018-07-24 23:09:55 +02:00
|
|
|
static size_t
|
|
|
|
_S_next_bufsize(size_t __buffer_size) noexcept
|
|
|
|
{
|
|
|
|
if (__buffer_size == 0)
|
|
|
|
__buffer_size = 1;
|
|
|
|
return __buffer_size * _S_growth_factor;
|
|
|
|
}
|
|
|
|
|
|
|
|
static constexpr size_t _S_init_bufsize = 128 * sizeof(void*);
|
|
|
|
static constexpr float _S_growth_factor = 1.5;
|
|
|
|
|
|
|
|
void* _M_current_buf = nullptr;
|
|
|
|
size_t _M_avail = 0;
|
|
|
|
size_t _M_next_bufsiz = _S_init_bufsize;
|
|
|
|
|
|
|
|
// Initial values set at construction and reused by release():
|
|
|
|
memory_resource* const _M_upstream;
|
|
|
|
void* const _M_orig_buf = nullptr;
|
|
|
|
size_t const _M_orig_size = _M_next_bufsiz;
|
|
|
|
|
2018-08-07 13:31:16 +02:00
|
|
|
class _Chunk;
|
Add initial version of C++17 <memory_resource> header
This is missing the synchronized_pool_resource and
unsynchronized_pool_resource classes but is otherwise complete.
This is a new implementation, not based on the existing code in
<experimental/memory_resource>, but memory_resource and
polymorphic_allocator ended up looking almost the same anyway.
The constant_init kluge in src/c++17/memory_resource.cc is apparently
due to Richard Smith and ensures that the objects are constructed during
constant initialiation phase and not destroyed (because the
constant_init destructor doesn't destroy the union member and the
storage is not reused).
* config/abi/pre/gnu.ver: Export new symbols.
* configure: Regenerate.
* include/Makefile.am: Add new <memory_resource> header.
* include/Makefile.in: Regenerate.
* include/precompiled/stdc++.h: Include <memory_resource> for C++17.
* include/std/memory_resource: New header.
(memory_resource, polymorphic_allocator, new_delete_resource)
(null_memory_resource, set_default_resource, get_default_resource)
(pool_options, monotonic_buffer_resource): Define.
* src/Makefile.am: Add c++17 directory.
* src/Makefile.in: Regenerate.
* src/c++11/Makefile.am: Fix comment.
* src/c++17/Makefile.am: Add makefile for new sub-directory.
* src/c++17/Makefile.in: Generate.
* src/c++17/memory_resource.cc: New.
(newdel_res_t, null_res_t, constant_init, newdel_res, null_res)
(default_res, new_delete_resource, null_memory_resource)
(set_default_resource, get_default_resource): Define.
* testsuite/20_util/memory_resource/1.cc: New test.
* testsuite/20_util/memory_resource/2.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/1.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/allocate.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/deallocate.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/release.cc: New test.
* testsuite/20_util/monotonic_buffer_resource/upstream_resource.cc:
New test.
* testsuite/20_util/polymorphic_allocator/1.cc: New test.
* testsuite/20_util/polymorphic_allocator/resource.cc: New test.
* testsuite/20_util/polymorphic_allocator/select.cc: New test.
* testsuite/util/testsuite_allocator.h (__gnu_test::memory_resource):
Define concrete memory resource for testing.
(__gnu_test::default_resource_mgr): Define RAII helper for changing
default resource.
From-SVN: r262953
2018-07-24 23:09:55 +02:00
|
|
|
_Chunk* _M_head = nullptr;
|
|
|
|
};
|
|
|
|
|
|
|
|
} // namespace pmr
|
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
|
|
} // namespace std
|
|
|
|
|
|
|
|
#endif // C++17
|
|
|
|
#endif // _GLIBCXX_MEMORY_RESOURCE
|