MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 07:23:53 +01:00
Code Issues Releases Wiki Activity

ircd: Use variable length receive buffer.

Browse source
This commit is contained in:
Jason Volk 2016-09-28 14:17:04 -07:00
parent d4bcf904c3
commit 5e0659b2f9
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ircd/client.cc
View file

@ -280,7 +280,7 @@ ircd::async_recv_next(client &client,
auto &sock(*client.sock);
sock.set_timeout(timeout);
async_read(sock.sd, mutable_buffers_1(rbuf.buf.data(), rbuf.buf.size()),
async_read(sock.sd, mutable_buffers_1(data(rbuf.buf), size(rbuf.buf)),
std::bind(&rbuf::handle_pck, &rbuf, ph::_1, ph::_2),
std::bind(&ircd::handle_recv, std::ref(client), ph::_1, ph::_2));
}

29
ircd/rbuf.h
View file

@ -24,26 +24,25 @@ namespace ircd {
struct rbuf
{
tape reel; // @0 +80 ||
std::exception_ptr eptr; // @80 +8 |
uint16_t checked; // @88 +2 |
uint16_t length; // @90 +2 |
std::array<char, BUFSIZE> buf alignas(16); // @96(92) +512 |||||||||
// @608 | 640
unique_buffer<mutable_buffer> buf;
tape reel;
std::exception_ptr eptr;
uint16_t checked;
uint16_t length;
bool terminated() const; // rbuf has LF termination
uint16_t remaining() const; // bytes remaining in rbuf
size_t handle_pck(const error_code &, const size_t) noexcept;
void reset();
rbuf();
rbuf(const size_t &size = BUFSIZE);
};
static_assert(BUFSIZE == 512, "");
inline
rbuf::rbuf()
:checked{0}
rbuf::rbuf(const size_t &size)
:buf{size}
,checked{0}
,length{0}
{
}
@ -64,7 +63,7 @@ noexcept try
return 0;
length += bytes;
if(reel.append(buf.data(), length))
if(reel.append(data<const char *>(buf), length))
return 0;
if(terminated())
@ -83,15 +82,15 @@ inline uint16_t
ircd::rbuf::remaining()
const
{
return buf.size() - length;
return size(buf) - length;
}
inline bool
rbuf::terminated()
const
{
const auto b(std::next(buf.rbegin(), remaining()));
const auto e(std::next(buf.rbegin(), buf.size() - checked));
const auto b(std::next(rbegin(buf), remaining()));
const auto e(std::next(rbegin(buf), size(buf) - checked));
return std::find(b, e, '\n') != e;
}