8fc810787b
2010-06-03 Paolo Carlini <paolo.carlini@oracle.com> * include/bits/c++config (std::size_t, std::ptrdiff_t, std::nullptr_t): Provide typedefs. * include/c_std/cstddef: Don't provide std::size_t and std::ptrdiff_t here. * include/c_global/cstddef: Likewise. * src/condition_variable.cc: Don't include <cstddef>, don't use NULL, use std::size_t and std::ptrdiff_t. * src/mt_allocator.cc: Likewise. * src/localename.cc: Likewise. * src/chrono.cc: Likewise. * src/thread.cc: Likewise. * include/debug/formatter.h: Likewise. * include/debug/functions.h: Likewise. * include/std/valarray: Likewise. * include/std/thread: Likewise. * include/std/type_traits: Likewise. * include/std/atomic: Likewise. * include/std/iterator: Likewise. * include/std/bitset: Likewise. * include/std/fstream: Likewise. * include/std/mutex: Likewise. * include/c_std/cstdlib: Likewise. * include/c_std/cstdio: Likewise. * include/c_std/ctime: Likewise. * include/c_std/cwchar: Likewise. * include/c_std/cstring: Likewise. * include/parallel/multiway_merge.h: Likewise. * include/parallel/multiseq_selection.h: Likewise. * include/parallel/base.h: Likewise. * include/parallel/basic_iterator.h: Likewise. * include/parallel/multiway_mergesort.h * include/parallel/partition.h: Likewise. * include/ext/string_conversions.h: Likewise. * include/ext/pb_ds/assoc_container.hpp: Likewise. * include/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp: Likewise. * include/ext/pb_ds/detail/resize_policy/ hash_prime_size_policy_imp.hpp: Likewise. * include/ext/pb_ds/detail/resize_policy/ sample_resize_policy.hpp: Likewise. * include/ext/pb_ds/detail/resize_policy/ sample_resize_trigger.hpp: Likewise. * include/ext/pb_ds/detail/binomial_heap_base_/ erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/binomial_heap_base_/ find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/binomial_heap_base_/ insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/binomial_heap_base_/ constructors_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/binomial_heap_base_/ debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/binomial_heap_base_/ split_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ erase_store_hash_fn_imps.hpp: Likewise. * include/ext/pb_ds/d: Likewise.etail/cc_hash_table_map_/ insert_no_store_hash_fn_imps.hpp * include/ext/pb_ds/detail/cc_hash_table_map_/ cmp_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ insert_store_hash_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ info_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ entry_list_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ trace_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ cc_ht_map_.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ resize_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ constructor_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/cc_hash_table_map_/ erase_no_store_hash_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/unordered_iterator/ iterator.hpp: Likewise. * include/ext/pb_ds/detail/unordered_iterator/ const_iterator.hpp: Likewise. * include/ext/pb_ds/detail/unordered_iterator/ point_iterator.hpp: Likewise. * include/ext/pb_ds/detail/unordered_iterator/ const_point_iterator.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/child_iterator.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/ insert_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/ constructors_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/ const_child_iterator.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/node_iterators.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/internal_node.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/point_iterators.hpp: Likewise. * include/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ r_erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ constructors_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ rotate_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ node_iterators.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ point_iterators.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ split_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/bin_search_tree_/ iterators_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/gp_hash_table_map_/ find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/gp_hash_table_map_/ gp_ht_map_.hpp: Likewise. * include/ext/pb_ds/detail/gp_hash_table_map_/ resize_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/gp_hash_table_map_/ standard_policies.hpp: Likewise. * include/ext/pb_ds/detail/tree_policy/ sample_tree_node_update.hpp: Likewise. * include/ext/pb_ds/detail/basic_tree_policy/ null_node_metadata.hpp: Likewise. * include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp: Likewise. * include/ext/pb_ds/detail/binary_heap_/ const_point_iterator.hpp: Likewise. * include/ext/pb_ds/detail/binary_heap_/ split_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/trie_policy/ sample_trie_node_update.hpp: Likewise. * include/ext/pb_ds/detail/trie_policy/ sample_trie_e_access_traits.hpp: Likewise. * include/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/pairing_heap_/ split_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_policy/ counter_lu_metadata.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ trace_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ null_metadata.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ const_iterator.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ constructors_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ iterators_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ const_point_iterator.hpp: Likewise. * include/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/thin_heap_/ constructors_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/thin_heap_/ split_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/ov_tree_map_/ constructors_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp: Likewise. * include/ext/pb_ds/detail/ov_tree_map_/ iterators_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp: Likewise. * include/ext/pb_ds/detail/hash_fn/ sample_ranged_probe_fn.hpp: Likewise. * include/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp: Likewise. * include/ext/pb_ds/detail/hash_fn/ sample_ranged_hash_fn.hpp: Likewise. * include/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/splay_tree_/ split_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/ trace_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/ erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/ find_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/lu_map_.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/ constructor_destructor_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/ insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/ info_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/list_update_map_/ iterators_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rc_binomial_heap_/ erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rc_binomial_heap_/ insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rc_binomial_heap_/ debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rb_tree_map_/ split_join_fn_imps.hpp: Likewise. * include/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp: Likewise. * include/ext/pb_ds/list_update_policy.hpp: Likewise. * include/ext/pb_ds/exception.hpp: Likewise. * include/ext/pb_ds/tree_policy.hpp: Likewise. * include/ext/pb_ds/tag_and_trait.hpp: Likewise. * include/ext/pb_ds/hash_policy.hpp: Likewise. * include/ext/pb_ds/trie_policy.hpp: Likewise. * include/ext/pb_ds/priority_queue.hpp: Likewise. * include/ext/throw_allocator.h: Likewis: Likewise.e. * include/ext/bitmap_allocator.h * include/ext/rc_string_base.h: Likewise. * include/ext/new_allocator.h: Likewise. * include/ext/codecvt_specializations.h: Likewise. * include/ext/functional: Likewise.: Likewise. * include/ext/array_allocator.h: Likewise. * include/ext/mt_allocator.h: Likewise. * include/ext/sso_string_base.h: Likewise. * include/profile/impl/profiler_trace.h: Likewise. * include/profile/impl/profiler_node.h: Likewise. * include/bits/stl_algobase.h: Likewise. * include/bits/functional_hash.h: Likewise. * include/bits/locale_facets.tcc: Likewise. * include/bits/locale_facets.h: Likewise. * include/bits/stl_iterator_base_types.h: Likewise. * include/bits/move.h: Likewise. * include/bits/boost_concept_check.h: Likewise. * include/bits/basic_string.tcc: Likewise. * include/bits/locale_facets_nonio.tcc: Likewise. * include/bits/fstream.tcc: Likewise. * include/bits/locale_facets_nonio.h: Likewise. * include/c_global/cstdlib: Likewise. * include/c_global/cstdio: Likewise. * include/c_global/ctime: Likewise. * include/c_global/cwchar: Likewise. * include/c_global/cstring * include/tr1/type_traits: Likewise. * include/backward/hash_fun.h: Likewise. * libsupc++/new: Likewise. * libsupc++/initializer_list: Likewise. * testsuite/27_io/basic_ofstream/pthread2.cc: Likewise. * testsuite/27_io/basic_iostream/cons/2020.cc: Likewise. * testsuite/27_io/basic_streambuf/sgetn/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_streambuf/sgetn/char/1.cc: Likewise. * testsuite/27_io/basic_streambuf/overflow/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_streambuf/overflow/char/1.cc: Likewise. * testsuite/27_io/basic_streambuf/sgetc/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_streambuf/sgetc/char/1.cc: Likewise. * testsuite/27_io/basic_streambuf/sputn/wchar_t/1057.cc: Likewise. * testsuite/27_io/basic_streambuf/sputn/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_streambuf/sputn/char/1057.cc: Likewise. * testsuite/27_io/basic_streambuf/sputn/char/1.cc: Likewise. * testsuite/27_io/basic_streambuf/sputc/wchar_t/1057.cc: Likewise. * testsuite/27_io/basic_streambuf/sputc/char/1057.cc: Likewise. * testsuite/27_io/objects/wchar_t/5268.cc: Likewise. * testsuite/27_io/objects/char/9661-1.cc: Likewise. * testsuite/27_io/objects/char/5268.cc: Likewise. * testsuite/27_io/objects/char/10.cc: Likewise. * testsuite/27_io/basic_ios/copyfmt/char/1.cc: Likewise. * testsuite/27_io/basic_ios/copyfmt/char/2.cc: Likewise. * testsuite/27_io/basic_ios/exceptions/char/1.cc: Likewise. * testsuite/27_io/basic_ios/locales/char/1.cc: Likewise. * testsuite/27_io/basic_ios/clear/char/1.cc: Likewise. * testsuite/27_io/basic_ostringstream/pthread3.cc: Likewise. * testsuite/27_io/basic_stringbuf/sputc/wchar_t/1057.cc: Likewise. * testsuite/27_io/basic_stringbuf/sputc/char/1057.cc: Likewise. * testsuite/27_io/basic_stringbuf/sputn/wchar_t/1057.cc: Likewise. * testsuite/27_io/basic_stringbuf/sputn/char/1057.cc: Likewise. * testsuite/27_io/basic_istream/get/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_istream/get/char/1.cc: Likewise. * testsuite/27_io/basic_istream/ignore/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_istream/ignore/char/1.cc: Likewise. * testsuite/27_io/basic_istream/peek/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_istream/peek/char/1.cc: Likewise. * testsuite/27_io/basic_istream/getline/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_istream/getline/char/1.cc: Likewise. * testsuite/27_io/basic_istream/extractors_other/wchar_t/ exceptions_null.cc * testsuite/27_io/basic_istream/extractors_other/wchar_t/ 1.cc: Likewise. * testsuite/27_io/basic_istream/extractors_other/char/ exceptions_null.cc: Likewise. * testsuite/27_io/basic_istream/extractors_other/char/1.cc: Likewise. * testsuite/27_io/basic_istream/cons/3.cc: Likewise. * testsuite/27_io/basic_istream/extractors_arithmetic/ wchar_t/01.cc: Likewise. * testsuite/27_io/basic_istream/extractors_arithmetic/ char/01.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/ wchar_t/1.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/ wchar_t/2.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/ wchar_t/3.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/ char/1.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/ char/2.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/ char/3.cc: Likewise. * testsuite/27_io/basic_istream/extractors_character/ char/9826.cc: Likewise. * testsuite/27_io/basic_istream/read/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_istream/read/char/1.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_other/wchar_t/ exceptions_null.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_other/wchar_t/ 1.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_other/char/ exceptions_null.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_other/char/1.cc: Likewise. * testsuite/27_io/basic_ostream/cons/2020.cc: Likewise. * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_character/ wchar_t/8.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_character/ char/8.cc: Likewise. * testsuite/27_io/basic_filebuf/setbuf/char/1.cc: Likewise. * testsuite/27_io/basic_filebuf/sputc/char/1057.cc: Likewise. * testsuite/27_io/basic_filebuf/open/char/1.cc: Likewise. * testsuite/27_io/basic_filebuf/open/char/2.cc: Likewise. * testsuite/27_io/basic_filebuf/open/char/9507.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc: Likewise. * testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc: Likewise. * testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc: Likewise. * testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc: Likewise. * testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc: Likewise. * testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc: Likewise. * testsuite/27_io/basic_filebuf/close/char/9964.cc: Likewise. * testsuite/27_io/basic_filebuf/close/char/1.cc: Likewise. * testsuite/27_io/basic_filebuf/close/char/2.cc: Likewise. * testsuite/27_io/basic_filebuf/close/char/12790-3.cc: Likewise. * testsuite/27_io/basic_filebuf/sputn/char/1057.cc: Likewise. * testsuite/24_iterators/ostreambuf_iterator/2.cc: Likewise. * testsuite/18_support/bad_exception/23591_thread-1.c * testsuite/18_support/new_delete_placement.cc: Likewise. * testsuite/18_support/pthread_guard.cc: Likewise. * testsuite/21_strings/basic_string/operations/wchar_t/1.cc: Likewise. * testsuite/21_strings/basic_string/operations/char/1.cc: Likewise. * testsuite/21_strings/basic_string/pthread4.cc: Likewise. * testsuite/21_strings/basic_string/cons/wchar_t/5.cc: Likewise. * testsuite/21_strings/basic_string/cons/char/5.cc: Likewise. * testsuite/30_threads/timed_mutex/cons/assign_neg.cc: Likewise. * testsuite/30_threads/timed_mutex/cons/copy_neg.cc: Likewise. * testsuite/30_threads/recursive_mutex/cons/assign_neg.cc: Likewise. * testsuite/30_threads/recursive_mutex/cons/copy_neg.cc: Likewise. * testsuite/30_threads/mutex/cons/assign_neg.cc: Likewise. * testsuite/30_threads/mutex/cons/copy_neg.cc: Likewise. * testsuite/30_threads/thread/cons/assign_neg.cc: Likewise. * testsuite/30_threads/thread/cons/copy_neg.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/cons/ assign_neg.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/cons/ copy_neg.cc: Likewise. * testsuite/ext/mt_allocator/22309_thread.cc: Likewise. * testsuite/ext/slist/23781.cc: Likewise. * testsuite/ext/rope/pthread7-rope.cc: Likewise. * testsuite/ext/stdio_filebuf/char/10063-2.cc: Likewise. * testsuite/22_locale/ctype/is/wchar_t/1.cc: Likewise. * testsuite/22_locale/ctype/is/char/1.cc: Likewise. * testsuite/22_locale/time_put/put/char/12439_1.cc: Likewise. * testsuite/22_locale/time_put/put/char/12439_3.cc: Likewise. * testsuite/22_locale/locale/cons/2.cc: Likewise. * testsuite/22_locale/locale/cons/12658_thread-1.cc: Likewise. * testsuite/22_locale/locale/cons/29217.cc: Likewise. * testsuite/22_locale/locale/global_locale_objects/14071.cc: Likewise. * testsuite/22_locale/locale/global_locale_objects/2.cc: Likewise. * testsuite/tr1/6_containers/unordered_multimap/ requirements/iterator_null_neg.cc: Likewise. * testsuite/tr1/6_containers/unordered_multiset/ requirements/iterator_null_neg.cc: Likewise. * testsuite/29_atomics/atomic_address/cons/single_value.cc: Likewise. * testsuite/29_atomics/atomic_address/cons/aggregate.cc: Likewise. * testsuite/23_containers/multimap/23781.cc: Likewise. * testsuite/23_containers/set/23781.cc: Likewise. * testsuite/23_containers/multiset/23781.cc: Likewise. * testsuite/23_containers/list/pthread1.cc: Likewise. * testsuite/23_containers/list/23781.cc: Likewise. * testsuite/23_containers/map/pthread6.cc: Likewise. * testsuite/23_containers/map/23781.cc: Likewise. * testsuite/util/regression/rand/priority_queue/ rand_regression_test.hpp: Likewise. * testsuite/util/regression/rand/priority_queue/ container_rand_regression_test.tcc: Likewise. * testsuite/util/regression/rand/assoc/ rand_regression_test.hpp: Likewise. * testsuite/util/regression/rand/assoc/ container_rand_regression_test.tcc: Likewise. * testsuite/util/testsuite_hooks.cc: Likewise. * testsuite/util/testsuite_io.h: Likewise. * testsuite/util/testsuite_iterators.h: Likewise. * testsuite/util/replacement_memory_operators.h: Likewise. * testsuite/util/testsuite_allocator.h: Likewise. * testsuite/util/testsuite_performance.h: Likewise. From-SVN: r160231
486 lines
12 KiB
C++
486 lines
12 KiB
C++
// -*- C++ -*-
|
|
// Testing performance utilities for the C++ library testsuite.
|
|
//
|
|
// Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010
|
|
// 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.
|
|
//
|
|
// You should have received a copy of the GNU General Public License along
|
|
// with this library; see the file COPYING3. If not see
|
|
// <http://www.gnu.org/licenses/>.
|
|
//
|
|
|
|
#ifndef _GLIBCXX_PERFORMANCE_H
|
|
#define _GLIBCXX_PERFORMANCE_H
|
|
|
|
#include <sys/times.h>
|
|
#include <sys/resource.h>
|
|
#include <cstdlib>
|
|
#include <cstring>
|
|
#include <string>
|
|
#include <fstream>
|
|
#include <iomanip>
|
|
#include <typeinfo>
|
|
#include <stdexcept>
|
|
#include <sstream>
|
|
#include <cxxabi.h>
|
|
#include <testsuite_common_types.h>
|
|
|
|
#ifdef __linux__
|
|
#include <malloc.h>
|
|
#elif defined (__FreeBSD__)
|
|
extern "C"
|
|
{
|
|
struct mallinfo
|
|
{
|
|
int uordblks;
|
|
int hblkhd;
|
|
};
|
|
|
|
struct mallinfo
|
|
mallinfo(void)
|
|
{
|
|
struct mallinfo m = { (((std::size_t) sbrk (0) + 1023) / 1024), 0 };
|
|
return m;
|
|
}
|
|
}
|
|
#elif !defined (__hpux__)
|
|
extern "C"
|
|
{
|
|
struct mallinfo
|
|
{
|
|
int uordblks;
|
|
int hblkhd;
|
|
};
|
|
|
|
struct mallinfo empty = { 0, 0 };
|
|
|
|
struct mallinfo
|
|
mallinfo(void)
|
|
{ return empty; }
|
|
}
|
|
#endif
|
|
|
|
namespace __gnu_test
|
|
{
|
|
class time_counter
|
|
{
|
|
private:
|
|
clock_t elapsed_begin;
|
|
clock_t elapsed_end;
|
|
tms tms_begin;
|
|
tms tms_end;
|
|
|
|
public:
|
|
explicit
|
|
time_counter() : elapsed_begin(), elapsed_end(), tms_begin(), tms_end()
|
|
{ }
|
|
|
|
void
|
|
clear() throw()
|
|
{
|
|
elapsed_begin = clock_t();
|
|
elapsed_end = clock_t();
|
|
tms_begin = tms();
|
|
tms_end = tms();
|
|
}
|
|
|
|
void
|
|
start()
|
|
{
|
|
this->clear();
|
|
elapsed_begin = times(&tms_begin);
|
|
const clock_t err = clock_t(-1);
|
|
if (elapsed_begin == err)
|
|
std::__throw_runtime_error("time_counter::start");
|
|
}
|
|
|
|
void
|
|
stop()
|
|
{
|
|
elapsed_end = times(&tms_end);
|
|
const clock_t err = clock_t(-1);
|
|
if (elapsed_end == err)
|
|
std::__throw_runtime_error("time_counter::stop");
|
|
}
|
|
|
|
std::size_t
|
|
real_time() const
|
|
{ return elapsed_end - elapsed_begin; }
|
|
|
|
std::size_t
|
|
user_time() const
|
|
{ return tms_end.tms_utime - tms_begin.tms_utime; }
|
|
|
|
std::size_t
|
|
system_time() const
|
|
{ return tms_end.tms_stime - tms_begin.tms_stime; }
|
|
};
|
|
|
|
class resource_counter
|
|
{
|
|
int who;
|
|
rusage rusage_begin;
|
|
rusage rusage_end;
|
|
struct mallinfo allocation_begin;
|
|
struct mallinfo allocation_end;
|
|
|
|
public:
|
|
resource_counter(int i = RUSAGE_SELF) : who(i)
|
|
{ this->clear(); }
|
|
|
|
void
|
|
clear() throw()
|
|
{
|
|
memset(&rusage_begin, 0, sizeof(rusage_begin));
|
|
memset(&rusage_end, 0, sizeof(rusage_end));
|
|
memset(&allocation_begin, 0, sizeof(allocation_begin));
|
|
memset(&allocation_end, 0, sizeof(allocation_end));
|
|
}
|
|
|
|
void
|
|
start()
|
|
{
|
|
if (getrusage(who, &rusage_begin) != 0 )
|
|
memset(&rusage_begin, 0, sizeof(rusage_begin));
|
|
malloc(0); // Needed for some implementations.
|
|
allocation_begin = mallinfo();
|
|
}
|
|
|
|
void
|
|
stop()
|
|
{
|
|
if (getrusage(who, &rusage_end) != 0 )
|
|
memset(&rusage_end, 0, sizeof(rusage_end));
|
|
allocation_end = mallinfo();
|
|
}
|
|
|
|
int
|
|
allocated_memory() const
|
|
{ return ((allocation_end.uordblks - allocation_begin.uordblks)
|
|
+ (allocation_end.hblkhd - allocation_begin.hblkhd)); }
|
|
|
|
long
|
|
hard_page_fault() const
|
|
{ return rusage_end.ru_majflt - rusage_begin.ru_majflt; }
|
|
|
|
long
|
|
swapped() const
|
|
{ return rusage_end.ru_nswap - rusage_begin.ru_nswap; }
|
|
};
|
|
|
|
inline void
|
|
start_counters(time_counter& t, resource_counter& r)
|
|
{
|
|
t.start();
|
|
r.start();
|
|
}
|
|
|
|
inline void
|
|
stop_counters(time_counter& t, resource_counter& r)
|
|
{
|
|
t.stop();
|
|
r.stop();
|
|
}
|
|
|
|
inline void
|
|
clear_counters(time_counter& t, resource_counter& r)
|
|
{
|
|
t.clear();
|
|
r.clear();
|
|
}
|
|
|
|
void
|
|
report_performance(const std::string file, const std::string comment,
|
|
const time_counter& t, const resource_counter& r)
|
|
{
|
|
const char space = ' ';
|
|
const char tab = '\t';
|
|
const char* name = "libstdc++-performance.sum";
|
|
std::string::const_iterator i = file.begin() + file.find_last_of('/') + 1;
|
|
std::string testname(i, file.end());
|
|
|
|
std::ofstream out(name, std::ios_base::app);
|
|
|
|
#ifdef __GTHREADS
|
|
if (__gthread_active_p())
|
|
testname.append("-thread");
|
|
#endif
|
|
|
|
out.setf(std::ios_base::left);
|
|
out << std::setw(25) << testname << tab;
|
|
out << std::setw(25) << comment << tab;
|
|
|
|
out.setf(std::ios_base::right);
|
|
out << std::setw(4) << t.real_time() << "r" << space;
|
|
out << std::setw(4) << t.user_time() << "u" << space;
|
|
out << std::setw(4) << t.system_time() << "s" << space;
|
|
out << std::setw(8) << r.allocated_memory() << "mem" << space;
|
|
out << std::setw(4) << r.hard_page_fault() << "pf" << space;
|
|
|
|
out << std::endl;
|
|
out.close();
|
|
}
|
|
|
|
void
|
|
report_header(const std::string file, const std::string header)
|
|
{
|
|
const char space = ' ';
|
|
const char tab = '\t';
|
|
const char* name = "libstdc++-performance.sum";
|
|
std::string::const_iterator i = file.begin() + file.find_last_of('/') + 1;
|
|
std::string testname(i, file.end());
|
|
|
|
std::ofstream out(name, std::ios_base::app);
|
|
|
|
#ifdef __GTHREADS
|
|
if (__gthread_active_p ())
|
|
testname.append("-thread");
|
|
#endif
|
|
|
|
out.setf(std::ios_base::left);
|
|
out << std::setw(25) << testname << tab;
|
|
out << std::setw(40) << header << tab;
|
|
|
|
out << std::endl;
|
|
out.close();
|
|
}
|
|
} // namespace __gnu_test
|
|
|
|
|
|
// Ah, we wish it wasn't so...
|
|
bool first_container = false;
|
|
extern const char* filename;
|
|
|
|
typedef std::string::size_type (*callback_type) (std::string&);
|
|
|
|
template<typename Container, int Iter, bool Thread>
|
|
void
|
|
write_viz_container(callback_type find_container, const char* filename)
|
|
{
|
|
typedef std::string string;
|
|
|
|
// Create title.
|
|
{
|
|
const char ws(' ');
|
|
std::ostringstream title;
|
|
|
|
std::string titlename(filename);
|
|
std::string::size_type n = titlename.find('.');
|
|
if (n != string::npos)
|
|
titlename = std::string(titlename.begin(), titlename.begin() + n);
|
|
|
|
title << titlename;
|
|
title << ws;
|
|
title << Iter;
|
|
title << ws;
|
|
#if 0
|
|
title << "thread<";
|
|
std::boolalpha(title);
|
|
title << Thread;
|
|
title << '>';
|
|
#endif
|
|
|
|
titlename += ".title";
|
|
std::ofstream titlefile(titlename.c_str());
|
|
if (!titlefile.good())
|
|
throw std::runtime_error("write_viz_data cannot open titlename");
|
|
titlefile << title.str() << std::endl;
|
|
}
|
|
|
|
// Create compressed type name.
|
|
Container obj;
|
|
int status;
|
|
std::string type(abi::__cxa_demangle(typeid(obj).name(), 0, 0, &status));
|
|
|
|
// Extract fully-qualified typename.
|
|
// Assumes "set" or "map" are uniquely determinate.
|
|
string::iterator beg = type.begin();
|
|
string::iterator end;
|
|
string::size_type n = (*find_container)(type);
|
|
|
|
// Find start of fully-qualified name.
|
|
// Assume map, find end.
|
|
string::size_type nend = type.find('<', n);
|
|
if (nend != string::npos)
|
|
end = type.begin() + nend;
|
|
|
|
string compressed_type;
|
|
compressed_type += '"';
|
|
compressed_type += string(beg, end);
|
|
compressed_type += '<';
|
|
#if 0
|
|
typename Container::key_type v;
|
|
compressed_type += typeid(v).name();
|
|
#else
|
|
compressed_type += "int";
|
|
#endif
|
|
compressed_type += ", A>";
|
|
|
|
// XXX
|
|
if (Thread == true)
|
|
compressed_type += " thread";
|
|
compressed_type += '"';
|
|
|
|
std::ofstream file(filename, std::ios_base::app);
|
|
if (!file.good())
|
|
throw std::runtime_error("write_viz_data cannot open filename");
|
|
|
|
file << compressed_type;
|
|
first_container = false;
|
|
}
|
|
|
|
|
|
void
|
|
write_viz_data(__gnu_test::time_counter& time, const char* filename)
|
|
{
|
|
std::ofstream file(filename, std::ios_base::app);
|
|
if (!file.good())
|
|
throw std::runtime_error("write_viz_data cannot open filename");
|
|
|
|
// Print out score in appropriate column.
|
|
const char tab('\t');
|
|
int score = time.real_time();
|
|
file << tab << score;
|
|
}
|
|
|
|
void
|
|
write_viz_endl(const char* filename)
|
|
{
|
|
std::ofstream file(filename, std::ios_base::app);
|
|
if (!file.good())
|
|
throw std::runtime_error("write_viz_endl cannot open filename");
|
|
file << std::endl;
|
|
}
|
|
|
|
|
|
// Function template, function objects for the tests.
|
|
template<typename TestType>
|
|
struct value_type : public std::pair<const TestType, TestType>
|
|
{
|
|
inline value_type& operator++()
|
|
{
|
|
++this->second;
|
|
return *this;
|
|
}
|
|
|
|
inline operator TestType() const { return this->second; }
|
|
};
|
|
|
|
template<typename Container, int Iter>
|
|
void
|
|
do_loop();
|
|
|
|
template<typename Container, int Iter>
|
|
void*
|
|
do_thread(void* p = 0)
|
|
{
|
|
do_loop<Container, Iter>();
|
|
return p;
|
|
}
|
|
|
|
template<typename Container, int Iter, bool Thread>
|
|
void
|
|
test_container(const char* filename)
|
|
{
|
|
using namespace __gnu_test;
|
|
time_counter time;
|
|
resource_counter resource;
|
|
{
|
|
start_counters(time, resource);
|
|
if (!Thread)
|
|
{
|
|
// No threads, so run 4x.
|
|
do_loop<Container, Iter * 4>();
|
|
}
|
|
else
|
|
{
|
|
#if defined (_GLIBCXX_GCC_GTHR_POSIX_H) && !defined (NOTHREAD)
|
|
pthread_t t1, t2, t3, t4;
|
|
pthread_create(&t1, 0, &do_thread<Container, Iter>, 0);
|
|
pthread_create(&t2, 0, &do_thread<Container, Iter>, 0);
|
|
pthread_create(&t3, 0, &do_thread<Container, Iter>, 0);
|
|
pthread_create(&t4, 0, &do_thread<Container, Iter>, 0);
|
|
|
|
pthread_join(t1, 0);
|
|
pthread_join(t2, 0);
|
|
pthread_join(t3, 0);
|
|
pthread_join(t4, 0);
|
|
#endif
|
|
}
|
|
stop_counters(time, resource);
|
|
|
|
// Detailed text data.
|
|
Container obj;
|
|
int status;
|
|
std::ostringstream comment;
|
|
comment << "type: " << abi::__cxa_demangle(typeid(obj).name(),
|
|
0, 0, &status);
|
|
report_header(filename, comment.str());
|
|
report_performance("", "", time, resource);
|
|
|
|
// Detailed data for visualization.
|
|
std::string vizfilename(filename);
|
|
vizfilename += ".dat";
|
|
write_viz_data(time, vizfilename.c_str());
|
|
}
|
|
}
|
|
|
|
template<bool Thread>
|
|
struct test_sequence
|
|
{
|
|
test_sequence(const char* filename) : _M_filename(filename) { }
|
|
|
|
template<class Container>
|
|
void
|
|
operator()(Container)
|
|
{
|
|
const int i = 20000;
|
|
test_container<Container, i, Thread>(_M_filename);
|
|
}
|
|
|
|
private:
|
|
const char* _M_filename;
|
|
};
|
|
|
|
|
|
inline std::string::size_type
|
|
sequence_find_container(std::string& type)
|
|
{
|
|
const std::string::size_type npos = std::string::npos;
|
|
std::string::size_type n1 = type.find("vector");
|
|
std::string::size_type n2 = type.find("list");
|
|
std::string::size_type n3 = type.find("deque");
|
|
std::string::size_type n4 = type.find("string");
|
|
|
|
if (n1 != npos || n2 != npos || n3 != npos || n4 != npos)
|
|
return std::min(std::min(n1, n2), std::min(n3, n4));
|
|
else
|
|
throw std::runtime_error("sequence_find_container not found");
|
|
}
|
|
|
|
inline std::string::size_type
|
|
associative_find_container(std::string& type)
|
|
{
|
|
using std::string;
|
|
string::size_type n1 = type.find("map");
|
|
string::size_type n2 = type.find("set");
|
|
if (n1 != string::npos || n2 != string::npos)
|
|
return std::min(n1, n2);
|
|
else
|
|
throw std::runtime_error("associative_find_container not found");
|
|
}
|
|
|
|
#endif // _GLIBCXX_PERFORMANCE_H
|
|
|