From 95356df84f451cc0ccaad85943158c688c637cce Mon Sep 17 00:00:00 2001 From: paolo Date: Mon, 11 Oct 2004 08:19:35 +0000 Subject: [PATCH] 2004-10-11 Joachim Kuebart Paolo Carlini * src/pool_allocator.cc (__pool_alloc_base::_M_allocate_chunk): Deal properly with exceptions thrown by ::operator new(size_t). * testsuite/ext/pool_allocator/allocate_chunk.cc: New. * include/ext/pool_allocator.h: Include . git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88872 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 9 ++++ libstdc++-v3/include/ext/pool_allocator.h | 1 + libstdc++-v3/src/pool_allocator.cc | 15 +++--- .../testsuite/ext/pool_allocator/allocate_chunk.cc | 63 ++++++++++++++++++++++ 4 files changed, 81 insertions(+), 7 deletions(-) create mode 100644 libstdc++-v3/testsuite/ext/pool_allocator/allocate_chunk.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 22991298a5a..f2c29aab231 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2004-10-11 Joachim Kuebart + Paolo Carlini + + * src/pool_allocator.cc (__pool_alloc_base::_M_allocate_chunk): + Deal properly with exceptions thrown by ::operator new(size_t). + * testsuite/ext/pool_allocator/allocate_chunk.cc: New. + + * include/ext/pool_allocator.h: Include . + 2004-10-10 Benjamin Kosnik * include/bits/functexcept.h: Add guards. diff --git a/libstdc++-v3/include/ext/pool_allocator.h b/libstdc++-v3/include/ext/pool_allocator.h index a744ea39b77..0f087a03c1e 100644 --- a/libstdc++-v3/include/ext/pool_allocator.h +++ b/libstdc++-v3/include/ext/pool_allocator.h @@ -48,6 +48,7 @@ #define _POOL_ALLOCATOR_H 1 #include +#include #include #include #include diff --git a/libstdc++-v3/src/pool_allocator.cc b/libstdc++-v3/src/pool_allocator.cc index 8c7fc29058b..731cfffa0ea 100644 --- a/libstdc++-v3/src/pool_allocator.cc +++ b/libstdc++-v3/src/pool_allocator.cc @@ -90,8 +90,11 @@ namespace __gnu_cxx size_t __bytes_to_get = (2 * __total_bytes + _M_round_up(_S_heap_size >> 4)); - _S_start_free = static_cast(::operator new(__bytes_to_get)); - if (_S_start_free == 0) + try + { + _S_start_free = static_cast(::operator new(__bytes_to_get)); + } + catch (...) { // Try to make do with what we have. That can't hurt. We // do not try smaller requests, since that tends to result @@ -111,11 +114,9 @@ namespace __gnu_cxx // right free list. } } - _S_end_free = 0; // In case of exception. - - // This should either throw an exception or remedy the situation. - // Thus we assume it succeeded. - _S_start_free = static_cast(::operator new(__bytes_to_get)); + // What we have wasn't enough. Rethrow. + _S_start_free = _S_end_free = 0; // We have no chunk. + __throw_exception_again; } _S_heap_size += __bytes_to_get; _S_end_free = _S_start_free + __bytes_to_get; diff --git a/libstdc++-v3/testsuite/ext/pool_allocator/allocate_chunk.cc b/libstdc++-v3/testsuite/ext/pool_allocator/allocate_chunk.cc new file mode 100644 index 00000000000..ab436212688 --- /dev/null +++ b/libstdc++-v3/testsuite/ext/pool_allocator/allocate_chunk.cc @@ -0,0 +1,63 @@ +// 2004-10-10 Paolo Carlini + +// Copyright (C) 2004 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 2, 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. +// +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 20.4.1.1 allocator members + +#include + +struct small +{ + char c[16]; +}; + +struct big +{ + char c[64]; +}; + +void* +operator new(size_t n) throw(std::bad_alloc) +{ + static bool first = true; + if (!first) + throw std::bad_alloc(); + first = false; + return std::malloc(n); +} + +// http://gcc.gnu.org/ml/libstdc++/2004-10/msg00098.html +void test01() +{ + using __gnu_cxx::__pool_alloc; + + __pool_alloc alloc_big; + alloc_big.allocate(1); + + // The constant 20 comes from __pool_alloc_base::_M_refill. See + // also __pool_alloc_base::_M_allocate_chunk. + __pool_alloc alloc_small; + for (int i = 0; i < 20 * sizeof(big) / sizeof(small) + 1; ++i) + alloc_small.allocate(1); +} + +int main() +{ + test01(); +} -- 2.11.0