Merged 44636, 44640, 45094 (atomic access) from trunk to release.

[SVN r47349]
This commit is contained in:
Peter Dimov
2008-07-12 11:57:45 +00:00
parent f884c53bd6
commit 034c12d244
6 changed files with 625 additions and 0 deletions

View File

@@ -33,6 +33,11 @@
#include <boost/detail/workaround.hpp>
#include <boost/detail/sp_convertible.hpp>
#if !defined(BOOST_SP_NO_ATOMIC_ACCESS)
#include <boost/detail/spinlock_pool.hpp>
#include <boost/memory_order.hpp>
#endif
#include <algorithm> // for std::swap
#include <functional> // for std::less
#include <typeinfo> // for std::bad_cast
@@ -498,6 +503,65 @@ public:
return pn.get_deleter( ti );
}
// atomic access
#if !defined(BOOST_SP_NO_ATOMIC_ACCESS)
shared_ptr<T> atomic_load( memory_order /*mo*/ = memory_order_seq_cst ) const
{
boost::detail::spinlock_pool<2>::scoped_lock lock( this );
return *this;
}
void atomic_store( shared_ptr<T> r, memory_order /*mo*/ = memory_order_seq_cst )
{
boost::detail::spinlock_pool<2>::scoped_lock lock( this );
swap( r );
}
shared_ptr<T> atomic_swap( shared_ptr<T> r, memory_order /*mo*/ = memory_order_seq_cst )
{
boost::detail::spinlock & sp = boost::detail::spinlock_pool<2>::spinlock_for( this );
sp.lock();
swap( r );
sp.unlock();
return r; // return std::move(r)
}
bool atomic_compare_swap( shared_ptr<T> & v, shared_ptr<T> w )
{
boost::detail::spinlock & sp = boost::detail::spinlock_pool<2>::spinlock_for( this );
sp.lock();
if( px == v.px && pn == v.pn )
{
swap( w );
sp.unlock();
return true;
}
else
{
shared_ptr tmp( *this );
sp.unlock();
tmp.swap( v );
return false;
}
}
inline bool atomic_compare_swap( shared_ptr<T> & v, shared_ptr<T> w, memory_order /*success*/, memory_order /*failure*/ )
{
return atomic_compare_swap( v, w ); // std::move( w )
}
#endif
// Tasteless as this may seem, making all members public allows member templates
// to work in the absence of member template friends. (Matthew Langston)