diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2005-01-26 16:34:58 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2005-01-26 16:34:58 +0000 |
| commit | b929615a7c328c01cc7ebd7010938f504f6356b3 (patch) | |
| tree | 735d411e5a31df0e5c2c6752a6afe49e32cbc2cb /libstdc++-v3/include/ext/mt_allocator.h | |
| parent | 6f642f985272e36ec5bac248a65e912605727337 (diff) | |
| download | gcc-b929615a7c328c01cc7ebd7010938f504f6356b3.zip gcc-b929615a7c328c01cc7ebd7010938f504f6356b3.tar.gz gcc-b929615a7c328c01cc7ebd7010938f504f6356b3.tar.bz2 | |
mt_allocator.h (struct __per_type_pool_policy<,, [...]): Scale _M_chunk_size too with sizeof(_Tp)...
2005-01-26 Paolo Carlini <pcarlini@suse.de>
* include/ext/mt_allocator.h
(struct __per_type_pool_policy<,, false>::_S_get_pool,
struct __per_type_pool_policy<,, true>::_S_get_pool): Scale
_M_chunk_size too with sizeof(_Tp), otherwise the allocator
breaks down as soon as sizeof(_Tp) >~ _S_chunk_size / 128;
reduce to 64 the multiplier for _M_max_bytes (safer wrt
_Binmap_type being a short); trivial reformattings.
* testsuite/ext/mt_allocator/check_allocate_big_per_type.cc: New.
From-SVN: r94268
Diffstat (limited to 'libstdc++-v3/include/ext/mt_allocator.h')
| -rw-r--r-- | libstdc++-v3/include/ext/mt_allocator.h | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/libstdc++-v3/include/ext/mt_allocator.h b/libstdc++-v3/include/ext/mt_allocator.h index 72fd181..de16563 100644 --- a/libstdc++-v3/include/ext/mt_allocator.h +++ b/libstdc++-v3/include/ext/mt_allocator.h @@ -1,6 +1,6 @@ // MT-optimized allocator -*- C++ -*- -// Copyright (C) 2003, 2004 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005 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 @@ -494,14 +494,25 @@ namespace __gnu_cxx _S_get_pool() { // Sane defaults for the _PoolTp. - const static size_t __align = __alignof__(_Tp) >= sizeof(typename pool_type::_Block_record) ? __alignof__(_Tp) : sizeof(typename pool_type::_Block_record); - static __pool_base::_Tune _S_tune(__align, sizeof(_Tp) * 128, (sizeof(_Tp) * 2) >= __align ? sizeof(_Tp) * 2 : __align, __pool_base::_Tune::_S_chunk_size, __pool_base::_Tune::_S_max_threads, __pool_base::_Tune::_S_freelist_headroom, getenv("GLIBCXX_FORCE_NEW") ? true : false); + typedef typename pool_type::_Block_record _Block_record; + const static size_t __align = (__alignof__(_Tp) >= sizeof(_Block_record) + ? __alignof__(_Tp) + : sizeof(_Block_record)); + + typedef typename __pool_base::_Tune _Tune; + static _Tune _S_tune(__align, sizeof(_Tp) * 64, + sizeof(_Tp) * 2 >= __align ? sizeof(_Tp) * 2 + : __align, + sizeof(_Tp) * _Tune::_S_chunk_size, + _Tune::_S_max_threads, + _Tune::_S_freelist_headroom, + getenv("GLIBCXX_FORCE_NEW") ? true : false); static pool_type _S_pool(_S_tune); return _S_pool; } static void - _S_initialize_once() + _S_initialize_once() { static bool __init; if (__builtin_expect(__init == false, false)) @@ -529,14 +540,25 @@ namespace __gnu_cxx _S_get_pool() { // Sane defaults for the _PoolTp. - const static size_t __align = __alignof__(_Tp) >= sizeof(typename pool_type::_Block_record) ? __alignof__(_Tp) : sizeof(typename pool_type::_Block_record); - static __pool_base::_Tune _S_tune(__align, sizeof(_Tp) * 128, (sizeof(_Tp) * 2) >= __align ? sizeof(_Tp) * 2 : __align, __pool_base::_Tune::_S_chunk_size, __pool_base::_Tune::_S_max_threads, __pool_base::_Tune::_S_freelist_headroom, getenv("GLIBCXX_FORCE_NEW") ? true : false); + typedef typename pool_type::_Block_record _Block_record; + const static size_t __align = (__alignof__(_Tp) >= sizeof(_Block_record) + ? __alignof__(_Tp) + : sizeof(_Block_record)); + + typedef typename __pool_base::_Tune _Tune; + static _Tune _S_tune(__align, sizeof(_Tp) * 64, + sizeof(_Tp) * 2 >= __align ? sizeof(_Tp) * 2 + : __align, + sizeof(_Tp) * _Tune::_S_chunk_size, + _Tune::_S_max_threads, + _Tune::_S_freelist_headroom, + getenv("GLIBCXX_FORCE_NEW") ? true : false); static pool_type _S_pool(_S_tune); return _S_pool; } static void - _S_initialize_once() + _S_initialize_once() { static bool __init; if (__builtin_expect(__init == false, false)) |