MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-07-04 17:48:35 +02:00
Code Issues Releases Wiki Activity

ircd::net: Checkpoint case for read eof in the readiness handler; should split.

Browse source
This commit is contained in:
Jason Volk 2018-03-11 11:23:50 -07:00
parent 79800a666c
commit bbd2cbc15b
2 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ircd/net/socket.h
View file

@ -58,7 +58,7 @@ struct ircd::net::socket
void handle_handshake(std::weak_ptr<socket>, eptr_handler, error_code) noexcept;
void handle_connect(std::weak_ptr<socket>, open_opts, eptr_handler, error_code) noexcept;
void handle_timeout(std::weak_ptr<socket>, ec_handler, error_code) noexcept;
void handle_ready(std::weak_ptr<socket>, ready, ec_handler, error_code) noexcept;
void handle_ready(std::weak_ptr<socket>, ready, ec_handler, error_code, size_t) noexcept;
public:
operator const ip::tcp::socket &() const { return sd; }

37
ircd/net.cc
View file

@ -1480,11 +1480,6 @@ void
ircd::net::socket::wait(const wait_opts &opts,
wait_callback_ec callback)
{
auto handle
{
std::bind(&socket::handle_ready, this, weak_from(*this), opts.type, std::move(callback), ph::_1)
};
set_timeout(opts.timeout);
const unwind::exceptional unset{[this]
{
@ -1494,12 +1489,26 @@ ircd::net::socket::wait(const wait_opts &opts,
switch(opts.type)
{
case ready::ERROR:
{
auto handle
{
std::bind(&socket::handle_ready, this, weak_from(*this), opts.type, std::move(callback), ph::_1, 0UL)
};
sd.async_wait(wait_type::wait_error, std::move(handle));
break;
}
case ready::WRITE:
{
auto handle
{
std::bind(&socket::handle_ready, this, weak_from(*this), opts.type, std::move(callback), ph::_1, 0UL)
};
sd.async_wait(wait_type::wait_write, std::move(handle));
break;
}
case ready::READ:
{
@ -1507,6 +1516,11 @@ ircd::net::socket::wait(const wait_opts &opts,
static const ilist<mutable_buffer> bufs{buf};
__builtin_prefetch(buf, 1, 0); // 1 = write, 0 = no cache
auto handle
{
std::bind(&socket::handle_ready, this, weak_from(*this), opts.type, std::move(callback), ph::_1, ph::_2)
};
// The problem here is that waiting on the sd doesn't account for bytes
// read into SSL that we didn't consume yet. If something is stuck in
// those userspace buffers, the socket won't know about it and perform
@ -1515,7 +1529,7 @@ ircd::net::socket::wait(const wait_opts &opts,
// real socket wait.
if(SSL_peek(ssl.native_handle(), buf, sizeof(buf)) > 0)
{
handle(error_code{});
handle(error_code{}, 1UL);
break;
}
@ -1537,7 +1551,8 @@ void
ircd::net::socket::handle_ready(const std::weak_ptr<socket> wp,
const net::ready type,
const ec_handler callback,
error_code ec)
error_code ec,
const size_t bytes)
noexcept try
{
using namespace boost::system::errc;
@ -1555,13 +1570,17 @@ noexcept try
if(unlikely(!ec && !sd.is_open()))
ec = { bad_file_descriptor, system_category() };
log.debug("socket(%p) local[%s] remote[%s] ready %s %s available:%zu",
if(type == ready::READ && !ec && bytes == 0)
ec = { asio::error::eof, asio::error::get_misc_category() };
log.debug("socket(%p) local[%s] remote[%s] ready %s %s avail:%zu:%zu",
this,
string(local_ipport(*this)),
string(remote_ipport(*this)),
reflect(type),
string(ec),
available(*this));
type == ready::READ? bytes : 0UL,
type == ready::READ? available(*this) : 0UL);
call_user(callback, ec);
}