feedc0de/boost_smart_ptr
1
0 Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Merge 47357 (atomic access N2674 edits) from trunk to release.

Browse Source 
[SVN r47358]
This commit is contained in:
Peter Dimov committed 2008-07-12 16:18:05 +00:00
1 parent 991b02b03e
commit 556b9fe563
4 files changed
+98 -73
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/sp_atomic_mt2_test.cpp
+3 -3
View File
@@ -83,7 +83,7 @@ int read_access( prim_type pt )
case pt_atomics:
{
boost::shared_ptr<X> p2 = ps.atomic_load();
boost::shared_ptr<X> p2 = boost::atomic_load( &ps );
return p2->get();
}
}
@@ -109,14 +109,14 @@ void write_access( prim_type pt )
case pt_atomics:
{
boost::shared_ptr<X> p1 = ps.atomic_load();
boost::shared_ptr<X> p1 = boost::atomic_load( &ps );
for( ;; )
{
boost::shared_ptr<X> p2( new X( *p1 ) );
p2->set();
if( ps.atomic_compare_swap( p1, p2 ) ) break;
if( boost::atomic_compare_exchange( &ps, &p1, p2 ) ) break;
}
}
break;
test/sp_atomic_mt_test.cpp
+2 -2
View File
@@ -93,7 +93,7 @@ void reader( int r )
#else
boost::shared_ptr<X> p2 = ps.atomic_load();
boost::shared_ptr<X> p2 = boost::atomic_load( &ps );
s += p2->get();
@@ -134,7 +134,7 @@ void writer()
BOOST_TEST( p2->v_ == i );
p2->set();
ps.atomic_store( p2 );
boost::atomic_store( &ps, p2 );
#endif
}
test/sp_atomic_test.cpp
+11 -11
View File
@@ -25,31 +25,31 @@ int main()
boost::shared_ptr<X> px( new X );
{
boost::shared_ptr<X> p2 = px.atomic_load();
boost::shared_ptr<X> p2 = boost::atomic_load( &px );
BOOST_TEST_SP_EQ( p2, px );
boost::shared_ptr<X> px2( new X );
px.atomic_store( px2 );
boost::atomic_store( &px, px2 );
BOOST_TEST_SP_EQ( px, px2 );
p2 = px.atomic_load();
p2 = boost::atomic_load( &px );
BOOST_TEST_SP_EQ( p2, px );
BOOST_TEST_SP_EQ( p2, px2 );
boost::shared_ptr<X> px3( new X );
boost::shared_ptr<X> p3 = px.atomic_swap( px3 );
boost::shared_ptr<X> p3 = boost::atomic_exchange( &px, px3 );
BOOST_TEST_SP_EQ( p3, px2 );
BOOST_TEST_SP_EQ( px, px3 );
boost::shared_ptr<X> px4( new X );
boost::shared_ptr<X> cmp;
bool r = px.atomic_compare_swap( cmp, px4 );
bool r = boost::atomic_compare_exchange( &px, &cmp, px4 );
BOOST_TEST( !r );
BOOST_TEST_SP_EQ( px, px3 );
BOOST_TEST_SP_EQ( cmp, px3 );
r = px.atomic_compare_swap( cmp, px4 );
r = boost::atomic_compare_exchange( &px, &cmp, px4 );
BOOST_TEST( r );
BOOST_TEST_SP_EQ( px, px4 );
}
@@ -59,26 +59,26 @@ int main()
px.reset();
{
boost::shared_ptr<X> p2 = px.atomic_load( boost::memory_order_acquire );
boost::shared_ptr<X> p2 = boost::atomic_load_explicit( &px, boost::memory_order_acquire );
BOOST_TEST_SP_EQ( p2, px );
boost::shared_ptr<X> px2( new X );
px.atomic_store( px2, boost::memory_order_release );
boost::atomic_store_explicit( &px, px2, boost::memory_order_release );
BOOST_TEST_SP_EQ( px, px2 );
boost::shared_ptr<X> p3 = px.atomic_swap( boost::shared_ptr<X>(), boost::memory_order_acq_rel );
boost::shared_ptr<X> p3 = boost::atomic_exchange_explicit( &px, boost::shared_ptr<X>(), boost::memory_order_acq_rel );
BOOST_TEST_SP_EQ( p3, px2 );
BOOST_TEST_SP_EQ( px, p2 );
boost::shared_ptr<X> px4( new X );
boost::shared_ptr<X> cmp( px2 );
bool r = px.atomic_compare_swap( cmp, px4, boost::memory_order_acquire, boost::memory_order_relaxed );
bool r = boost::atomic_compare_exchange_explicit( &px, &cmp, px4, boost::memory_order_acquire, boost::memory_order_relaxed );
BOOST_TEST( !r );
BOOST_TEST_SP_EQ( px, p2 );
BOOST_TEST_SP_EQ( cmp, p2 );
r = px.atomic_compare_swap( cmp, px4, boost::memory_order_release, boost::memory_order_acquire );
r = boost::atomic_compare_exchange_explicit( &px, &cmp, px4, boost::memory_order_release, boost::memory_order_acquire );
BOOST_TEST( r );
BOOST_TEST_SP_EQ( px, px4 );
}