boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-07-29 20:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

close on test::pipe teardown

Browse Source
This commit is contained in:
Vinnie Falco
2017-07-29 13:46:33 -07:00
parent cd2f2b56d0
commit ef8206041b
2 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@ Version 95:
* Tidy up Travis build scripts
* Move scripts to build/
* Fix race in test::pipe
* close on test::pipe teardown
--------------------------------------------------------------------------------

69
extras/boost/beast/test/pipe_stream.hpp
View File

@ -197,21 +197,13 @@ public:
friend
void
teardown(websocket::teardown_tag,
stream&, boost::system::error_code& ec)
{
ec.assign(0, ec.category());
}
stream& s, boost::system::error_code& ec);
template<class TeardownHandler>
friend
void
async_teardown(websocket::teardown_tag,
stream& s, TeardownHandler&& handler)
{
s.get_io_service().post(
bind_handler(std::move(handler),
error_code{}));
}
stream& s, TeardownHandler&& handler);
};
/** Constructor.
@ -225,18 +217,6 @@ public:
{
}
/** Constructor.
The client and server endpoints will different `io_service` objects.
*/
explicit
pipe(boost::asio::io_service& ios1,
boost::asio::io_service& ios2)
: client(s_[0], s_[1], ios1)
, server(s_[1], s_[0], ios2)
{
}
/// Represents the client endpoint
stream client;
@ -246,6 +226,38 @@ public:
//------------------------------------------------------------------------------
inline
void
teardown(websocket::teardown_tag,
pipe::stream& s, boost::system::error_code& ec)
{
if(s.fc_)
{
if(s.fc_->fail(ec))
return;
}
else
{
s.close();
ec.assign(0, ec.category());
}
}
template<class TeardownHandler>
inline
void
async_teardown(websocket::teardown_tag,
pipe::stream& s, TeardownHandler&& handler)
{
error_code ec;
if(s.fc_ && s.fc_->fail(ec))
return s.get_io_service().post(
bind_handler(std::move(handler), ec));
close();
s.get_io_service().post(
bind_handler(std::move(handler), ec));
}
template<class Handler, class Buffers>
class pipe::stream::read_op_impl :
public pipe::read_op
@ -324,11 +336,14 @@ pipe::stream::
close()
{
std::lock_guard<std::mutex> lock{out_.m};
out_.eof = true;
if(out_.op)
out_.op.get()->operator()();
else
out_.cv.notify_all();
if(! out_.eof)
{
out_.eof = true;
if(out_.op)
out_.op.get()->operator()();
else
out_.cv.notify_all();
}
}