From e2792913bd05564861383c3934b9a327703f6db2 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 22 May 2009 01:28:50 +0000 Subject: [PATCH] re PR libstdc++/40094 (FAIL: ext/throw_allocator/deallocate_global.cc execution test) 2009-05-21 Paolo Carlini PR libstdc++/40094 Revert: 2009-05-07 Paolo Carlini * include/ext/throw_allocator.h (throw_allocator_base): Avoid out of line member functions definitions. (throw_allocator_base::_S_g, _S_map, _S_throw_prob, _S_label): Remove, use static locals instead. (throw_allocator_base::do_check_allocated, print_to_string): Declare. * src/throw_allocator.cc: New. * src/Makefile.am: Add. * config/abi/pre/gnu.ver: Add exports. * src/Makefile.in: Regenerate. From-SVN: r147788 --- libstdc++-v3/ChangeLog | 15 ++ libstdc++-v3/config/abi/pre/gnu.ver | 4 - libstdc++-v3/configure | 3 + libstdc++-v3/include/ext/throw_allocator.h | 308 ++++++++++++++++++----------- libstdc++-v3/src/Makefile.am | 1 - libstdc++-v3/src/Makefile.in | 20 +- libstdc++-v3/src/throw_allocator.cc | 95 --------- 7 files changed, 225 insertions(+), 221 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d0d5d66..b52f1a8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,18 @@ +2009-05-21 Paolo Carlini + + PR libstdc++/40094 + Revert: + 2009-05-07 Paolo Carlini + * include/ext/throw_allocator.h (throw_allocator_base): Avoid + out of line member functions definitions. + (throw_allocator_base::_S_g, _S_map, _S_throw_prob, _S_label): + Remove, use static locals instead. + (throw_allocator_base::do_check_allocated, print_to_string): Declare. + * src/throw_allocator.cc: New. + * src/Makefile.am: Add. + * config/abi/pre/gnu.ver: Add exports. + * src/Makefile.in: Regenerate. + 2009-05-20 Benjamin Kosnik * include/tr1_impl/functional (function): Use explicit operator bool. diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index f40fd97..240e7bc 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -964,10 +964,6 @@ GLIBCXX_3.4.12 { _ZSt27__set_once_functor_lock_ptrPSt11unique_lockISt5mutexE; _ZSt16__get_once_mutexv; - # throw_allocator - _ZN9__gnu_cxx20throw_allocator_base18do_check_allocated*; - _ZN9__gnu_cxx20throw_allocator_base15print_to_string*; - } GLIBCXX_3.4.11; # Symbols in the support library (libsupc++) have their own tag. diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index a80bbae..50d8670 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -119026,6 +119026,9 @@ ac_configure_args="${multilib_arg} ${ac_configure_args}" multi_basedir="$multi_basedir" CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ" # The HP-UX ksh and POSIX shell print the target directory to stdout diff --git a/libstdc++-v3/include/ext/throw_allocator.h b/libstdc++-v3/include/ext/throw_allocator.h index 21e235c..a24982f 100644 --- a/libstdc++-v3/include/ext/throw_allocator.h +++ b/libstdc++-v3/include/ext/throw_allocator.h @@ -63,24 +63,13 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) std::tr1::mt19937 _M_generator; public: - twister_rand_gen(unsigned int seed = - static_cast(std::time(0))) - : _M_generator(seed) { } - + twister_rand_gen(unsigned int s = static_cast(std::time(0))); + void - init(unsigned int seed) - { _M_generator.seed(seed); } - + init(unsigned int); + double - get_prob() - { - const double min = _M_generator.min(); - const double res = static_cast(_M_generator() - min); - const double range = static_cast(_M_generator.max() - min); - const double ret = res / range; - _GLIBCXX_DEBUG_ASSERT(ret >= 0 && ret <= 1); - return ret; - } + get_prob(); }; /** @@ -106,40 +95,30 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) { public: void - init(unsigned long seed) - { rand_gen().init(seed); } + init(unsigned long seed); static void - set_throw_prob(double t_p) - { throw_prob() = t_p; } + set_throw_prob(double throw_prob); static double - get_throw_prob() - { return throw_prob(); } + get_throw_prob(); static void - set_label(size_t l) - { label() = l; } - - static size_t - get_label() - { return label(); } + set_label(size_t l); static bool - empty() - { return map().empty(); } + empty(); struct group_throw_prob_adjustor { - group_throw_prob_adjustor(size_t size) - : _M_throw_prob_orig(get_throw_prob()) + group_throw_prob_adjustor(size_t size) : _M_throw_prob_orig(_S_throw_prob) { - set_throw_prob(1 - std::pow(double(1 - get_throw_prob()), - double(0.5 / (size + 1)))); + _S_throw_prob = + 1 - std::pow(double(1 - _S_throw_prob), double(0.5 / (size + 1))); } ~group_throw_prob_adjustor() - { set_throw_prob(_M_throw_prob_orig); } + { _S_throw_prob = _M_throw_prob_orig; } private: const double _M_throw_prob_orig; @@ -147,12 +126,11 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) struct zero_throw_prob_adjustor { - zero_throw_prob_adjustor() - : _M_throw_prob_orig(get_throw_prob()) - { set_throw_prob(0); } + zero_throw_prob_adjustor() : _M_throw_prob_orig(_S_throw_prob) + { _S_throw_prob = 0; } ~zero_throw_prob_adjustor() - { set_throw_prob(_M_throw_prob_orig); } + { _S_throw_prob = _M_throw_prob_orig; } private: const double _M_throw_prob_orig; @@ -160,43 +138,22 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) protected: static void - insert(void* p, size_t size) - { - const_iterator found_it = map().find(p); - if (found_it != map().end()) - { - std::string error("throw_allocator_base::insert double insert!\n"); - print_to_string(error, make_entry(p, size)); - print_to_string(error, *found_it); - std::__throw_logic_error(error.c_str()); - } - map().insert(make_entry(p, size)); - } + insert(void*, size_t); static void - erase(void* p, size_t size) - { - check_allocated(p, size); - map().erase(p); - } + erase(void*, size_t); static void - throw_conditionally() - { - if (rand_gen().get_prob() < get_throw_prob()) - __throw_forced_exception_error(); - } + throw_conditionally(); // See if a particular address and size has been allocated by this // allocator. static void - check_allocated(void* p, size_t size) - { do_check_allocated(map().find(p), map().end(), p, size); } + check_allocated(void*, size_t); // See if a given label has been allocated by this allocator. static void - check_allocated(size_t label) - { do_check_allocated(map().begin(), map().end(), label); } + check_allocated(size_t); private: typedef std::pair alloc_data_type; @@ -209,59 +166,20 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) operator<<(std::ostream&, const throw_allocator_base&); static entry_type - make_entry(void* p, size_t size) - { return std::make_pair(p, alloc_data_type(get_label(), size)); } - - static void - do_check_allocated(const_iterator, const_iterator, void*, size_t); + make_entry(void*, size_t); static void - do_check_allocated(const_iterator, const_iterator, size_t); + print_to_string(std::string&); static void print_to_string(std::string&, const_reference); - static map_type& - map() - { - static map_type mp; - return mp; - } - - static twister_rand_gen& - rand_gen() - { - static twister_rand_gen rg; - return rg; - } - - static double& - throw_prob() - { - static double tp; - return tp; - } - - static size_t& - label() - { - static size_t ll; - return ll; - } + static twister_rand_gen _S_g; + static map_type _S_map; + static double _S_throw_prob; + static size_t _S_label; }; - inline std::ostream& - operator<<(std::ostream& os, const throw_allocator_base&) - { - std::string error; - typedef throw_allocator_base alloc_type; - alloc_type::const_iterator beg = alloc_type::map().begin(); - alloc_type::const_iterator end = alloc_type::map().end(); - for (; beg != end; ++beg) - alloc_type::print_to_string(error, *beg); - return os << error; - } - /** * @brief Allocator class with logging and exception control. * @ingroup allocators @@ -354,6 +272,176 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) operator!=(const throw_allocator&, const throw_allocator&) { return false; } + std::ostream& + operator<<(std::ostream& os, const throw_allocator_base& alloc) + { + std::string error; + throw_allocator_base::print_to_string(error); + os << error; + return os; + } + + // XXX Should be in .cc. + twister_rand_gen:: + twister_rand_gen(unsigned int seed) : _M_generator(seed) { } + + void + twister_rand_gen:: + init(unsigned int seed) + { _M_generator.seed(seed); } + + double + twister_rand_gen:: + get_prob() + { + const double min = _M_generator.min(); + const double res = static_cast(_M_generator() - min); + const double range = static_cast(_M_generator.max() - min); + const double ret = res / range; + _GLIBCXX_DEBUG_ASSERT(ret >= 0 && ret <= 1); + return ret; + } + + twister_rand_gen throw_allocator_base::_S_g; + + throw_allocator_base::map_type + throw_allocator_base::_S_map; + + double throw_allocator_base::_S_throw_prob; + + size_t throw_allocator_base::_S_label = 0; + + throw_allocator_base::entry_type + throw_allocator_base::make_entry(void* p, size_t size) + { return std::make_pair(p, alloc_data_type(_S_label, size)); } + + void + throw_allocator_base::init(unsigned long seed) + { _S_g.init(seed); } + + void + throw_allocator_base::set_throw_prob(double throw_prob) + { _S_throw_prob = throw_prob; } + + double + throw_allocator_base::get_throw_prob() + { return _S_throw_prob; } + + void + throw_allocator_base::set_label(size_t l) + { _S_label = l; } + + void + throw_allocator_base::insert(void* p, size_t size) + { + const_iterator found_it = _S_map.find(p); + if (found_it != _S_map.end()) + { + std::string error("throw_allocator_base::insert"); + error += "double insert!"; + error += '\n'; + print_to_string(error, make_entry(p, size)); + print_to_string(error, *found_it); + std::__throw_logic_error(error.c_str()); + } + _S_map.insert(make_entry(p, size)); + } + + bool + throw_allocator_base::empty() + { return _S_map.empty(); } + + void + throw_allocator_base::erase(void* p, size_t size) + { + check_allocated(p, size); + _S_map.erase(p); + } + + void + throw_allocator_base::check_allocated(void* p, size_t size) + { + const_iterator found_it = _S_map.find(p); + if (found_it == _S_map.end()) + { + std::string error("throw_allocator_base::check_allocated by value "); + error += "null erase!"; + error += '\n'; + print_to_string(error, make_entry(p, size)); + std::__throw_logic_error(error.c_str()); + } + + if (found_it->second.second != size) + { + std::string error("throw_allocator_base::check_allocated by value "); + error += "wrong-size erase!"; + error += '\n'; + print_to_string(error, make_entry(p, size)); + print_to_string(error, *found_it); + std::__throw_logic_error(error.c_str()); + } + } + + void + throw_allocator_base::check_allocated(size_t label) + { + std::string found; + const_iterator it = _S_map.begin(); + while (it != _S_map.end()) + { + if (it->second.first == label) + { + print_to_string(found, *it); + } + ++it; + } + + if (!found.empty()) + { + std::string error("throw_allocator_base::check_allocated by label "); + error += '\n'; + error += found; + std::__throw_logic_error(error.c_str()); + } + } + + void + throw_allocator_base::throw_conditionally() + { + if (_S_g.get_prob() < _S_throw_prob) + __throw_forced_exception_error(); + } + + void + throw_allocator_base::print_to_string(std::string& s) + { + const_iterator begin = throw_allocator_base::_S_map.begin(); + const_iterator end = throw_allocator_base::_S_map.end(); + for (; begin != end; ++begin) + print_to_string(s, *begin); + } + + void + throw_allocator_base::print_to_string(std::string& s, const_reference ref) + { + char buf[40]; + const char tab('\t'); + s += "address: "; + __builtin_sprintf(buf, "%p", ref.first); + s += buf; + s += tab; + s += "label: "; + unsigned long l = static_cast(ref.second.first); + __builtin_sprintf(buf, "%lu", l); + s += buf; + s += tab; + s += "size: "; + l = static_cast(ref.second.second); + __builtin_sprintf(buf, "%lu", l); + s += buf; + s += '\n'; + } + _GLIBCXX_END_NAMESPACE #endif diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 288243a..d218cea 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -182,7 +182,6 @@ sources = \ streambuf-inst.cc \ streambuf.cc \ string-inst.cc \ - throw_allocator.cc \ valarray-inst.cc \ wlocale-inst.cc \ wstring-inst.cc \ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 24187af..9ee5275 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -85,13 +85,12 @@ am__libstdc___la_SOURCES_DIST = atomic.cc bitmap_allocator.cc \ fstream-inst.cc ext-inst.cc ios-inst.cc iostream-inst.cc \ istream-inst.cc istream.cc locale-inst.cc misc-inst.cc \ ostream-inst.cc sstream-inst.cc streambuf-inst.cc streambuf.cc \ - string-inst.cc throw_allocator.cc valarray-inst.cc \ - wlocale-inst.cc wstring-inst.cc mutex.cc condition_variable.cc \ - chrono.cc thread.cc atomicity.cc codecvt_members.cc \ - collate_members.cc ctype_members.cc messages_members.cc \ - monetary_members.cc numeric_members.cc time_members.cc \ - basic_file.cc c++locale.cc compatibility-ldbl.cc \ - parallel_list.cc parallel_settings.cc + string-inst.cc valarray-inst.cc wlocale-inst.cc \ + wstring-inst.cc mutex.cc condition_variable.cc chrono.cc \ + thread.cc atomicity.cc codecvt_members.cc collate_members.cc \ + ctype_members.cc messages_members.cc monetary_members.cc \ + numeric_members.cc time_members.cc basic_file.cc c++locale.cc \ + compatibility-ldbl.cc parallel_list.cc parallel_settings.cc am__objects_1 = atomicity.lo codecvt_members.lo collate_members.lo \ ctype_members.lo messages_members.lo monetary_members.lo \ numeric_members.lo time_members.lo @@ -112,9 +111,9 @@ am__objects_5 = atomic.lo bitmap_allocator.lo pool_allocator.lo \ fstream-inst.lo ext-inst.lo ios-inst.lo iostream-inst.lo \ istream-inst.lo istream.lo locale-inst.lo misc-inst.lo \ ostream-inst.lo sstream-inst.lo streambuf-inst.lo streambuf.lo \ - string-inst.lo throw_allocator.lo valarray-inst.lo \ - wlocale-inst.lo wstring-inst.lo mutex.lo condition_variable.lo \ - chrono.lo thread.lo $(am__objects_1) $(am__objects_4) + string-inst.lo valarray-inst.lo wlocale-inst.lo \ + wstring-inst.lo mutex.lo condition_variable.lo chrono.lo \ + thread.lo $(am__objects_1) $(am__objects_4) am_libstdc___la_OBJECTS = $(am__objects_5) libstdc___la_OBJECTS = $(am_libstdc___la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -435,7 +434,6 @@ sources = \ streambuf-inst.cc \ streambuf.cc \ string-inst.cc \ - throw_allocator.cc \ valarray-inst.cc \ wlocale-inst.cc \ wstring-inst.cc \ diff --git a/libstdc++-v3/src/throw_allocator.cc b/libstdc++-v3/src/throw_allocator.cc index a8247ad..e69de29 100644 --- a/libstdc++-v3/src/throw_allocator.cc +++ b/libstdc++-v3/src/throw_allocator.cc @@ -1,95 +0,0 @@ -// Throw Allocator. Out of line function definitions. -*- C++ -*- - -// Copyright (C) 2009 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 -// . - -#include - -_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) - - void - throw_allocator_base::do_check_allocated(const_iterator found, - const_iterator end, - void* p, size_t size) - { - if (found == end) - { - std::string error("throw_allocator_base::check_allocated by value " - "null erase!\n"); - print_to_string(error, make_entry(p, size)); - std::__throw_logic_error(error.c_str()); - } - - if (found->second.second != size) - { - std::string error("throw_allocator_base::check_allocated by value " - "wrong-size erase!\n"); - print_to_string(error, make_entry(p, size)); - print_to_string(error, *found); - std::__throw_logic_error(error.c_str()); - } - } - - void - throw_allocator_base::do_check_allocated(const_iterator beg, - const_iterator end, - size_t label) - { - std::string found; - while (beg != end) - { - if (beg->second.first == label) - print_to_string(found, *beg); - ++beg; - } - - if (!found.empty()) - { - std::string error("throw_allocator_base::check_allocated by label \n"); - error += found; - std::__throw_logic_error(error.c_str()); - } - } - - void - throw_allocator_base::print_to_string(std::string& s, - const_reference ref) - { - char buf[40]; - const char tab('\t'); - s += "address: "; - __builtin_sprintf(buf, "%p", ref.first); - s += buf; - s += tab; - s += "label: "; - unsigned long l = static_cast(ref.second.first); - __builtin_sprintf(buf, "%lu", l); - s += buf; - s += tab; - s += "size: "; - l = static_cast(ref.second.second); - __builtin_sprintf(buf, "%lu", l); - s += buf; - s += '\n'; - } - -_GLIBCXX_END_NAMESPACE -- 2.7.4