15ee1a7745
2014-05-06 François Dumont <fdumont@gcc.gnu.org> * include/debug/macros.h [__glibcxx_check_equal_allocs]: Add parameter to pass the 2 instances to check allocator equality. * include/debug/safe_container.h: New, define _Safe_container<>. * include/Makefile.am: Add previous. * include/debug/deque (std::__debug::deque<>): Inherit _Safe_container<>. Use default implementation for all special functions. * include/debug/forward_list (std::__debug::forward_list<>): Likewise. * include/debug/list (std::__debug::list<>): Likewise. * include/debug/map.h (std::__debug::map<>): Likewise. * include/debug/multimap.h (std::__debug::multimap<>): Likewise. * include/debug/set.h (std::__debug::set<>): Likewise. * include/debug/multiset.h (std::__debug::multiset<>): Likewise. * include/debug/string (std::__debug::basic_string<>): Likewise. * include/debug/unordered_map (std::__debug::unordered_map<>): Likewise. (std::__debug::unordered_multimap<>): Likewise. * include/debug/unordered_set (std::__debug::unordered_set<>): Likewise. (std::__debug::unordered_multiset<>): Likewise. * include/debug/vector (std::__debug::vector<>): Likewise. * include/debug/safe_base.h (_Safe_sequence_base()): Add noexcept. (_Safe_sequence_base(_Safe_sequence_base&&): Remove. (~_Safe_sequence_base()): Add noexcept. * include/debug/safe_sequence.h (std::__debug::_Safe_node_sequence<>): New. * include/debug/safe_unordered_base.h (_Safe_unordered_container_base()): Add noexcept. (~_Safe_unordered_container_base()): Likewise. (_M_swap(_Safe_unordered_container_base&)): Likewise. * include/debug/safe_unordered_container.h: (_Safe_unordered_container<>::_M_invalidate_locals()): New. (_Safe_unordered_container<>::_M_invalidate_all()): New. * src/c++11/debug.cc: Limit includes, adapt methods noexcept qualifications. * testsuite/util/debug/checks.h (check_construct1): Just implement an invalid constructor invocation and no other operations potentially not supported by some types of container. (check_construct2): Likewise. (check_construct3): Likewise. * testsuite/23_containers/forward_list/allocator/move.cc: Add check on iterators to make sure they are correctly moved in debug mode. * testsuite/23_containers/forward_list/allocator/move_assign.cc: Likewise. * testsuite/23_containers/map/allocator/move.cc: Likewise. * testsuite/23_containers/map/allocator/move_assign.cc: Likewise. * testsuite/23_containers/multimap/allocator/move.cc: Likewise. * testsuite/23_containers/multimap/allocator/move_assign.cc: Likewise. * testsuite/23_containers/multiset/allocator/move.cc: Likewise. * testsuite/23_containers/multiset/allocator/move_assign.cc: Likewise. * testsuite/23_containers/set/allocator/move.cc: Likewise. * testsuite/23_containers/set/allocator/move_assign.cc: Likewise. * testsuite/23_containers/unordered_map/allocator/move.cc: Likewise. * testsuite/23_containers/unordered_map/allocator/move_assign.cc: Likewise. * testsuite/23_containers/unordered_multimap/allocator/move.cc: Likewise. * testsuite/23_containers/unordered_multimap/allocator/move_assign.cc: Likewise. * testsuite/23_containers/unordered_multiset/allocator/move.cc: Likewise. * testsuite/23_containers/unordered_multiset/allocator/move_assign.cc: Likewise. * testsuite/23_containers/unordered_set/allocator/move.cc: Likewise. * testsuite/23_containers/unordered_set/allocator/move_assign.cc: Likewise. * testsuite/23_containers/forward_list/debug/construct1_neg.cc: New. * testsuite/23_containers/forward_list/debug/construct2_neg.cc: New. * testsuite/23_containers/forward_list/debug/construct3_neg.cc: New. * testsuite/23_containers/forward_list/debug/construct4_neg.cc: New. * testsuite/23_containers/forward_list/debug/move_assign_neg.cc: New. * testsuite/23_containers/forward_list/debug/move_neg.cc: New. * testsuite/23_containers/map/debug/construct5_neg.cc: New. * testsuite/23_containers/map/debug/move_assign_neg.cc: New. * testsuite/23_containers/map/debug/move_neg.cc: New. * testsuite/23_containers/multimap/debug/construct5_neg.cc: New. * testsuite/23_containers/multimap/debug/move_assign_neg.cc: New. * testsuite/23_containers/multimap/debug/move_neg.cc: New. * testsuite/23_containers/multiset/debug/construct5_neg.cc: New. * testsuite/23_containers/multiset/debug/move_assign_neg.cc: New. * testsuite/23_containers/multiset/debug/move_neg.cc: New. * testsuite/23_containers/set/debug/construct5_neg.cc: New. * testsuite/23_containers/set/debug/move_assign_neg.cc: New. * testsuite/23_containers/set/debug/move_neg.cc: New. * testsuite/23_containers/unordered_map/debug/construct5_neg.cc: New. * testsuite/23_containers/unordered_map/debug/move_assign_neg.cc: New. * testsuite/23_containers/unordered_map/debug/move_neg.cc: New. * testsuite/23_containers/unordered_multimap/debug/construct5_neg.cc: New. * testsuite/23_containers/unordered_multimap/debug/move_assign_neg.cc: New. * testsuite/23_containers/unordered_multimap/debug/move_neg.cc: New. * testsuite/23_containers/unordered_multiset/debug/construct5_neg.cc: New. * testsuite/23_containers/unordered_multiset/debug/move_assign_neg.cc: New. * testsuite/23_containers/unordered_multiset/debug/move_neg.cc: New. * testsuite/23_containers/unordered_set/debug/construct5_neg.cc: New. * testsuite/23_containers/unordered_set/debug/move_assign_neg.cc: New. * testsuite/23_containers/unordered_set/debug/move_neg.cc: New. * testsuite/23_containers/vector/debug/move_neg.cc: New. From-SVN: r210123
151 lines
4.7 KiB
C++
151 lines
4.7 KiB
C++
// Safe sequence implementation -*- C++ -*-
|
|
|
|
// Copyright (C) 2010-2014 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 debug/safe_sequence.tcc
|
|
* This file is a GNU debug extension to the Standard C++ Library.
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_DEBUG_SAFE_SEQUENCE_TCC
|
|
#define _GLIBCXX_DEBUG_SAFE_SEQUENCE_TCC 1
|
|
|
|
namespace __gnu_debug
|
|
{
|
|
template<typename _Sequence>
|
|
template<typename _Predicate>
|
|
void
|
|
_Safe_sequence<_Sequence>::
|
|
_M_invalidate_if(_Predicate __pred)
|
|
{
|
|
typedef typename _Sequence::iterator iterator;
|
|
typedef typename _Sequence::const_iterator const_iterator;
|
|
|
|
__gnu_cxx::__scoped_lock sentry(this->_M_get_mutex());
|
|
for (_Safe_iterator_base* __iter = _M_iterators; __iter;)
|
|
{
|
|
iterator* __victim = static_cast<iterator*>(__iter);
|
|
__iter = __iter->_M_next;
|
|
if (!__victim->_M_singular() && __pred(__victim->base()))
|
|
{
|
|
__victim->_M_invalidate();
|
|
}
|
|
}
|
|
|
|
for (_Safe_iterator_base* __iter2 = _M_const_iterators; __iter2;)
|
|
{
|
|
const_iterator* __victim = static_cast<const_iterator*>(__iter2);
|
|
__iter2 = __iter2->_M_next;
|
|
if (!__victim->_M_singular() && __pred(__victim->base()))
|
|
{
|
|
__victim->_M_invalidate();
|
|
}
|
|
}
|
|
}
|
|
|
|
template<typename _Sequence>
|
|
template<typename _Predicate>
|
|
void
|
|
_Safe_sequence<_Sequence>::
|
|
_M_transfer_from_if(_Safe_sequence& __from, _Predicate __pred)
|
|
{
|
|
typedef typename _Sequence::iterator iterator;
|
|
typedef typename _Sequence::const_iterator const_iterator;
|
|
|
|
_Safe_iterator_base* __transfered_iterators = 0;
|
|
_Safe_iterator_base* __transfered_const_iterators = 0;
|
|
_Safe_iterator_base* __last_iterator = 0;
|
|
_Safe_iterator_base* __last_const_iterator = 0;
|
|
{
|
|
// We lock __from first and detach iterator(s) to transfer
|
|
__gnu_cxx::__scoped_lock sentry(__from._M_get_mutex());
|
|
|
|
for (_Safe_iterator_base* __iter = __from._M_iterators; __iter;)
|
|
{
|
|
iterator* __victim = static_cast<iterator*>(__iter);
|
|
__iter = __iter->_M_next;
|
|
if (!__victim->_M_singular() && __pred(__victim->base()))
|
|
{
|
|
__victim->_M_detach_single();
|
|
if (__transfered_iterators)
|
|
{
|
|
__victim->_M_next = __transfered_iterators;
|
|
__transfered_iterators->_M_prior = __victim;
|
|
}
|
|
else
|
|
__last_iterator = __victim;
|
|
__victim->_M_sequence = this;
|
|
__victim->_M_version = this->_M_version;
|
|
__transfered_iterators = __victim;
|
|
}
|
|
}
|
|
|
|
for (_Safe_iterator_base* __iter2 = __from._M_const_iterators;
|
|
__iter2;)
|
|
{
|
|
const_iterator* __victim = static_cast<const_iterator*>(__iter2);
|
|
__iter2 = __iter2->_M_next;
|
|
if (!__victim->_M_singular() && __pred(__victim->base()))
|
|
{
|
|
__victim->_M_detach_single();
|
|
if (__transfered_const_iterators)
|
|
{
|
|
__victim->_M_next = __transfered_const_iterators;
|
|
__transfered_const_iterators->_M_prior = __victim;
|
|
}
|
|
else
|
|
__last_const_iterator = __victim;
|
|
__victim->_M_sequence = this;
|
|
__victim->_M_version = this->_M_version;
|
|
__transfered_const_iterators = __victim;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Now we can lock *this and add the transfered iterators if any
|
|
if (__last_iterator || __last_const_iterator)
|
|
{
|
|
__gnu_cxx::__scoped_lock sentry(this->_M_get_mutex());
|
|
if (__last_iterator)
|
|
{
|
|
if (this->_M_iterators)
|
|
{
|
|
this->_M_iterators->_M_prior = __last_iterator;
|
|
__last_iterator->_M_next = this->_M_iterators;
|
|
}
|
|
this->_M_iterators = __transfered_iterators;
|
|
}
|
|
if (__last_const_iterator)
|
|
{
|
|
if (this->_M_const_iterators)
|
|
{
|
|
this->_M_const_iterators->_M_prior = __last_const_iterator;
|
|
__last_const_iterator->_M_next = this->_M_const_iterators;
|
|
}
|
|
this->_M_const_iterators = __transfered_const_iterators;
|
|
}
|
|
}
|
|
}
|
|
} // namespace __gnu_debug
|
|
|
|
#endif
|