feedc0de/boost_beast
1
0 Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Revert "Tidy up calls to post()"

Browse Source 
This reverts commit 5eaa2be85e.
This commit is contained in:
Vinnie Falco committed 2018-03-22 20:13:39 -07:00
1 parent 4d660a5e54
commit 12cc10f8bb
11 files changed
+56 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/boost/beast/websocket/impl/accept.ipp
+1
View File
@@ -265,6 +265,7 @@ operator()(error_code ec, std::size_t)
{
BOOST_ASIO_CORO_YIELD
boost::asio::post(
d.ws.get_executor(),
bind_handler(std::move(*this), ec));
}
else
include/boost/beast/websocket/impl/close.ipp
+8 -5
View File
@@ -152,7 +152,8 @@ operator()(
// Resume
BOOST_ASIO_CORO_YIELD
boost::asio::post(std::move(*this));
boost::asio::post(
d.ws.get_executor(), std::move(*this));
BOOST_ASSERT(d.ws.wr_block_.is_locked(this));
// Make sure the stream is open
@@ -195,7 +196,8 @@ operator()(
// Resume
BOOST_ASIO_CORO_YIELD
boost::asio::post(std::move(*this));
boost::asio::post(
d.ws.get_executor(), std::move(*this));
BOOST_ASSERT(d.ws.rd_block_.is_locked(this));
// Make sure the stream is open
@@ -301,9 +303,10 @@ operator()(
d.ws.paused_wr_.maybe_invoke();
if(! d.cont)
{
BOOST_ASIO_CORO_YIELD
boost::asio::post(
bind_handler(std::move(*this), ec));
auto& ws = d.ws;
return boost::asio::post(
ws.stream_.get_executor(),
bind_handler(d_.release_handler(), ec));
}
d_.invoke(ec);
}
include/boost/beast/websocket/impl/ping.ipp
+3 -1
View File
@@ -135,6 +135,7 @@ operator()(error_code ec, std::size_t)
{
BOOST_ASIO_CORO_YIELD
boost::asio::post(
d.ws.get_executor(),
bind_handler(std::move(*this), ec));
goto upcall;
}
@@ -150,7 +151,8 @@ operator()(error_code ec, std::size_t)
// Resume
BOOST_ASIO_CORO_YIELD
boost::asio::post(std::move(*this));
boost::asio::post(
d.ws.get_executor(), std::move(*this));
BOOST_ASSERT(d.ws.wr_block_.is_locked(this));
// Make sure the stream is open
include/boost/beast/websocket/impl/read.ipp
+21 -12
View File
@@ -196,7 +196,8 @@ operator()(
// Resume
BOOST_ASIO_CORO_YIELD
boost::asio::post(std::move(*this));
boost::asio::post(
ws_.get_executor(), std::move(*this));
BOOST_ASSERT(ws_.rd_block_.is_locked(this));
// The only way to get read blocked is if
@@ -277,7 +278,9 @@ operator()(
if(! cont_)
{
BOOST_ASIO_CORO_YIELD
boost::asio::post(std::move(*this));
boost::asio::post(
ws_.get_executor(),
std::move(*this));
BOOST_ASSERT(cont_);
}
}
@@ -319,7 +322,8 @@ operator()(
// Resume
BOOST_ASIO_CORO_YIELD
boost::asio::post(std::move(*this));
boost::asio::post(
ws_.get_executor(), std::move(*this));
BOOST_ASSERT(ws_.wr_block_.is_locked(this));
// Make sure the stream is open
@@ -350,7 +354,9 @@ operator()(
if(! cont_)
{
BOOST_ASIO_CORO_YIELD
boost::asio::post(std::move(*this));
boost::asio::post(
ws_.get_executor(),
std::move(*this));
BOOST_ASSERT(cont_);
}
}
@@ -374,7 +380,9 @@ operator()(
if(! cont_)
{
BOOST_ASIO_CORO_YIELD
boost::asio::post(std::move(*this));
boost::asio::post(
ws_.get_executor(),
std::move(*this));
BOOST_ASSERT(cont_);
}
}
@@ -630,7 +638,8 @@ operator()(
// Resume
BOOST_ASIO_CORO_YIELD
boost::asio::post(std::move(*this));
boost::asio::post(
ws_.get_executor(), std::move(*this));
BOOST_ASSERT(ws_.wr_block_.is_locked(this));
// Make sure the stream is open
@@ -691,11 +700,10 @@ operator()(
ws_.paused_ping_.maybe_invoke() ||
ws_.paused_wr_.maybe_invoke();
if(! cont_)
{
BOOST_ASIO_CORO_YIELD
boost::asio::post(
bind_handler(std::move(*this), ec));
}
return boost::asio::post(
ws_.stream_.get_executor(),
bind_handler(std::move(h_),
ec, bytes_written_));
h_(ec, bytes_written_);
}
}
@@ -806,8 +814,9 @@ operator()(
{
BOOST_ASIO_CORO_YIELD
boost::asio::post(
ws_.get_executor(),
bind_handler(std::move(*this),
error::buffer_overflow));
error::buffer_overflow, 0));
break;
}
BOOST_ASIO_CORO_YIELD
include/boost/beast/websocket/impl/teardown.ipp
+2 -1
View File
@@ -113,7 +113,8 @@ operator()(error_code ec, std::size_t bytes_transferred)
{
BOOST_ASIO_CORO_YIELD
boost::asio::post(
bind_handler(std::move(*this), ec));
s_.get_executor(),
bind_handler(std::move(*this), ec, 0));
goto upcall;
}
for(;;)
include/boost/beast/websocket/impl/write.ipp
+5 -6
View File
@@ -321,7 +321,8 @@ operator()(
// Resume
BOOST_ASIO_CORO_YIELD
boost::asio::post(std::move(*this));
boost::asio::post(
ws_.get_executor(), std::move(*this));
BOOST_ASSERT(ws_.wr_block_.is_locked(this));
// Make sure the stream is open
@@ -568,11 +569,9 @@ operator()(
ws_.paused_rd_.maybe_invoke() ||
ws_.paused_ping_.maybe_invoke();
if(! cont_)
{
BOOST_ASIO_CORO_YIELD
boost::asio::post(
bind_handler(std::move(*this), ec));
}
return boost::asio::post(
ws_.stream_.get_executor(),
bind_handler(std::move(h_), ec, bytes_transferred_));
h_(ec, bytes_transferred_);
}
}