boost_mirror/multi_index
1
0
Fork 0
mirror of https://github.com/boostorg/multi_index.git synced 2025-05-11 13:24:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

reorganized internal deps

Browse Source
This commit is contained in:
joaquintides 2021-08-13 13:46:09 +02:00
parent 7dd7e2e45b
commit f4b9c802f0
1 changed files with 108 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

214
include/boost/multi_index/detail/safe_mode.hpp
View File

@ -140,10 +140,6 @@ namespace boost{
namespace multi_index{ namespace multi_index{
namespace detail{
class safe_container_base; // TODO: REORGANIZE
}
namespace safe_mode{ namespace safe_mode{
/* Checking routines. Assume the best for unchecked iterators /* Checking routines. Assume the best for unchecked iterators
@ -292,90 +288,20 @@ inline bool check_equal_allocators(
return cont0.get_allocator()==cont1.get_allocator(); return cont0.get_allocator()==cont1.get_allocator();
} }
/* Invalidates all iterators equivalent to that given. Safe containers /* fwd decls */
* must call this when deleting elements: the safe mode framework cannot
* perform this operation automatically without outside help.
*/
template<typename Iterator> template<typename Container> class safe_container;
inline void detach_equivalent_iterators(Iterator& it) template<typename Iterator> void detach_equivalent_iterators(Iterator&);
{
if(it.valid()){
{
#if defined(BOOST_HAS_THREADS)
boost::detail::lightweight_mutex::scoped_lock lock(it.cont->mutex);
#endif
Iterator *prev_,*next_; namespace safe_mode_detail{
for(
prev_=static_cast<Iterator*>(&it.cont->header);
(next_=static_cast<Iterator*>(prev_->next))!=0;){
if(next_!=&it&&*next_==it){
prev_->next=next_->next;
next_->cont=0;
}
else prev_=next_;
}
}
it.detach();
}
}
/* Transfers iterators equivalent to that given to Dst, if that container has /* fwd decls */
* the same iterator type; otherwise, detaches them.
*/
class safe_container_base;
template<typename Dst,typename Iterator> template<typename Dst,typename Iterator>
inline void transfer_equivalent_iterators(Dst& dst,Iterator& i) void transfer_equivalent_iterators(Dst&,Iterator,boost::true_type);
{
transfer_equivalent_iterators(
dst,i,boost::is_same<Iterator,typename Dst::iterator>());
}
template<typename Dst,typename Iterator> template<typename Dst,typename Iterator>
inline void transfer_equivalent_iterators( inline void transfer_equivalent_iterators(Dst&,Iterator&,boost::false_type);
Dst& dst,Iterator it,boost::true_type /* same iterator type */)
{
if(it.valid()){
{
detail::safe_container_base* cont_=dst.end().cont;
#if defined(BOOST_HAS_THREADS)
detail::scoped_bilock<boost::detail::lightweight_mutex>
scoped_bilock(it.cont->mutex,cont_->mutex);
#endif
Iterator *prev_,*next_;
for(
prev_=static_cast<Iterator*>(&it.cont->header);
(next_=static_cast<Iterator*>(prev_->next))!=0;){
if(next_!=&it&&*next_==it){
prev_->next=next_->next;
next_->cont=cont_;
next_->next=cont_->header.next;
cont_->header.next=next_;
}
else prev_=next_;
}
}
/* nothing to do with it, was passed by value and will die now */
}
}
template<typename Dst,typename Iterator>
inline void transfer_equivalent_iterators(
Dst&,Iterator& it,boost::false_type /* same iterator type */)
{
detach_equivalent_iterators(it);
}
template<typename Container> class safe_container; /* fwd decl. */
} /* namespace multi_index::safe_mode */
namespace detail{
class safe_container_base; /* fwd decl. */
class safe_iterator_base class safe_iterator_base
{ {
@ -425,15 +351,15 @@ protected:
const safe_container_base* owner()const{return cont;} const safe_container_base* owner()const{return cont;}
BOOST_MULTI_INDEX_PRIVATE_IF_MEMBER_TEMPLATE_FRIENDS: BOOST_MULTI_INDEX_PRIVATE_IF_MEMBER_TEMPLATE_FRIENDS:
friend class safe_container_base;
#if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS) #if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
template<typename> friend class safe_mode::safe_container; friend class safe_container_base;
template<typename Iterator> friend template<typename>
void safe_mode::detach_equivalent_iterators(Iterator&); friend class safe_mode::safe_container;
template<typename Dst,typename Iterator> friend template<typename Iterator>
void safe_mode::transfer_equivalent_iterators( friend void safe_mode::detach_equivalent_iterators(Iterator&);
Dst&,Iterator,boost::true_type); template<typename Dst,typename Iterator>
friend void safe_mode_detail::transfer_equivalent_iterators(
Dst&,Iterator,boost::true_type);
#endif #endif
inline void attach(safe_container_base* cont_); inline void attach(safe_container_base* cont_);
@ -449,14 +375,14 @@ public:
safe_container_base(){} safe_container_base(){}
BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS:
friend class safe_iterator_base;
#if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS) #if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
template<typename Iterator> friend friend class safe_iterator_base;
void safe_mode::detach_equivalent_iterators(Iterator&); template<typename Iterator>
template<typename Dst,typename Iterator> friend friend void safe_mode::detach_equivalent_iterators(Iterator&);
void safe_mode::transfer_equivalent_iterators( template<typename Dst,typename Iterator>
Dst&,Iterator,boost::true_type); friend void safe_mode_detail::transfer_equivalent_iterators(
Dst&,Iterator,boost::true_type);
#endif #endif
~safe_container_base() ~safe_container_base()
@ -511,9 +437,7 @@ void safe_iterator_base::detach()
} }
} }
} /* namespace multi_index::detail */ } /* namespace multi_index::safe_mode::safe_mode_detail */
namespace safe_mode{
/* In order to enable safe mode on a container: /* In order to enable safe mode on a container:
* - The container must keep a member of type safe_container<iterator>, * - The container must keep a member of type safe_container<iterator>,
@ -522,16 +446,13 @@ namespace safe_mode{
* address of the previous safe_container member at construction time. * address of the previous safe_container member at construction time.
*/ */
template<typename Iterator>
class safe_container;
template<typename Iterator> template<typename Iterator>
class safe_iterator: class safe_iterator:
public detail::iter_adaptor<safe_iterator<Iterator>,Iterator>, public detail::iter_adaptor<safe_iterator<Iterator>,Iterator>,
public detail::safe_iterator_base public safe_mode_detail::safe_iterator_base
{ {
typedef detail::iter_adaptor<safe_iterator,Iterator> super; typedef detail::iter_adaptor<safe_iterator,Iterator> super;
typedef detail::safe_iterator_base safe_super; typedef safe_mode_detail::safe_iterator_base safe_super;
public: public:
typedef typename Iterator::reference reference; typedef typename Iterator::reference reference;
@ -653,9 +574,9 @@ private:
}; };
template<typename Iterator> template<typename Iterator>
class safe_container:public detail::safe_container_base class safe_container:public safe_mode_detail::safe_container_base
{ {
typedef detail::safe_container_base super; typedef safe_mode_detail::safe_container_base super;
detail::any_container_view<Iterator> view; detail::any_container_view<Iterator> view;
@ -688,6 +609,87 @@ public:
} }
}; };
/* Invalidates all iterators equivalent to that given. Safe containers
* must call this when deleting elements: the safe mode framework cannot
* perform this operation automatically without outside help.
*/
template<typename Iterator>
inline void detach_equivalent_iterators(Iterator& it)
{
if(it.valid()){
{
#if defined(BOOST_HAS_THREADS)
boost::detail::lightweight_mutex::scoped_lock lock(it.cont->mutex);
#endif
Iterator *prev_,*next_;
for(
prev_=static_cast<Iterator*>(&it.cont->header);
(next_=static_cast<Iterator*>(prev_->next))!=0;){
if(next_!=&it&&*next_==it){
prev_->next=next_->next;
next_->cont=0;
}
else prev_=next_;
}
}
it.detach();
}
}
/* Transfers iterators equivalent to that given to Dst, if that container has
* the same iterator type; otherwise, detaches them.
*/
template<typename Dst,typename Iterator>
inline void transfer_equivalent_iterators(Dst& dst,Iterator& i)
{
safe_mode_detail::transfer_equivalent_iterators(
dst,i,boost::is_same<Iterator,typename Dst::iterator>());
}
namespace safe_mode_detail{
template<typename Dst,typename Iterator>
inline void transfer_equivalent_iterators(
Dst& dst,Iterator it,boost::true_type /* same iterator type */)
{
if(it.valid()){
{
safe_container_base* cont_=dst.end().cont;
#if defined(BOOST_HAS_THREADS)
detail::scoped_bilock<boost::detail::lightweight_mutex>
scoped_bilock(it.cont->mutex,cont_->mutex);
#endif
Iterator *prev_,*next_;
for(
prev_=static_cast<Iterator*>(&it.cont->header);
(next_=static_cast<Iterator*>(prev_->next))!=0;){
if(next_!=&it&&*next_==it){
prev_->next=next_->next;
next_->cont=cont_;
next_->next=cont_->header.next;
cont_->header.next=next_;
}
else prev_=next_;
}
}
/* nothing to do with it, was passed by value and will die now */
}
}
template<typename Dst,typename Iterator>
inline void transfer_equivalent_iterators(
Dst&,Iterator& it,boost::false_type /* same iterator type */)
{
detach_equivalent_iterators(it);
}
} /* namespace multi_index::safe_mode::safe_mode_detail */
} /* namespace multi_index::safe_mode */ } /* namespace multi_index::safe_mode */
} /* namespace multi_index */ } /* namespace multi_index */