MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-25 21:38:18 +02:00
Code Issues Releases Wiki Activity

ircd::net::socket: Hoist function-static instances of ios::descriptor.

Browse source
This commit is contained in:
Jason Volk 2020-10-03 00:39:27 -07:00
parent c43f3a6658
commit 432fcd9cd8
2 changed files with 47 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,6 +52,11 @@ struct ircd::net::socket
static stats::item<uint64_t> total_bytes_out;
static stats::item<uint64_t> total_calls_in;
static stats::item<uint64_t> total_calls_out;
static ios::descriptor desc_connect;
static ios::descriptor desc_handshake;
static ios::descriptor desc_disconnect;
static ios::descriptor desc_timeout;
static ios::descriptor desc_wait[4];
uint64_t id {++count};
ip::tcp::socket sd;

79
ircd/net.cc
View file

@ -1141,6 +1141,39 @@ decltype(ircd::net::socket::instances)
ircd::net::socket::instances
{};
decltype(ircd::net::socket::desc_connect)
ircd::net::socket::desc_connect
{
"ircd::net::socket connect"
};
decltype(ircd::net::socket::desc_handshake)
ircd::net::socket::desc_handshake
{
"ircd::net::socket handshake"
};
decltype(ircd::net::socket::desc_disconnect)
ircd::net::socket::desc_disconnect
{
"ircd::net::socket disconnect"
};
decltype(ircd::net::socket::desc_timeout)
ircd::net::socket::desc_timeout
{
"ircd::net::socket timeout"
};
decltype(ircd::net::socket::desc_wait)
ircd::net::socket::desc_wait
{
{ "ircd::net::socket::wait ready::ANY" },
{ "ircd::net::socket::wait ready::READ" },
{ "ircd::net::socket::wait ready::WRITE" },
{ "ircd::net::socket::wait ready::ERROR" },
};
decltype(ircd::net::socket::total_bytes_in)
ircd::net::socket::total_bytes_in
{
@ -1243,18 +1276,13 @@ ircd::net::socket::connect(const endpoint &ep,
opts.connect_timeout.count()
};
static ios::descriptor desc
{
"ircd::net::socket connect"
};
auto connect_handler
{
std::bind(&socket::handle_connect, this, weak_from(*this), opts, std::move(callback), ph::_1)
};
set_timeout(opts.connect_timeout);
sd.async_connect(ep, ios::handle(desc, std::move(connect_handler)));
sd.async_connect(ep, ios::handle(desc_connect, std::move(connect_handler)));
}
void
@ -1275,11 +1303,6 @@ ircd::net::socket::handshake(const open_opts &opts,
opts.handshake_timeout.count()
};
static ios::descriptor desc
{
"ircd::net::socket handshake"
};
auto handshake_handler
{
std::bind(&socket::handle_handshake, this, weak_from(*this), std::move(callback), ph::_1)
@ -1297,7 +1320,7 @@ ircd::net::socket::handshake(const open_opts &opts,
openssl::server_name(*this, server_name(opts));
ssl.set_verify_callback(std::move(verify_handler));
ssl.async_handshake(handshake_type::client, ios::handle(desc, std::move(handshake_handler)));
ssl.async_handshake(handshake_type::client, ios::handle(desc_handshake, std::move(handshake_handler)));
}
void
@ -1348,18 +1371,13 @@ try
case dc::SSL_NOTIFY:
{
static ios::descriptor desc
{
"ircd::net::socket shutdown"
};
auto disconnect_handler
{
std::bind(&socket::handle_disconnect, this, shared_from(*this), std::move(callback), ph::_1)
};
set_timeout(opts.timeout);
ssl.async_shutdown(ios::handle(desc, std::move(disconnect_handler)));
ssl.async_shutdown(ios::handle(desc_disconnect, std::move(disconnect_handler)));
return;
}
}
@ -1499,14 +1517,6 @@ ircd::net::socket::wait(const wait_opts &opts,
wait_callback_ec callback)
try
{
static ios::descriptor desc[4]
{
{ "ircd::net::socket::wait ready::ANY" },
{ "ircd::net::socket::wait ready::READ" },
{ "ircd::net::socket::wait ready::WRITE" },
{ "ircd::net::socket::wait ready::ERROR" },
};
assert(!fini);
set_timeout(opts.timeout);
const unwind_exceptional unset{[this]
@ -1533,7 +1543,7 @@ try
static const ilist<mutable_buffer> bufs{buf};
if(SSL_peek(ssl.native_handle(), buf, sizeof(buf)) > 0)
{
ircd::post(desc[1], [handle(std::move(handle))]
ircd::post(desc_wait[1], [handle(std::move(handle))]
{
handle(error_code{});
});
@ -1545,8 +1555,8 @@ try
// socket error and when data is actually available. We then have to check
// using a non-blocking peek in the handler. By doing it this way here we
// just get the error in the handler's ec.
//sd.async_wait(bufs, sd.message_peek, ios::handle(desc[1], [handle(std::move(handle))]
sd.async_receive(bufs, sd.message_peek, ios::handle(desc[1], [handle(std::move(handle))]
//sd.async_wait(bufs, sd.message_peek, ios::handle(desc_wait[1], [handle(std::move(handle))]
sd.async_receive(bufs, sd.message_peek, ios::handle(desc_wait[1], [handle(std::move(handle))]
(const auto &ec, const size_t bytes)
{
handle
@ -1564,13 +1574,13 @@ try
case ready::WRITE:
{
sd.async_wait(wait_type::wait_write, ios::handle(desc[2], std::move(handle)));
sd.async_wait(wait_type::wait_write, ios::handle(desc_wait[2], std::move(handle)));
return;
}
case ready::ERROR:
{
sd.async_wait(wait_type::wait_error, ios::handle(desc[3], std::move(handle)));
sd.async_wait(wait_type::wait_error, ios::handle(desc_wait[3], std::move(handle)));
return;
}
@ -2493,11 +2503,6 @@ ircd::net::socket::set_timeout(const milliseconds &t,
if(t < milliseconds(0))
return;
static ios::descriptor descriptor
{
"ircd::net::socket timer"
};
auto handler
{
std::bind(&socket::handle_timeout, this, weak_from(*this), std::move(callback), ph::_1)
@ -2517,7 +2522,7 @@ ircd::net::socket::set_timeout(const milliseconds &t,
};
timer.expires_from_now(pt);
timer.async_wait(ios::handle(descriptor, std::move(handler)));
timer.async_wait(ios::handle(desc_timeout, std::move(handler)));
}
boost::asio::ip::tcp::endpoint