MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-10-01 05:08:59 +02:00
Code Issues Releases Wiki Activity

ircd::server: Remove content_over from the state and calculate functionally.

Browse source
This commit is contained in:
Jason Volk 2018-03-19 20:22:58 -07:00
parent 90bbbeaf02
commit 2e801a0219
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/ircd/server/tag.h
View file

@ -31,7 +31,6 @@ struct ircd::server::tag
size_t written {0};
size_t head_read {0};
size_t content_read {0};
size_t content_over {0};
size_t content_length {0};
http::code status {(http::code)0};
std::unique_ptr<char[]> cancellation;
@ -43,6 +42,7 @@ struct ircd::server::tag
const_buffer make_write_content_buffer() const;
const_buffer make_write_head_buffer() const;
size_t content_overflow() const;
size_t content_remaining() const;
mutable_buffer make_read_discard_buffer() const;
mutable_buffer make_read_content_buffer() const;
@ -93,7 +93,6 @@ noexcept
,written{std::move(o.written)}
,head_read{std::move(o.head_read)}
,content_read{std::move(o.content_read)}
,content_over{std::move(o.content_over)}
,content_length{std::move(o.content_length)}
,status{std::move(o.status)}
,cancellation{std::move(o.cancellation)}
@ -115,7 +114,6 @@ noexcept
written = std::move(o.written);
head_read = std::move(o.head_read);
content_read = std::move(o.content_read);
content_over = std::move(o.content_over);
content_length = std::move(o.content_length);
status = std::move(o.status);
cancellation = std::move(o.cancellation);

31
ircd/server.cc
View file

@ -2185,11 +2185,6 @@ ircd::server::tag::read_head(const const_buffer &buffer,
req.in.content = req.in.dynamic;
}
// If the supplied content buffer is too small this must indicate how much
// content will have to be discarded later to not mess up the pipeline.
if(content_length > size(req.in.content))
content_over = content_length - size(req.in.content);
// Reduce the user's content buffer to the content-length. This is sort of
// how we convey the content-length back to the user. The buffer size will
// eventually reflect how much content was actually received; the user can
@ -2221,11 +2216,11 @@ ircd::server::tag::read_content(const const_buffer &buffer,
const auto &content{req.in.content};
// The amount of remaining content for the response sequence
assert(size(content) + content_over >= content_read);
assert(size(content) + content_over == content_length);
assert(size(content) + content_overflow() >= content_read);
assert(size(content) + content_overflow() == content_length);
const size_t remaining
{
size(content) + content_over - content_read
size(content) + content_overflow() - content_read
};
// The amount of content read in this buffer only.
@ -2236,7 +2231,7 @@ ircd::server::tag::read_content(const const_buffer &buffer,
content_read += addl_content_read;
assert(size(buffer) - addl_content_read == 0);
assert(content_read <= size(content) + content_over);
assert(content_read <= size(content) + content_overflow());
assert(content_read <= content_length);
// Invoke the user's optional progress callback; this function
@ -2244,7 +2239,7 @@ ircd::server::tag::read_content(const const_buffer &buffer,
if(req.in.progress)
req.in.progress(buffer, const_buffer{data(content), content_read});
if(content_read == size(content) + content_over)
if(content_read == size(content) + content_overflow())
{
done = true;
assert(content_read == content_length);
@ -2326,12 +2321,12 @@ ircd::server::tag::make_read_discard_buffer()
const
{
assert(request);
assert(content_over > 0);
assert(content_over <= content_read);
assert(content_overflow() > 0);
assert(content_overflow() <= content_read);
assert(content_read >= size(request->in.content));
const size_t remaining
{
content_over - content_read
content_overflow() - content_read
};
static char buffer[512];
@ -2354,6 +2349,16 @@ const
return content_length - content_read;
}
size_t
ircd::server::tag::content_overflow()
const
{
assert(request);
const auto &req{*request};
const ssize_t diff{content_length - size(req.in.content)};
return std::max(diff, ssize_t(0));
}
template<class... args>
void
ircd::server::tag::set_value(args&&... a)