+2004-10-20 Paolo Carlini <pcarlini@suse.de>
+
+ * include/ext/bitmap_allocator.h (allocate): Throw std::bad_alloc
+ when n > max_size().
+ * include/ext/malloc_allocator.h (allocate): Likewise.
+ * include/ext/mt_allocator.h (allocate): Likewise.
+ * include/ext/new_allocator.h (allocate): Likewise.
+ * include/ext/array_allocator.h: Use __throw_bad_alloc().
+ * include/ext/pool_allocator.h: Use __builtin_expect.
+ * testsuite/ext/array_allocator/check_allocate_max_size.cc: New.
+ * testsuite/ext/bitmap_allocator/check_allocate_max_size.cc: Likewise.
+ * testsuite/ext/malloc_allocator/check_allocate_max_size.cc: Likewise.
+ * testsuite/ext/mt_allocator/check_allocate_max_size.cc: Likewise.
+ * testsuite/ext/new_allocator/check_allocate_max_size.cc: Likewise.
+ * testsuite/ext/pool_allocator/check_allocate_max_size.cc: Likewise.
+ * testsuite/testsuite_allocator.h (check_allocate_max_size): New test.
+
2004-10-19 Paolo Carlini <pcarlini@suse.de>
* testsuite/performance/20_util/allocator/list_sort_search.cc:
#include <cstddef>
#include <new>
+#include <bits/functexcept.h>
#include <tr1/array>
namespace __gnu_cxx
{
static size_type __used;
if (__builtin_expect(__used + __n > array_type::_S_index, false))
- throw std::bad_alloc();
+ std::__throw_bad_alloc();
pointer __ret = _M_array->begin() + __used;
__used += __n;
return __ret;
// For std::size_t, and ptrdiff_t.
#include <cstddef>
+// For __throw_bad_alloc().
+#include <bits/functexcept.h>
+
// For std::pair.
#include <utility>
pointer
allocate(size_type __n)
{
+ if (__builtin_expect(__n > this->max_size(), false))
+ std::__throw_bad_alloc();
+
if (__builtin_expect(__n == 1, true))
return this->_M_allocate_single_object();
else
size_type
max_size() const throw()
- { return (size_type()-1)/sizeof(value_type); }
+ { return size_type(-1) / sizeof(value_type); }
void
construct(pointer __p, const_reference __data)
#define _MALLOC_ALLOCATOR_H 1
#include <new>
+#include <bits/functexcept.h>
namespace __gnu_cxx
{
pointer
allocate(size_type __n, const void* = 0)
{
+ if (__builtin_expect(__n > this->max_size(), false))
+ std::__throw_bad_alloc();
+
pointer __ret = static_cast<_Tp*>(malloc(__n * sizeof(_Tp)));
if (!__ret)
- throw std::bad_alloc();
+ std::__throw_bad_alloc();
return __ret;
}
{
this->_S_initialize_once();
+ if (__builtin_expect(__n > this->max_size(), false))
+ std::__throw_bad_alloc();
+
// Requests larger than _M_max_bytes are handled by operator
// new/delete directly.
__pool_type& __pool = this->_S_get_pool();
void* __ret = ::operator new(__bytes);
return static_cast<_Tp*>(__ret);
}
-
+
// Round up to power of 2 and figure out which bin to use.
const size_t __which = __pool._M_get_binmap(__bytes);
const size_t __thread_id = __pool._M_get_thread_id();
#define _NEW_ALLOCATOR_H 1
#include <new>
+#include <bits/functexcept.h>
namespace __gnu_cxx
{
// about what the return value is when __n == 0.
pointer
allocate(size_type __n, const void* = 0)
- { return static_cast<_Tp*>(::operator new(__n * sizeof(_Tp))); }
+ {
+ if (__builtin_expect(__n > this->max_size(), false))
+ std::__throw_bad_alloc();
+
+ return static_cast<_Tp*>(::operator new(__n * sizeof(_Tp)));
+ }
// __p is not permitted to be a null pointer.
void
__pool_alloc<_Tp>::allocate(size_type __n, const void*)
{
pointer __ret = 0;
- if (__n)
+ if (__builtin_expect(__n != 0, true))
{
- if (__n <= max_size())
+ if (__builtin_expect(__n > this->max_size(), false))
+ std::__throw_bad_alloc();
+
+ // If there is a race through here, assume answer from getenv
+ // will resolve in same direction. Inspired by techniques
+ // to efficiently support threading found in basic_string.h.
+ if (_S_force_new == 0)
{
- // If there is a race through here, assume answer from getenv
- // will resolve in same direction. Inspired by techniques
- // to efficiently support threading found in basic_string.h.
- if (_S_force_new == 0)
- {
- if (getenv("GLIBCXX_FORCE_NEW"))
- __atomic_add(&_S_force_new, 1);
- else
- __atomic_add(&_S_force_new, -1);
- }
+ if (getenv("GLIBCXX_FORCE_NEW"))
+ __atomic_add(&_S_force_new, 1);
+ else
+ __atomic_add(&_S_force_new, -1);
+ }
- const size_t __bytes = __n * sizeof(_Tp);
- if (__bytes > size_t(_S_max_bytes) || _S_force_new == 1)
- __ret = static_cast<_Tp*>(::operator new(__bytes));
+ const size_t __bytes = __n * sizeof(_Tp);
+ if (__bytes > size_t(_S_max_bytes) || _S_force_new == 1)
+ __ret = static_cast<_Tp*>(::operator new(__bytes));
+ else
+ {
+ _Obj* volatile* __free_list = _M_get_free_list(__bytes);
+
+ lock sentry(_M_get_mutex());
+ _Obj* __restrict__ __result = *__free_list;
+ if (__builtin_expect(__result == 0, 0))
+ __ret = static_cast<_Tp*>(_M_refill(_M_round_up(__bytes)));
else
{
- _Obj* volatile* __free_list = _M_get_free_list(__bytes);
-
- lock sentry(_M_get_mutex());
- _Obj* __restrict__ __result = *__free_list;
- if (__builtin_expect(__result == 0, 0))
- __ret = static_cast<_Tp*>(_M_refill(_M_round_up(__bytes)));
- else
- {
- *__free_list = __result->_M_free_list_link;
- __ret = reinterpret_cast<_Tp*>(__result);
- }
- if (__builtin_expect(__ret == 0, 0))
- std::__throw_bad_alloc();
+ *__free_list = __result->_M_free_list_link;
+ __ret = reinterpret_cast<_Tp*>(__result);
}
+ if (__builtin_expect(__ret == 0, 0))
+ std::__throw_bad_alloc();
}
- else
- std::__throw_bad_alloc();
}
return __ret;
}
void
__pool_alloc<_Tp>::deallocate(pointer __p, size_type __n)
{
- if (__n && (__p != 0))
+ if (__builtin_expect(__n != 0 && __p != 0, true))
{
const size_t __bytes = __n * sizeof(_Tp);
if (__bytes > static_cast<size_t>(_S_max_bytes) || _S_force_new == 1)
--- /dev/null
+//
+// 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 <ext/array_allocator.h>
+#include <testsuite_allocator.h>
+
+int main()
+{
+ typedef int value_type;
+ typedef __gnu_cxx::array_allocator<value_type> allocator_type;
+ __gnu_test::check_allocate_max_size<allocator_type>();
+ return 0;
+}
--- /dev/null
+//
+// 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 <ext/bitmap_allocator.h>
+#include <testsuite_allocator.h>
+
+int main()
+{
+ typedef int value_type;
+ typedef __gnu_cxx::bitmap_allocator<value_type> allocator_type;
+ __gnu_test::check_allocate_max_size<allocator_type>();
+ return 0;
+}
--- /dev/null
+//
+// 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 <ext/malloc_allocator.h>
+#include <testsuite_allocator.h>
+
+int main()
+{
+ typedef int value_type;
+ typedef __gnu_cxx::malloc_allocator<value_type> allocator_type;
+ __gnu_test::check_allocate_max_size<allocator_type>();
+ return 0;
+}
--- /dev/null
+//
+// 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 <ext/mt_allocator.h>
+#include <testsuite_allocator.h>
+
+int main()
+{
+ typedef int value_type;
+ typedef __gnu_cxx::__mt_alloc<value_type> allocator_type;
+ __gnu_test::check_allocate_max_size<allocator_type>();
+ return 0;
+}
--- /dev/null
+//
+// 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 <ext/new_allocator.h>
+#include <testsuite_allocator.h>
+
+int main()
+{
+ typedef int value_type;
+ typedef __gnu_cxx::new_allocator<value_type> allocator_type;
+ __gnu_test::check_allocate_max_size<allocator_type>();
+ return 0;
+}
--- /dev/null
+//
+// 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 <ext/pool_allocator.h>
+#include <testsuite_allocator.h>
+
+int main()
+{
+ typedef int value_type;
+ typedef __gnu_cxx::__pool_alloc<value_type> allocator_type;
+ __gnu_test::check_allocate_max_size<allocator_type>();
+ return 0;
+}
#define _GLIBCXX_TESTSUITE_ALLOCATOR_H
#include <cstddef>
+#include <cstdlib>
#include <limits>
namespace
a.deallocate(NULL, 1);
a.deallocate(NULL, 10);
}
+
+ template<typename Alloc>
+ bool
+ check_allocate_max_size()
+ {
+ Alloc a;
+ try
+ {
+ a.allocate(a.max_size() + 1);
+ }
+ catch(std::bad_alloc&)
+ {
+ return true;
+ }
+ catch(...)
+ {
+ throw;
+ }
+ throw;
+ }
+
}; // namespace __gnu_test
#endif // _GLIBCXX_TESTSUITE_ALLOCATOR_H
-
projects / thirdparty / gcc.git / commitdiff
