boost/fiber
2
0
Fork 0
mirror of https://github.com/boostorg/fiber.git synced 2026-02-19 14:22:23 +00:00
Code Issues Projects Releases Wiki Activity

use condition-variable::wait() with predicate in channel

Browse Source
This commit is contained in:
Oliver Kowalke
2015-12-21 16:44:37 +01:00
parent 9baa265d33
commit a964633c63
2 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
include/boost/fiber/bounded_channel.hpp
View File

@@ -121,9 +121,10 @@ private:
if ( is_closed_() ) {
return channel_op_status::closed;
}
while ( is_full_() ) {
not_full_cond_.wait( lk);
}
not_full_cond_.wait( lk,
[this](){
return ! is_full_();
});
return push_and_notify_( new_node, lk);
}
@@ -145,10 +146,11 @@ private:
if ( is_closed_() ) {
return channel_op_status::closed;
}
while ( is_full_() ) {
if ( cv_status::timeout == not_full_cond_.wait_until( lk, timeout_time) ) {
return channel_op_status::timeout;
}
if ( ! not_full_cond_.wait_until( lk, timeout_time,
[this](){
return ! is_full_();
})) {
return channel_op_status::timeout;
}
return push_and_notify_( new_node, lk);
}
@@ -341,9 +343,10 @@ public:
channel_op_status pop( value_type & va) {
std::unique_lock< mutex > lk( mtx_);
while ( ! is_closed_() && is_empty_() ) {
not_empty_cond_.wait( lk);
}
not_empty_cond_.wait( lk,
[this](){
return is_closed_() || ! is_empty_();
});
if ( is_closed_() && is_empty_() ) {
return channel_op_status::closed;
}
@@ -353,9 +356,10 @@ public:
value_type value_pop() {
std::unique_lock< mutex > lk( mtx_);
while ( ! is_closed_() && is_empty_() ) {
not_empty_cond_.wait( lk);
}
not_empty_cond_.wait( lk,
[this](){
return is_closed_() || ! is_empty_();
});
if ( is_closed_() && is_empty_() ) {
throw logic_error("boost fiber: queue is closed");
}
@@ -391,10 +395,12 @@ public:
channel_op_status pop_wait_until( value_type & va,
std::chrono::time_point< Clock, Duration > const& timeout_time) {
std::unique_lock< mutex > lk( mtx_);
while ( ! is_closed_() && is_empty_() ) {
if ( cv_status::timeout == not_empty_cond_.wait_until( lk, timeout_time) ) {
return channel_op_status::timeout;
}
if ( ! not_empty_cond_.wait_until( lk,
timeout_time,
[this](){
return is_closed_() || ! is_empty_();
})) {
return channel_op_status::timeout;
}
if ( is_closed_() && is_empty_() ) {
return channel_op_status::closed;

22
include/boost/fiber/unbounded_channel.hpp
View File

@@ -185,9 +185,10 @@ public:
channel_op_status pop( value_type & va) {
std::unique_lock< mutex > lk( mtx_);
while ( ! is_closed_() && is_empty_() ) {
not_empty_cond_.wait( lk);
}
not_empty_cond_.wait( lk,
[this](){
return is_closed_() || ! is_empty_();
});
if ( is_closed_() && is_empty_() ) {
return channel_op_status::closed;
}
@@ -197,9 +198,10 @@ public:
value_type value_pop() {
std::unique_lock< mutex > lk( mtx_);
while ( ! is_closed_() && is_empty_() ) {
not_empty_cond_.wait( lk);
}
not_empty_cond_.wait( lk,
[this](){
return is_closed_() || ! is_empty_();
});
if ( is_closed_() && is_empty_() ) {
throw logic_error("boost fiber: queue is closed");
}
@@ -234,9 +236,11 @@ public:
channel_op_status pop_wait_until( value_type & va,
std::chrono::time_point< Clock, Duration > const& timeout_time) {
std::unique_lock< mutex > lk( mtx_);
while ( ! is_closed_() && is_empty_() ) {
if ( cv_status::timeout == not_empty_cond_.wait_until( lk, timeout_time) )
return channel_op_status::timeout;
if ( ! not_empty_cond_.wait_until( lk, timeout_time,
[this](){
return is_closed_() || ! is_empty_();
})) {
return channel_op_status::timeout;
}
if ( is_closed_() && is_empty_() ) {
return channel_op_status::closed;