boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-08-05 15:54:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add handler tracking locations to basic_stream

Browse Source
This commit is contained in:
Christopher Kohlhoff
2020-08-15 23:29:44 +10:00
committed by Richard Hodges
parent eb789859f5
commit 5641d9498b
2 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,3 +1,9 @@
Version XXX:
* Add handler tracking locations to basic_stream.
--------------------------------------------------------------------------------
Version 300: Version 300:
* Fix compile errors under Clang 3.4 * Fix compile errors under Clang 3.4

58
include/boost/beast/core/impl/basic_stream.hpp
View File

@@ -296,7 +296,14 @@ public:
{ {
// make sure we perform the no-op // make sure we perform the no-op
BOOST_ASIO_CORO_YIELD BOOST_ASIO_CORO_YIELD
{
BOOST_ASIO_HANDLER_LOCATION((
__FILE__, __LINE__,
(isRead ? "basic_stream::async_read_some"
: "basic_stream::async_write_some")));
async_perform(0, is_read{}); async_perform(0, is_read{});
}
// apply the timeout manually, otherwise // apply the timeout manually, otherwise
// behavior varies across platforms. // behavior varies across platforms.
if(state().timer.expiry() <= clock_type::now()) if(state().timer.expiry() <= clock_type::now())
@@ -309,12 +316,19 @@ public:
// if a timeout is active, wait on the timer // if a timeout is active, wait on the timer
if(state().timer.expiry() != never()) if(state().timer.expiry() != never())
{
BOOST_ASIO_HANDLER_LOCATION((
__FILE__, __LINE__,
(isRead ? "basic_stream::async_read_some"
: "basic_stream::async_write_some")));
state().timer.async_wait( state().timer.async_wait(
timeout_handler<decltype(this->get_executor())>{ timeout_handler<decltype(this->get_executor())>{
state(), state(),
impl_, impl_,
state().tick, state().tick,
this->get_executor()}); this->get_executor()});
}
// check rate limit, maybe wait // check rate limit, maybe wait
std::size_t amount; std::size_t amount;
@@ -323,7 +337,14 @@ public:
{ {
++impl_->waiting; ++impl_->waiting;
BOOST_ASIO_CORO_YIELD BOOST_ASIO_CORO_YIELD
{
BOOST_ASIO_HANDLER_LOCATION((
__FILE__, __LINE__,
(isRead ? "basic_stream::async_read_some"
: "basic_stream::async_write_some")));
impl_->timer.async_wait(std::move(*this)); impl_->timer.async_wait(std::move(*this));
}
if(ec) if(ec)
{ {
// socket was closed, or a timeout // socket was closed, or a timeout
@@ -347,7 +368,14 @@ public:
} }
BOOST_ASIO_CORO_YIELD BOOST_ASIO_CORO_YIELD
{
BOOST_ASIO_HANDLER_LOCATION((
__FILE__, __LINE__,
(isRead ? "basic_stream::async_read_some"
: "basic_stream::async_write_some")));
async_perform(amount, is_read{}); async_perform(amount, is_read{});
}
if(state().timer.expiry() != never()) if(state().timer.expiry() != never())
{ {
@@ -408,12 +436,22 @@ public:
, pg1_(impl_->write.pending) , pg1_(impl_->write.pending)
{ {
if(state().timer.expiry() != stream_base::never()) if(state().timer.expiry() != stream_base::never())
{
BOOST_ASIO_HANDLER_LOCATION((
__FILE__, __LINE__,
"basic_stream::async_connect"));
impl_->write.timer.async_wait( impl_->write.timer.async_wait(
timeout_handler<decltype(this->get_executor())>{ timeout_handler<decltype(this->get_executor())>{
state(), state(),
impl_, impl_,
state().tick, state().tick,
this->get_executor()}); this->get_executor()});
}
BOOST_ASIO_HANDLER_LOCATION((
__FILE__, __LINE__,
"basic_stream::async_connect"));
impl_->socket.async_connect( impl_->socket.async_connect(
ep, std::move(*this)); ep, std::move(*this));
@@ -435,12 +473,22 @@ public:
, pg1_(impl_->write.pending) , pg1_(impl_->write.pending)
{ {
if(state().timer.expiry() != stream_base::never()) if(state().timer.expiry() != stream_base::never())
{
BOOST_ASIO_HANDLER_LOCATION((
__FILE__, __LINE__,
"basic_stream::async_connect"));
impl_->write.timer.async_wait( impl_->write.timer.async_wait(
timeout_handler<decltype(this->get_executor())>{ timeout_handler<decltype(this->get_executor())>{
state(), state(),
impl_, impl_,
state().tick, state().tick,
this->get_executor()}); this->get_executor()});
}
BOOST_ASIO_HANDLER_LOCATION((
__FILE__, __LINE__,
"basic_stream::async_connect"));
net::async_connect(impl_->socket, net::async_connect(impl_->socket,
eps, cond, std::move(*this)); eps, cond, std::move(*this));
@@ -462,12 +510,22 @@ public:
, pg1_(impl_->write.pending) , pg1_(impl_->write.pending)
{ {
if(state().timer.expiry() != stream_base::never()) if(state().timer.expiry() != stream_base::never())
{
BOOST_ASIO_HANDLER_LOCATION((
__FILE__, __LINE__,
"basic_stream::async_connect"));
impl_->write.timer.async_wait( impl_->write.timer.async_wait(
timeout_handler<decltype(this->get_executor())>{ timeout_handler<decltype(this->get_executor())>{
state(), state(),
impl_, impl_,
state().tick, state().tick,
this->get_executor()}); this->get_executor()});
}
BOOST_ASIO_HANDLER_LOCATION((
__FILE__, __LINE__,
"basic_stream::async_connect"));
net::async_connect(impl_->socket, net::async_connect(impl_->socket,
begin, end, cond, std::move(*this)); begin, end, cond, std::move(*this));