boost_mirror/coroutine2
1
0
Fork 0
mirror of https://github.com/boostorg/coroutine2.git synced 2025-05-09 15:14:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Oliver Kowalke 2017-02-04 11:12:04 +01:00
commit 9752d731b0
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
include/boost/coroutine2/detail/pull_control_block_cc.ipp
View File

@ -39,7 +39,7 @@ pull_coroutine< T >::control_block::destroy( control_block * cb) noexcept {
cb->~control_block();
// destroy coroutine's stack
cb->state |= state_t::destroy;
boost::context::resume( std::move( c) );
c();
}
template< typename T >
@ -75,7 +75,7 @@ pull_coroutine< T >::control_block::control_block( context::preallocated palloc,
// set termination flags
state |= state_t::complete;
// jump back
return boost::context::resume( std::move( other->c) );
return other->c();
},
std::forward< Fn >( fn) ) );
#else
@ -101,11 +101,11 @@ pull_coroutine< T >::control_block::control_block( context::preallocated palloc,
// set termination flags
state |= state_t::complete;
// jump back
return boost::context::resume( std::move( other->c) );
return other->c();
});
#endif
if ( boost::context::data_available( c) ) {
set( boost::context::transfer_data< T >( c) );
set( boost::context::get_data< T >( c) );
}
}
@ -139,9 +139,9 @@ pull_coroutine< T >::control_block::deallocate() noexcept {
template< typename T >
void
pull_coroutine< T >::control_block::resume() {
c = boost::context::resume( std::move( c) );
c = c();
if ( boost::context::data_available( c) ) {
set( boost::context::transfer_data< T >( c) );
set( boost::context::get_data< T >( c) );
} else {
reset();
}
@ -205,7 +205,7 @@ pull_coroutine< T & >::control_block::destroy( control_block * cb) noexcept {
cb->~control_block();
// destroy coroutine's stack
cb->state |= state_t::destroy;
boost::context::resume( std::move( c) );
c();
}
template< typename T >
@ -241,7 +241,7 @@ pull_coroutine< T & >::control_block::control_block( context::preallocated pallo
// set termination flags
state |= state_t::complete;
// jump back
return boost::context::resume( std::move( other->c) );
return other->c();
},
std::forward< Fn >( fn) ) );
#else
@ -267,11 +267,11 @@ pull_coroutine< T & >::control_block::control_block( context::preallocated pallo
// set termination flags
state |= state_t::complete;
// jump back
return boost::context::resume( std::move( other->c) );
return other->c();
});
#endif
if ( boost::context::data_available( c) ) {
set( boost::context::transfer_data< T & >( c) );
set( boost::context::get_data< T & >( c) );
}
}
@ -297,9 +297,9 @@ pull_coroutine< T & >::control_block::deallocate() noexcept {
template< typename T >
void
pull_coroutine< T & >::control_block::resume() {
c = boost::context::resume( std::move( c) );
c = c();
if ( boost::context::data_available( c) ) {
set( boost::context::transfer_data< T & >( c) );
set( boost::context::get_data< T & >( c) );
} else {
reset();
}
@ -347,7 +347,7 @@ pull_coroutine< void >::control_block::destroy( control_block * cb) noexcept {
cb->~control_block();
// destroy coroutine's stack
cb->state |= state_t::destroy;
boost::context::resume( std::move( c) );
c();
}
template< typename StackAllocator, typename Fn >
@ -380,7 +380,7 @@ pull_coroutine< void >::control_block::control_block( context::preallocated pall
// set termination flags
state |= state_t::complete;
// jump back
return boost::context::resume( std::move( other->c) );
return other->c();
},
std::forward< Fn >( fn) ) );
#else
@ -406,7 +406,7 @@ pull_coroutine< void >::control_block::control_block( context::preallocated pall
// set termination flags
state |= state_t::complete;
// jump back to ctx
return boost::context::resume( std::move( other->c) );
return other->c();
});
#endif
}
@ -431,7 +431,7 @@ pull_coroutine< void >::control_block::deallocate() noexcept {
inline
void
pull_coroutine< void >::control_block::resume() {
c = boost::context::resume( std::move( c) );
c = c();
if ( except) {
std::rethrow_exception( except);
}

46
include/boost/coroutine2/detail/push_control_block_cc.ipp
View File

@ -38,7 +38,7 @@ push_coroutine< T >::control_block::destroy( control_block * cb) noexcept {
cb->~control_block();
// destroy coroutine's stack
cb->state |= state_t::destroy;
boost::context::resume( std::move( c) );
c();
}
template< typename T >
@ -57,10 +57,10 @@ push_coroutine< T >::control_block::control_block( context::preallocated palloc,
typename pull_coroutine< T >::control_block synthesized_cb{ this, c };
pull_coroutine< T > synthesized{ & synthesized_cb };
other = & synthesized_cb;
other->c = boost::context::resume( std::move( other->c) );
other->c = other->c();
// set transferred value
if ( boost::context::data_available( other->c) ) {
synthesized_cb.set( boost::context::transfer_data< T >( other->c) );
synthesized_cb.set( boost::context::get_data< T >( other->c) );
} else {
synthesized_cb.reset();
}
@ -79,7 +79,7 @@ push_coroutine< T >::control_block::control_block( context::preallocated palloc,
// set termination flags
state |= state_t::complete;
// jump back
return boost::context::resume( std::move( other->c) );
return other->c();
},
std::forward< Fn >( fn) ) );
#else
@ -90,10 +90,10 @@ push_coroutine< T >::control_block::control_block( context::preallocated palloc,
typename pull_coroutine< T >::control_block synthesized_cb{ this, c };
pull_coroutine< T > synthesized{ & synthesized_cb };
other = & synthesized_cb;
other->c = boost::context::resume( std::move( other->c) );
other->c = other->c();
// set transferred value
if ( boost::context::data_available( other->c) ) {
synthesized_cb.set( boost::context::transfer_data< T >( other->c) );
synthesized_cb.set( boost::context::get_data< T >( other->c) );
} else {
synthesized_cb.reset();
}
@ -112,7 +112,7 @@ push_coroutine< T >::control_block::control_block( context::preallocated palloc,
// set termination flags
state |= state_t::complete;
// jump back
return boost::context::resume( std::move( other->c) );
return other->c();
});
#endif
}
@ -138,7 +138,7 @@ template< typename T >
void
push_coroutine< T >::control_block::resume( T const& data) {
// pass an pointer to other context
c = boost::context::resume( std::move( c), data);
c = c( data);
if ( except) {
std::rethrow_exception( except);
}
@ -148,7 +148,7 @@ template< typename T >
void
push_coroutine< T >::control_block::resume( T && data) {
// pass an pointer to other context
c = boost::context::resume( std::move( c), std::move( data) );
c = c( std::move( data) );
if ( except) {
std::rethrow_exception( except);
}
@ -171,7 +171,7 @@ push_coroutine< T & >::control_block::destroy( control_block * cb) noexcept {
cb->~control_block();
// destroy coroutine's stack
cb->state |= state_t::destroy;
boost::context::resume( std::move( c) );
c();
}
template< typename T >
@ -190,10 +190,10 @@ push_coroutine< T & >::control_block::control_block( context::preallocated pallo
typename pull_coroutine< T & >::control_block synthesized_cb{ this, c };
pull_coroutine< T & > synthesized{ & synthesized_cb };
other = & synthesized_cb;
other->c = boost::context::resume( std::move( other->c) );
other->c = other->c();
// set transferred value
if ( boost::context::data_available( other->c) ) {
synthesized_cb.set( boost::context::transfer_data< T & >( other->c) );
synthesized_cb.set( boost::context::get_data< T & >( other->c) );
} else {
synthesized_cb.reset();
}
@ -212,7 +212,7 @@ push_coroutine< T & >::control_block::control_block( context::preallocated pallo
// set termination flags
state |= state_t::complete;
// jump back
return boost::context::resume( std::move( other->c) );
return other->c();
},
std::forward< Fn >( fn) ) );
#else
@ -223,10 +223,10 @@ push_coroutine< T & >::control_block::control_block( context::preallocated pallo
typename pull_coroutine< T & >::control_block synthesized_cb{ this, c };
pull_coroutine< T & > synthesized{ & synthesized_cb };
other = & synthesized_cb;
other->c = boost::context::resume( std::move( other->c) );
other->c = other->c();
// set transferred value
if ( boost::context::data_available( other->c) ) {
synthesized_cb.set( boost::context::transfer_data< T & >( other->c) );
synthesized_cb.set( boost::context::get_data< T & >( other->c) );
} else {
synthesized_cb.reset();
}
@ -245,7 +245,7 @@ push_coroutine< T & >::control_block::control_block( context::preallocated pallo
// set termination flags
state |= state_t::complete;
// jump back
return boost::context::resume( std::move( other->c) );
return other->c();
});
#endif
}
@ -271,7 +271,7 @@ template< typename T >
void
push_coroutine< T & >::control_block::resume( T & t) {
// pass an pointer to other context
c = boost::context::resume( std::move( c), std::ref( t) );
c = c( std::ref( t) );
if ( except) {
std::rethrow_exception( except);
}
@ -294,7 +294,7 @@ push_coroutine< void >::control_block::destroy( control_block * cb) noexcept {
cb->~control_block();
// destroy coroutine's stack
cb->state |= state_t::destroy;
boost::context::resume( std::move( c) );
c();
}
template< typename StackAllocator, typename Fn >
@ -311,7 +311,7 @@ push_coroutine< void >::control_block::control_block( context::preallocated pall
typename pull_coroutine< void >::control_block synthesized_cb{ this, c };
pull_coroutine< void > synthesized{ & synthesized_cb };
other = & synthesized_cb;
other->c = boost::context::resume( std::move( other->c) );
other->c = other->c();
if ( state_t::none == ( state & state_t::destroy) ) {
try {
auto fn = std::move( fn_);
@ -327,7 +327,7 @@ push_coroutine< void >::control_block::control_block( context::preallocated pall
// set termination flags
state |= state_t::complete;
// jump back
return boost::context::resume( std::move( other->c) );
return other->c();
},
std::forward< Fn >( fn) ) );
#else
@ -338,7 +338,7 @@ push_coroutine< void >::control_block::control_block( context::preallocated pall
typename pull_coroutine< void >::control_block synthesized_cb{ this, c};
pull_coroutine< void > synthesized{ & synthesized_cb };
other = & synthesized_cb;
other->c = boost::context::resume( std::move( other->c) );
other->c = other->c();
if ( state_t::none == ( state & state_t::destroy) ) {
try {
auto fn = std::move( fn_);
@ -354,7 +354,7 @@ push_coroutine< void >::control_block::control_block( context::preallocated pall
// set termination flags
state |= state_t::complete;
// jump back
return boost::context::resume( std::move( other->c) );
return other->c();
});
#endif
}
@ -379,7 +379,7 @@ push_coroutine< void >::control_block::deallocate() noexcept {
inline
void
push_coroutine< void >::control_block::resume() {
c = boost::context::resume( std::move( c) );
c = c();
if ( except) {
std::rethrow_exception( except);
}