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
435 lines
15 KiB
C++
435 lines
15 KiB
C++
// -*- C++ -*-
|
|
|
|
// Copyright (C) 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.
|
|
|
|
// 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
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
/** @file parallel/partition.h
|
|
* @brief Parallel implementation of std::partition(),
|
|
* std::nth_element(), and std::partial_sort().
|
|
* This file is a GNU parallel extension to the Standard C++ Library.
|
|
*/
|
|
|
|
// Written by Johannes Singler and Felix Putze.
|
|
|
|
#ifndef _GLIBCXX_PARALLEL_PARTITION_H
|
|
#define _GLIBCXX_PARALLEL_PARTITION_H 1
|
|
|
|
#include <parallel/basic_iterator.h>
|
|
#include <parallel/sort.h>
|
|
#include <parallel/random_number.h>
|
|
#include <bits/stl_algo.h>
|
|
#include <parallel/parallel.h>
|
|
|
|
/** @brief Decide whether to declare certain variables volatile. */
|
|
#define _GLIBCXX_VOLATILE volatile
|
|
|
|
namespace __gnu_parallel
|
|
{
|
|
/** @brief Parallel implementation of std::partition.
|
|
* @param __begin Begin iterator of input sequence to split.
|
|
* @param __end End iterator of input sequence to split.
|
|
* @param __pred Partition predicate, possibly including some kind
|
|
* of pivot.
|
|
* @param __num_threads Maximum number of threads to use for this task.
|
|
* @return Number of elements not fulfilling the predicate. */
|
|
template<typename _RAIter, typename _Predicate>
|
|
typename std::iterator_traits<_RAIter>::difference_type
|
|
__parallel_partition(_RAIter __begin, _RAIter __end,
|
|
_Predicate __pred, _ThreadIndex __num_threads)
|
|
{
|
|
typedef std::iterator_traits<_RAIter> _TraitsType;
|
|
typedef typename _TraitsType::value_type _ValueType;
|
|
typedef typename _TraitsType::difference_type _DifferenceType;
|
|
|
|
_DifferenceType __n = __end - __begin;
|
|
|
|
_GLIBCXX_CALL(__n)
|
|
|
|
const _Settings& __s = _Settings::get();
|
|
|
|
// shared
|
|
_GLIBCXX_VOLATILE _DifferenceType __left = 0, __right = __n - 1,
|
|
__dist = __n,
|
|
__leftover_left, __leftover_right,
|
|
__leftnew, __rightnew;
|
|
|
|
// just 0 or 1, but int to allow atomic operations
|
|
int* __reserved_left = 0, * __reserved_right = 0;
|
|
|
|
_DifferenceType __chunk_size = __s.partition_chunk_size;
|
|
|
|
//at least two chunks per thread
|
|
if (__dist >= 2 * __num_threads * __chunk_size)
|
|
# pragma omp parallel num_threads(__num_threads)
|
|
{
|
|
# pragma omp single
|
|
{
|
|
__num_threads = omp_get_num_threads();
|
|
__reserved_left = new int[__num_threads];
|
|
__reserved_right = new int[__num_threads];
|
|
|
|
if (__s.partition_chunk_share > 0.0)
|
|
__chunk_size = std::max<_DifferenceType>
|
|
(__s.partition_chunk_size, (double)__n
|
|
* __s.partition_chunk_share / (double)__num_threads);
|
|
else
|
|
__chunk_size = __s.partition_chunk_size;
|
|
}
|
|
|
|
while (__dist >= 2 * __num_threads * __chunk_size)
|
|
{
|
|
# pragma omp single
|
|
{
|
|
_DifferenceType __num_chunks = __dist / __chunk_size;
|
|
|
|
for (_ThreadIndex __r = 0; __r < __num_threads; ++__r)
|
|
{
|
|
__reserved_left [__r] = 0; // false
|
|
__reserved_right[__r] = 0; // false
|
|
}
|
|
__leftover_left = 0;
|
|
__leftover_right = 0;
|
|
} //implicit barrier
|
|
|
|
// Private.
|
|
_DifferenceType __thread_left, __thread_left_border,
|
|
__thread_right, __thread_right_border;
|
|
|
|
__thread_left = __left + 1;
|
|
// Just to satisfy the condition below.
|
|
__thread_left_border = __thread_left - 1;
|
|
|
|
__thread_right = __n - 1;
|
|
// Just to satisfy the condition below.
|
|
__thread_right_border = __thread_right + 1;
|
|
|
|
bool __iam_finished = false;
|
|
while (!__iam_finished)
|
|
{
|
|
if (__thread_left > __thread_left_border)
|
|
{
|
|
_DifferenceType __former_dist =
|
|
__fetch_and_add(&__dist, -__chunk_size);
|
|
if (__former_dist < __chunk_size)
|
|
{
|
|
__fetch_and_add(&__dist, __chunk_size);
|
|
__iam_finished = true;
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
__thread_left =
|
|
__fetch_and_add(&__left, __chunk_size);
|
|
__thread_left_border =
|
|
__thread_left + (__chunk_size - 1);
|
|
}
|
|
}
|
|
|
|
if (__thread_right < __thread_right_border)
|
|
{
|
|
_DifferenceType __former_dist =
|
|
__fetch_and_add(&__dist, -__chunk_size);
|
|
if (__former_dist < __chunk_size)
|
|
{
|
|
__fetch_and_add(&__dist, __chunk_size);
|
|
__iam_finished = true;
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
__thread_right =
|
|
__fetch_and_add(&__right, -__chunk_size);
|
|
__thread_right_border =
|
|
__thread_right - (__chunk_size - 1);
|
|
}
|
|
}
|
|
|
|
// Swap as usual.
|
|
while (__thread_left < __thread_right)
|
|
{
|
|
while (__pred(__begin[__thread_left])
|
|
&& __thread_left <= __thread_left_border)
|
|
++__thread_left;
|
|
while (!__pred(__begin[__thread_right])
|
|
&& __thread_right >= __thread_right_border)
|
|
--__thread_right;
|
|
|
|
if (__thread_left > __thread_left_border
|
|
|| __thread_right < __thread_right_border)
|
|
// Fetch new chunk(__s).
|
|
break;
|
|
|
|
std::swap(__begin[__thread_left],
|
|
__begin[__thread_right]);
|
|
++__thread_left;
|
|
--__thread_right;
|
|
}
|
|
}
|
|
|
|
// Now swap the leftover chunks to the right places.
|
|
if (__thread_left <= __thread_left_border)
|
|
# pragma omp atomic
|
|
++__leftover_left;
|
|
if (__thread_right >= __thread_right_border)
|
|
# pragma omp atomic
|
|
++__leftover_right;
|
|
|
|
# pragma omp barrier
|
|
|
|
_DifferenceType
|
|
__leftold = __left,
|
|
__leftnew = __left - __leftover_left * __chunk_size,
|
|
__rightold = __right,
|
|
__rightnew = __right + __leftover_right * __chunk_size;
|
|
|
|
// <=> __thread_left_border + (__chunk_size - 1) >= __leftnew
|
|
if (__thread_left <= __thread_left_border
|
|
&& __thread_left_border >= __leftnew)
|
|
{
|
|
// Chunk already in place, reserve spot.
|
|
__reserved_left[(__left - (__thread_left_border + 1))
|
|
/ __chunk_size] = 1;
|
|
}
|
|
|
|
// <=> __thread_right_border - (__chunk_size - 1) <= __rightnew
|
|
if (__thread_right >= __thread_right_border
|
|
&& __thread_right_border <= __rightnew)
|
|
{
|
|
// Chunk already in place, reserve spot.
|
|
__reserved_right[((__thread_right_border - 1) - __right)
|
|
/ __chunk_size] = 1;
|
|
}
|
|
|
|
# pragma omp barrier
|
|
|
|
if (__thread_left <= __thread_left_border
|
|
&& __thread_left_border < __leftnew)
|
|
{
|
|
// Find spot and swap.
|
|
_DifferenceType __swapstart = -1;
|
|
for (int __r = 0; __r < __leftover_left; ++__r)
|
|
if (__reserved_left[__r] == 0
|
|
&& __compare_and_swap(&(__reserved_left[__r]), 0, 1))
|
|
{
|
|
__swapstart = __leftold - (__r + 1) * __chunk_size;
|
|
break;
|
|
}
|
|
|
|
#if _GLIBCXX_ASSERTIONS
|
|
_GLIBCXX_PARALLEL_ASSERT(__swapstart != -1);
|
|
#endif
|
|
|
|
std::swap_ranges(__begin + __thread_left_border
|
|
- (__chunk_size - 1),
|
|
__begin + __thread_left_border + 1,
|
|
__begin + __swapstart);
|
|
}
|
|
|
|
if (__thread_right >= __thread_right_border
|
|
&& __thread_right_border > __rightnew)
|
|
{
|
|
// Find spot and swap
|
|
_DifferenceType __swapstart = -1;
|
|
for (int __r = 0; __r < __leftover_right; ++__r)
|
|
if (__reserved_right[__r] == 0
|
|
&& __compare_and_swap(&(__reserved_right[__r]), 0, 1))
|
|
{
|
|
__swapstart = __rightold + __r * __chunk_size + 1;
|
|
break;
|
|
}
|
|
|
|
#if _GLIBCXX_ASSERTIONS
|
|
_GLIBCXX_PARALLEL_ASSERT(__swapstart != -1);
|
|
#endif
|
|
|
|
std::swap_ranges(__begin + __thread_right_border,
|
|
__begin + __thread_right_border
|
|
+ __chunk_size, __begin + __swapstart);
|
|
}
|
|
#if _GLIBCXX_ASSERTIONS
|
|
# pragma omp barrier
|
|
|
|
# pragma omp single
|
|
{
|
|
for (_DifferenceType __r = 0; __r < __leftover_left; ++__r)
|
|
_GLIBCXX_PARALLEL_ASSERT(__reserved_left[__r] == 1);
|
|
for (_DifferenceType __r = 0; __r < __leftover_right; ++__r)
|
|
_GLIBCXX_PARALLEL_ASSERT(__reserved_right[__r] == 1);
|
|
}
|
|
#endif
|
|
|
|
__left = __leftnew;
|
|
__right = __rightnew;
|
|
__dist = __right - __left + 1;
|
|
}
|
|
|
|
# pragma omp flush(__left, __right)
|
|
} // end "recursion" //parallel
|
|
|
|
_DifferenceType __final_left = __left, __final_right = __right;
|
|
|
|
while (__final_left < __final_right)
|
|
{
|
|
// Go right until key is geq than pivot.
|
|
while (__pred(__begin[__final_left])
|
|
&& __final_left < __final_right)
|
|
++__final_left;
|
|
|
|
// Go left until key is less than pivot.
|
|
while (!__pred(__begin[__final_right])
|
|
&& __final_left < __final_right)
|
|
--__final_right;
|
|
|
|
if (__final_left == __final_right)
|
|
break;
|
|
std::swap(__begin[__final_left], __begin[__final_right]);
|
|
++__final_left;
|
|
--__final_right;
|
|
}
|
|
|
|
// All elements on the left side are < piv, all elements on the
|
|
// right are >= piv
|
|
delete[] __reserved_left;
|
|
delete[] __reserved_right;
|
|
|
|
// Element "between" __final_left and __final_right might not have
|
|
// been regarded yet
|
|
if (__final_left < __n && !__pred(__begin[__final_left]))
|
|
// Really swapped.
|
|
return __final_left;
|
|
else
|
|
return __final_left + 1;
|
|
}
|
|
|
|
/**
|
|
* @brief Parallel implementation of std::nth_element().
|
|
* @param __begin Begin iterator of input sequence.
|
|
* @param __nth _Iterator of element that must be in position afterwards.
|
|
* @param __end End iterator of input sequence.
|
|
* @param __comp Comparator.
|
|
*/
|
|
template<typename _RAIter, typename _Compare>
|
|
void
|
|
__parallel_nth_element(_RAIter __begin, _RAIter __nth,
|
|
_RAIter __end, _Compare __comp)
|
|
{
|
|
typedef std::iterator_traits<_RAIter> _TraitsType;
|
|
typedef typename _TraitsType::value_type _ValueType;
|
|
typedef typename _TraitsType::difference_type _DifferenceType;
|
|
|
|
_GLIBCXX_CALL(__end - __begin)
|
|
|
|
_RAIter __split;
|
|
_RandomNumber __rng;
|
|
|
|
const _Settings& __s = _Settings::get();
|
|
_DifferenceType __minimum_length = std::max<_DifferenceType>(2,
|
|
std::max(__s.nth_element_minimal_n, __s.partition_minimal_n));
|
|
|
|
// Break if input range to small.
|
|
while (static_cast<_SequenceIndex>(__end - __begin) >= __minimum_length)
|
|
{
|
|
_DifferenceType __n = __end - __begin;
|
|
|
|
_RAIter __pivot_pos = __begin + __rng(__n);
|
|
|
|
// Swap __pivot_pos value to end.
|
|
if (__pivot_pos != (__end - 1))
|
|
std::swap(*__pivot_pos, *(__end - 1));
|
|
__pivot_pos = __end - 1;
|
|
|
|
// _Compare must have first_value_type, second_value_type,
|
|
// result_type
|
|
// _Compare ==
|
|
// __gnu_parallel::_Lexicographic<S, int,
|
|
// __gnu_parallel::_Less<S, S> >
|
|
// __pivot_pos == std::pair<S, int>*
|
|
__gnu_parallel::__binder2nd<_Compare, _ValueType, _ValueType, bool>
|
|
__pred(__comp, *__pivot_pos);
|
|
|
|
// Divide, leave pivot unchanged in last place.
|
|
_RAIter __split_pos1, __split_pos2;
|
|
__split_pos1 = __begin + __parallel_partition(__begin, __end - 1,
|
|
__pred,
|
|
__get_max_threads());
|
|
|
|
// Left side: < __pivot_pos; __right side: >= __pivot_pos
|
|
|
|
// Swap pivot back to middle.
|
|
if (__split_pos1 != __pivot_pos)
|
|
std::swap(*__split_pos1, *__pivot_pos);
|
|
__pivot_pos = __split_pos1;
|
|
|
|
// In case all elements are equal, __split_pos1 == 0
|
|
if ((__split_pos1 + 1 - __begin) < (__n >> 7)
|
|
|| (__end - __split_pos1) < (__n >> 7))
|
|
{
|
|
// Very unequal split, one part smaller than one 128th
|
|
// elements not strictly larger than the pivot.
|
|
__gnu_parallel::__unary_negate<__gnu_parallel::
|
|
__binder1st<_Compare, _ValueType,
|
|
_ValueType, bool>, _ValueType>
|
|
__pred(__gnu_parallel::__binder1st<_Compare, _ValueType,
|
|
_ValueType, bool>(__comp, *__pivot_pos));
|
|
|
|
// Find other end of pivot-equal range.
|
|
__split_pos2 = __gnu_sequential::partition(__split_pos1 + 1,
|
|
__end, __pred);
|
|
}
|
|
else
|
|
// Only skip the pivot.
|
|
__split_pos2 = __split_pos1 + 1;
|
|
|
|
// Compare iterators.
|
|
if (__split_pos2 <= __nth)
|
|
__begin = __split_pos2;
|
|
else if (__nth < __split_pos1)
|
|
__end = __split_pos1;
|
|
else
|
|
break;
|
|
}
|
|
|
|
// Only at most _Settings::partition_minimal_n __elements __left.
|
|
__gnu_sequential::nth_element(__begin, __nth, __end, __comp);
|
|
}
|
|
|
|
/** @brief Parallel implementation of std::partial_sort().
|
|
* @param __begin Begin iterator of input sequence.
|
|
* @param __middle Sort until this position.
|
|
* @param __end End iterator of input sequence.
|
|
* @param __comp Comparator. */
|
|
template<typename _RAIter, typename _Compare>
|
|
void
|
|
__parallel_partial_sort(_RAIter __begin,
|
|
_RAIter __middle,
|
|
_RAIter __end, _Compare __comp)
|
|
{
|
|
__parallel_nth_element(__begin, __middle, __end, __comp);
|
|
std::sort(__begin, __middle, __comp);
|
|
}
|
|
|
|
} //namespace __gnu_parallel
|
|
|
|
#undef _GLIBCXX_VOLATILE
|
|
|
|
#endif /* _GLIBCXX_PARALLEL_PARTITION_H */
|